Merge commit '6342d3936ad8c9e6cf5bba1fc88c4e9338391bb4'
* commit '6342d3936ad8c9e6cf5bba1fc88c4e9338391bb4':
Change _TOKENIZE tests to test the new token_index column
Merge commit '5b3189e03c71bcd276e0b39d0ec5e2f699a1697f'
* commit '5b3189e03c71bcd276e0b39d0ec5e2f699a1697f':
Fix the build. :(
Implement compatibility support for WRITE_SDCARD permission.
JSR239 and android.opengl gl Pointer functions (glColorPointer, etc.)
now respect the current setting of the Buffer position.
This fixes a regression introduced when we started requiring the
Buffers passed to the Pointer functions to be direct Buffers.
Merge commit 'ba2a3a1b32e242eea4e97c927d886e8987fde3d4'
* commit 'ba2a3a1b32e242eea4e97c927d886e8987fde3d4':
Tear down data, if a disconnect request is pending.
Merge commit 'b3c6addfc17be2a52133026148f3928ab97c83cb'
* commit 'b3c6addfc17be2a52133026148f3928ab97c83cb':
Fixes#1855461, #1857290 and #1857365. Certain scrollbar styles make an opaque view not be opaque. ListView and View now account for this when indicating whether they are opaque or not.
Merge commit 'b3af6b4805040ea42c01765387c99089822bbe7e'
* commit 'b3af6b4805040ea42c01765387c99089822bbe7e':
Add a tool to play all kinds of media files saved in /sdcard/media_api/samples/. It also tests the seeking functionality during the play of each sample file.
Merge commit 'e85bb9ebcce85b8c7a0e0ccb5116cd25bf684727'
* commit 'e85bb9ebcce85b8c7a0e0ccb5116cd25bf684727':
Add the backup data file writer C++ class.
* changes:
Fixes#1855461, #1857290 and #1857365. Certain scrollbar styles make an opaque view not be opaque. ListView and View now account for this when indicating whether they are opaque or not.
* changes:
Add a tool to play all kinds of media files saved in /sdcard/media_api/samples/. It also tests the seeking functionality during the play of each sample file.
Merge commit 'a38b427a7a6d2658dc3e3083bc6c263a3d4d7af3'
* commit 'a38b427a7a6d2658dc3e3083bc6c263a3d4d7af3':
Add a search url text color attribute and theme. For search suggestions
Use java.text.DateFormat where possible, since that is already using
the CLDR data for the things it supports. Remove an unused date format
object from DatePickerDialog.
Add a new method for getting the standalone month names from applications,
although @hidden for now because it is an API change.
Pass the standalone month names down to native code in Time so that
tztime's strftime() can use them.
And then the bulk of the change: replace all the names for the months
and the days of the week, and AM and PM, and yesterday, today, and tomorrow,
with strings from CLDR. And replace several of the date format strings
with ones derived from CLDR, but reformatted to use strftime() style
instead of SimpleDateFormat style.
All these resource changes go into new donottranslate-cldr.xml files
and are removed from strings.xml so that they aren't part of the
normal translation process and the translators don't have to bother
with them (and risk messing them up).
Merge commit '4535e40544aeb957d44fad75fbe5676effe03689'
* commit '4535e40544aeb957d44fad75fbe5676effe03689':
Implement the C++ class to write the backed up file data.
Merge commit 'eae850cefe7e149f396c9e8ca1f34ec02b20a3f0'
* commit 'eae850cefe7e149f396c9e8ca1f34ec02b20a3f0':
Allow intent resolution to be constrained by package name.
Merge commit '669ec3a6e47248fee0a3a0f4877b46875eb42140'
* commit '669ec3a6e47248fee0a3a0f4877b46875eb42140':
Fixes#1846038. The dirty region can sometimes be modified by SurfaceFlinger. When this happens, force the view hierarchy to ignore the dirty flags.
* changes:
Fixes#1846038. The dirty region can sometimes be modified by SurfaceFlinger. When this happens, force the view hierarchy to ignore the dirty flags.
Merge commit '14ad07f604ecd08436680a046363d37952c278f6'
* commit '14ad07f604ecd08436680a046363d37952c278f6':
Fixes#1853550. Prevent NPE when calling the PopupWindow() and PopupWindow(int, int) constructors. Instead, throw an IllegalStateException when trying to show a popup with no content view.
* changes:
Fixes#1853550. Prevent NPE when calling the PopupWindow() and PopupWindow(int, int) constructors. Instead, throw an IllegalStateException when trying to show a popup with no content view.
Merge commit 'd1f7b3a5720a4d6d92c4eea5a1fe812a790a7442'
* commit 'd1f7b3a5720a4d6d92c4eea5a1fe812a790a7442':
New feature to track down #1846038. Adds the ability to export flags encoded in int values so as to make them human readable in HierarchyViewer.
* changes:
New feature to track down #1846038. Adds the ability to export flags encoded in int values so as to make them human readable in HierarchyViewer.
Merge commit '1c9a92fd9fbe192f24e53c26cddeab401cefb108'
* commit '1c9a92fd9fbe192f24e53c26cddeab401cefb108':
Rework some code so that it works the way it was supposed to work.
Merge commit '9ea923174c2daffd9b6a1cd630018d3fdfe91f62'
* commit '9ea923174c2daffd9b6a1cd630018d3fdfe91f62':
Rearrange some code so it makes more sense. Thanks, findbugs.
Merge commit '02c1c46fff22490f884f05520d58eadae1442db8'
* commit '02c1c46fff22490f884f05520d58eadae1442db8':
gps: Time out after 1 minute if we are unable to get a fix and our fix interval is long.
