summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "setSelectedHeader() when switching to fragment"Brian Attwell2014-06-181-1/+8
|\
| * setSelectedHeader() when switching to fragmentBrian Attwell2014-06-171-1/+8
| | | | | | | | | | | | | | | | | | | | Without this change, passing a EXTRA_SHOW_FRAGMENT value for a two panel preferences activity will cause the correct fragment to be shown. However, it will not cause the correct header to be highlighted. Bug: 15675746 Bug: 5045558 Change-Id: I18d8e15dd104e8f39ae1ccbb11ab17fd1bf7462e
* | Merge "Fix blinking animation during Visibility transitions."George Mount2014-06-182-33/+39
|\ \
| * | Fix blinking animation during Visibility transitions.George Mount2014-06-182-33/+39
| | | | | | | | | | | | | | | | | | Bug 15618501 Change-Id: I9dff9eb386a4bfb51caec24f3f7cc0fad06ae04c
* | | Merge "Fix build break in log statement"Adam Lesinski2014-06-171-1/+1
|\ \ \
| * | | Fix build break in log statementAdam Lesinski2014-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For logging purposes, a uint32_t was being converted into a void pointer, which on certain systems would be a conversion to a different size. Change-Id: I90af69ab975d84c9c8cbb1cce94ff4e9cc6edcf2
* | | | Merge "Fix missed running update-api"Jason Monk2014-06-171-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Fix missed running update-apiJason Monk2014-06-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The build server is stuck on something else, but will likely soon discover this... Change-Id: Ib029d07a09d373f8bea1204176f3d00c830c9f0b
* | | | Merge "Improve constant state for VectorDrawable"ztenghui2014-06-174-3/+93
|\ \ \ \
| * | | | Improve constant state for VectorDrawableztenghui2014-06-184-3/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now inflation will not cause duplicated constant states. And update tests. Change-Id: I66861e5451c4c10d18756e8522546ea1cb938a55
* | | | | Merge "Change clearDeviceOwnerApp to take a package"Jason Monk2014-06-172-3/+5
|\ \ \ \ \
| * | | | | Change clearDeviceOwnerApp to take a packageJason Monk2014-06-182-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the caller is sharing uid, then the package from getPackage() may not be the desired one. This also matches better with the other device owner calls. Change-Id: I14f2ec4bff0717273f626072dabad0d2c76068a5
* | | | | | Merge "Fix namespace for picture"Derek Sollenberger2014-06-171-1/+3
|\ \ \ \ \ \
| * | | | | | Fix namespace for pictureDerek Sollenberger2014-06-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id21ebcf2ba4befb4af15cd1d493428a64599afc1
* | | | | | | Merge "Notify any profile/device owners of lock task"Jason Monk2014-06-175-1/+107
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Notify any profile/device owners of lock taskJason Monk2014-06-185-1/+107
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a method for DeviceAdminReceivers of profile/device owners to be notified that lock task mode has entered or exited for an app they have whitelisted. Change-Id: Id124287d41564bbfccdacccf1977b7acb3ddec3f
* | | | | | Support multiple resource tables with same packageAdam Lesinski2014-06-1832-1244/+2940
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to support APK split features, the resource table needs to support loading multiple resource tables with the same package but potentially new set of type IDs. This adds some complexity as the type ID space changes from dense and ordered to potentially sparse. A ByteBucketArray is used to store the type IDs in a memory efficient way that allows for fast retrieval. In addition, the IDMAP format has changed. We no longer need random access to the type data, since we store the types differently. However, random access to entries of a given type is still required. Change-Id: If6f5be680b405b368941d9c1f2b5d2ddca964160
* | | | | Merge "Implement drawTextOnPath with Minikin"Raph Levien2014-06-176-23/+141
|\ \ \ \ \
| * | | | | Implement drawTextOnPath with MinikinRaph Levien2014-06-186-23/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch contains an implementation of drawTextOnPath for both software and hardware Canvas using Minikin for text layout. One of the steps for switching all remaining text operations to Minikin so the old TextLayout and Skia fallback fonts mechanisms can be deleted. Bug: 11750374 Resolve TODO items for Minikin Change-Id: I06bfe74a101fa1dcdfc38f530f7194d71e522a85
* | | | | | Merge "Refactor android.graphics.Picture JNI bindings."Derek Sollenberger2014-06-179-280/+234
|\ \ \ \ \ \
| * | | | | | Refactor android.graphics.Picture JNI bindings.Derek Sollenberger2014-06-179-280/+234
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first CL in a series of CLs to refactor the Graphics JNI bindings. bug: 15672762 Change-Id: I1455fa1330c7426407c06eeaad81ad37a57373b1
* | | | | | | Merge "Remove Obsolete enable/disableApn functions."Robert Greenwalt2014-06-173-52/+9
|\ \ \ \ \ \ \
| * | | | | | | Remove Obsolete enable/disableApn functions.Robert Greenwalt2014-06-173-52/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ConnectivityService now uses NetworkAgents instead and apps should use ConnectivityManager. Change-Id: Ifc5c8f5be802183e70a5d92b224c819815de00e6
* | | | | | | | Merge "Rename apps User Restriction."Julia Reynolds2014-06-173-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Rename apps User Restriction.Julia Reynolds2014-06-183-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9f81a6b94ba06b593e7213967df51c7cb30a7b31
* | | | | | | | | Merge "Empty triangle displayed for radio signal but calls & data work"Wink Saville2014-06-173-9/+24
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Empty triangle displayed for radio signal but calls & data workWink Saville2014-06-183-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TelephonyRegistry: when default sub id is requested set isLegacyApp to true so when ACTION_DEFAULT_SUBSCRIPTION_CHANGED is received the TelephonyRegistry.Record.subId will be updated. SubInfoRecord: Add SubInfoRecord toString for easier debugging SubscriptionManager: Add putPHoneIdAndSubIdExtra(intent, phoneId, subId) as this allows explicit setup of phoneId and subId and does not rely on a phone's subId being set. Bug: 15669560 Change-Id: I645ddb35b964b08dcb46f881c9d02b932d128950
* | | | | | | | | Fix bitmap tintingAlan Viverette2014-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 15716407 Change-Id: I4008c9763fedc2f716040cd3f73ad79d77343960
* | | | | | | | | Merge "Fix AudioFormat getBytesPerSample to recognize float"Andy Hung2014-06-171-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix AudioFormat getBytesPerSample to recognize floatAndy Hung2014-06-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15719638 Change-Id: Id53a07ef24e4403f3bad7a13c4dd801e556769eb
* | | | | | | | | | Merge "Move SubtitleData processing to SubtitleTrack"Robert Shih2014-06-182-5/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move SubtitleData processing to SubtitleTrackRobert Shih2014-06-172-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia338a7a1b51e449d0ab6df9933ea0efcc2d12849
* | | | | | | | | | | Clean up the EPG data when a TV input package is removedJae Seo2014-06-182-9/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removed an unused parameter from sendSessionTokenToClientLocked(). Bug: 14981342 Change-Id: I5bcf6050386a2bc3e216f44420390c4b78282af4
* | | | | | | | | | | Merge "Update API for launcher apps to use abstract class."Kenny Guy2014-06-172-3/+125
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update API for launcher apps to use abstract class.Kenny Guy2014-06-172-3/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Leaving old API behind until unbundled launcher has been updated. Bug: 15518265 Change-Id: Ic26878224df51093d7d08651adda08f760b405be
* | | | | | | | | | | | Merge "Update Location documentation for altitude (WGS84 instead of sea level)."David Christie2014-06-171-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Update Location documentation for altitude (WGS84 instead of sea level).David Christie2014-06-171-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9531fba75bc1fee7d0e7c1dc179e3d05fb3e8a42
* | | | | | | | | | | | Merge "Fix persistent tasks and expand scope"Craig Mautner2014-06-1711-45/+109
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix persistent tasks and expand scopeCraig Mautner2014-06-1711-45/+109
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed missing tag closure on the xml for storing Intent categories. - Shortened timeout for flushing tasks to persistent storage from one minute to ten seconds. - Made persistency the default except for those tasks on the home stack and those tasks that exclude themselves from the recent task list. - Fixed deletion of tasks after restoring. Tasks now survive a second reboot, not just the first reboot. - Fixed sort order so most recent tasks will be restored at front. Fixes bug 15672002. Change-Id: I16d87d58c6fd2e879cfd0c0b18b2694432a79b71
* | | | | | | | | | | | am 82ea0eb2: am ef655f26: docs: Added "games" metadata tag for Play Games ↵Quddus Chong2014-06-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | landing page in d.a.c. Bug: 15709471 * commit '82ea0eb213d75163398fdd0f1da672e058e64f17': docs: Added "games" metadata tag for Play Games landing page in d.a.c. Bug: 15709471
| * \ \ \ \ \ \ \ \ \ \ \ am ef655f26: docs: Added "games" metadata tag for Play Games landing page in ↵Quddus Chong2014-06-181-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d.a.c. Bug: 15709471 * commit 'ef655f26fceba274b75e41f0b085434aa12914c8': docs: Added "games" metadata tag for Play Games landing page in d.a.c. Bug: 15709471
| | * | | | | | | | | | | | docs: Added "games" metadata tag for Play Games landing page in d.a.c.Quddus Chong2014-06-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15709471 Change-Id: Ibac4bd844245e71a8cb975bd86d07f9df0c25be5
* | | | | | | | | | | | | | Merge "TvInputHardwareManager: Fix Integer conversion error"Wonsik Kim2014-06-171-6/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | TvInputHardwareManager: Fix Integer conversion errorWonsik Kim2014-06-191-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ice85ef840dd7fa40faaf2fdfa359ee419d3a36e8
* | | | | | | | | | | | | | | Merge "Added startWithoutUi() call to Face Unlock AIDL interface."Brian Colonna2014-06-171-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Added startWithoutUi() call to Face Unlock AIDL interface.Brian Colonna2014-06-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is being done in support of preview-less Face Unlock (b/14433919). Nothing is calling this function yet, but it will be called from a trustlet to tell Face Unlock to authenticate in the background. If this is committed before the corresponding Face Unlock change, Face Unlock will not build because it would not be implementing this function, and it must implement all functions in the interface in order to build. Change-Id: I4aaea78d58cc5f1f7e13cb981fb9a217cd901496
* | | | | | | | | | | | | | | | Merge "Add two new display info fields"Andy McFadden2014-06-1711-10/+120
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Add two new display info fieldsAndy McFadden2014-06-1711-10/+120
| | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds SurfaceFlinger's app VSYNC offset and buffer deadline values to DisplayInfo. The values will be available to apps through queries on a Display object (currently hidden). Bug 14612039 Change-Id: I48760f58a9d74d99651b02a9d595f420410f2bb5
* | | | | | | | | | | | | | | | Fix dirty calculation for layer updatesJohn Reck2014-06-182-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15682142 Defer early return of alpha <= 0 for damage accumulation until popTransform() so that layer updates will be performed regardless of alpha Change-Id: Ifb94dd3ed2d96d610e6f2f3071933903016273a5
* | | | | | | | | | | | | | | | Merge "Battery saver notifications should be public."John Spurlock2014-06-171-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-02-14 19:35:33 +0000