summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Update brightness icons to use color attribute"Alan Viverette2014-04-1014-10/+49
|\
| * Update brightness icons to use color attributeAlan Viverette2014-04-1014-10/+49
| | | | | | | | | | BUG: 13961573 Change-Id: I6c7f85c8cda739cb1e5e14c39c7e4a9fe20a8650
* | Merge "MediaFocusControl: fix comment"Jean-Michel Trivi2014-04-101-4/+2
|\ \
| * | MediaFocusControl: fix commentJean-Michel Trivi2014-04-101-4/+2
| | | | | | | | | | | | | | | | | | Comment about role of audio focus isn't valid anymore. Change-Id: I608d8cf9d5d9c4449384e2788e5eb5ea42c97eca
* | | Merge "Fix path interpretation on curves"ztenghui2014-04-101-44/+56
|\ \ \ | |_|/ |/| |
| * | Fix path interpretation on curvesztenghui2014-04-091-44/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly about the shorthand for quadratic / cubic curve. We now comply with the spec, which said the behavior should depend on the previous command. At the same time, make sure our current point and current control point info are always in absolute coordinates, not a mix of absolute and relative. CTS test will be added to monitor this behavior. Note: Chrome / Firefox are following this rule, while Linux OS / Batik are not. bug:13913405 Change-Id: I9f8168ed97f87c754c79588984f1f199507b0377
* | | Merge "Fix build breakage"Raph Levien2014-04-101-2/+0
|\ \ \
| * | | Fix build breakageRaph Levien2014-04-101-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A recent change to remove VectorDrawable methods from the public api didn't run update-api. This should fix that build. Change-Id: I4d86221f5ada96113f673def4b32985c6d60110a
* | | | Merge "Make attachFunctor blocking"John Reck2014-04-106-115/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Make attachFunctor blockingJohn Reck2014-04-106-115/+9
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 13930200 Change-Id: I9b0cf92fd16bb30baa09b6f8d7ae22a8b2a7fd80
* | | | Fix build breakageAlan Viverette2014-04-102-7/+30
| | | | | | | | | | | | | | | | Change-Id: I73d9ff5f38986b7acf83b85c1989203f472bc5fd
* | | | Merge "Remove sync flush"John Reck2014-04-105-39/+9
|\ \ \ \
| * | | | Remove sync flushJohn Reck2014-04-105-39/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13952590 It was attempting to flush state changes after the canvas was destroyed, which caused layer updates to crash. Due to the removal of SetDisplayListData, the sync mode isn't able to do anything ever, so remove it. Change-Id: I1e18ce288d81fd47cc6e612afda9476f75ecef2e
* | | | Merge "Further improved NotificationStackScroller"Selim Cinek2014-04-108-34/+290
|\ \ \ \
| * | | | Further improved NotificationStackScrollerSelim Cinek2014-04-108-34/+290
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The top card is now collapsed during the pulldown of the notification shade and expanded during the transition. The scrollstate is also reset once the shade is closed. Change-Id: Ibf17eef1f338d674c545e5bf55261e60db62b2ce
* | | | | Merge "Camera2 API: enable burst capture and repeating burst."Jianing Wei2014-04-107-63/+444
|\ \ \ \ \
| * | | | | Camera2 API: enable burst capture and repeating burst.Jianing Wei2014-04-107-63/+444
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Enable sending out burst requests, canceling, and flushing. * Enable onCaptureStarted, onResultReceived for bursts. * Enable onCaptureSequenceCompleted by tracking frame number. Change-Id: Ica2b031cac7ad90f9c4b74a78e6185e627195340 Bug-ID: 10749500
* | | | | | Merge "Cleaning up VectorDrawable"Alan Viverette2014-04-102-149/+100
|\ \ \ \ \ \
| * | | | | | Cleaning up VectorDrawableAlan Viverette2014-04-102-149/+100
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use argb evaluation method from animation package, lazily create paint, set default for stroke line cap and join. Fix scaling to bounds. Fix drawable in test app. Change-Id: I245d5d6acc6ba9806743ab2bf9bf99aff3649c39
* | | | | | Merge "Adding render stats APIs to UiAutomation (framework)."Svetoslav2014-04-1021-18/+1004
|\ \ \ \ \ \
| * | | | | | Adding render stats APIs to UiAutomation (framework).Svetoslav2014-04-0721-18/+1004
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:12927198 Change-Id: Iae21481c75ae58dcdab3731bf5f1e2844e29d434
* | | | | | | Merge "support the people extra on the notification object"Chris Wren2014-04-104-1/+244
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | support the people extra on the notification objectChris Wren2014-04-104-1/+244
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | currently supported URIs: content://com.android.contacts/contacts/lookup/* tel:* Change-Id: I833eee3f2ee40aa8cb2cfad135bdd6cb2c0eb792
* | | | | | | am cd5e3f85: (-s ours) am da6b9599: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2014-04-100-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into klp-modular-dev * commit 'cd5e3f85fc9228b943ee8dfda0951e068953596c': Import translations. DO NOT MERGE
| * \ \ \ \ \ \ am da6b9599: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2014-04-100-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit 'da6b9599c77230c689d63e32ca80b62f60f18c27': Import translations. DO NOT MERGE
| | * \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into klp-modular-devBaligh Uddin2014-04-106-6/+6
| | |\ \ \ \ \ \ \
| | | * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-096-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I974afb393ebd8cf341012d3c08cad60b578cda30 Auto-generated-cl: translation import
* | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-04-1056-6/+230
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-0956-6/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icfa0a9064725819067d4034e99728ecb5ddd4001 Auto-generated-cl: translation import
* | | | | | | | | | | Merge "Allow encryption when keyguard is set to pattern or no protection"Paul Lawrence2014-04-102-6/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Allow encryption when keyguard is set to pattern or no protectionPaul Lawrence2014-04-032-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add type parameter to encryptStorage so we can set type when we encrypt Depends on https://googleplex-android-review.git.corp.google.com/#/c/444056/ Circular dependency on: https://googleplex-android-review.git.corp.google.com/#/c/444201/ Bug: 13749169 Change-Id: I52034ec25de35f12f1bbfdd1b0f8584923a0be2e
* | | | | | | | | | | am 3603970d: am 940e76fd: am b827f78e: Merge "Removed android.debug.JNITest ↵Narayan Kamath2014-04-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from preloaded-classes" * commit '3603970d3a8a2215027e96c4861e1ab9eec86f79': Removed android.debug.JNITest from preloaded-classes
| * | | | | | | | | | am 940e76fd: am b827f78e: Merge "Removed android.debug.JNITest from ↵Narayan Kamath2014-04-101-1/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preloaded-classes" * commit '940e76fd378cebcd0d83099a5c31bc1e2bbeb2ba': Removed android.debug.JNITest from preloaded-classes
| | * \ \ \ \ \ \ \ \ \ am b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes"Narayan Kamath2014-04-101-1/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b827f78e7acee3a604c315615268edf7098dc184': Removed android.debug.JNITest from preloaded-classes
| | | * \ \ \ \ \ \ \ \ \ Merge "Removed android.debug.JNITest from preloaded-classes"Narayan Kamath2014-04-101-1/+0
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Removed android.debug.JNITest from preloaded-classesAshok Bhat2014-03-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android.debug.JNITest class no longer exists in this project. This patch updates preloaded-classes accordingly to avoid spurious warning during boot. Change-Id: Ia4a5a1858f6c87fbc594a623adb95454334361ea Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | | | | | | | | | | am 9e289d70: am 1d26a3f1: am 09e13cc5: Merge "System services detect and ↵Narayan Kamath2014-04-108-29/+72
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | register app CPU ABIs" * commit '9e289d70a8baaed0030413b5991653792e2a816d': System services detect and register app CPU ABIs
| * | | | | | | | | | | | | am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ↵Narayan Kamath2014-04-108-29/+72
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ABIs" * commit '1d26a3f1efd0d965e8751e8515608c31789bdbe2': System services detect and register app CPU ABIs
| | * | | | | | | | | | | | am 09e13cc5: Merge "System services detect and register app CPU ABIs"Narayan Kamath2014-04-108-29/+72
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '09e13cc5f9f98382376eb49bfa6ceb94a50d37a1': System services detect and register app CPU ABIs
| | | * | | | | | | | | | | Merge "System services detect and register app CPU ABIs"Narayan Kamath2014-04-108-29/+72
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | System services detect and register app CPU ABIsRamin Zaghi2014-04-098-29/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch uses the NativeLibraryHelper class to match native libraries in an .apk package with those listed in 'ro.cpu.abilist' property. The result is stored in packages.xml and the ApplicationInfo class. This information will be used by the ActivityManager to decide which zygote to use to launch the given app. Change-Id: I3ec3d050996d8f4621f286ca331b9ad47ea26fa0
* | | | | | | | | | | | | | | resolved conflicts for merge of 286a247e to masterNarayan Kamath2014-04-106-110/+352
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I63df9d482da3ce2ac851959223b9180020ffad0c
| * | | | | | | | | | | | | | am 0fd40cb1: am 80413c9f: Merge "Re-implement native library search and copies."Narayan Kamath2014-04-106-112/+352
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0fd40cb100bccbd5d9ad6109ca39c818a857f889': Re-implement native library search and copies.
| | * | | | | | | | | | | | | am 80413c9f: Merge "Re-implement native library search and copies."Narayan Kamath2014-04-106-112/+352
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '80413c9fe10acf36eaecd139198c7fc17e8af2e6': Re-implement native library search and copies.
| | | * | | | | | | | | | | | Merge "Re-implement native library search and copies."Narayan Kamath2014-04-106-112/+352
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / /
| | | | * | | | | | | | | | | Re-implement native library search and copies.Ramin Zaghi2014-04-096-112/+352
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now use a two step approach : - First we look through the list of shared libraries in an APK, and choose an ABI based on the (priority) list of ABIs a given device supports. - Then we look through the list of shared libraries and copy all shared libraries that match the ABI we've selected. This fixes a long-standing bug where we would sometimes copy a mixture of different ABIs to the device, and also allows us to clearly pick an ABI to run an app with. The code in NativeLibraryHelper has been refactored so that all file name validation & matching logic is done in a single place (NativeLibrariesIterator). This allows us to avoid a lot of redundant logic and straightens out a few corner cases (for eg. where the abi determination & copying logic do not agree on what files to skip). bug: https://code.google.com/p/android/issues/detail?id=65053 bug: 13647418 Change-Id: I34d08353f24115b0f6b800a7eda3ac427fa25fef Co-Authored-By: Zhenghua Wang <zhenghua.wang0923@gmail.com> Co-Authored-By: Ramin Zaghi <ramin.zaghi@arm.com> Co-Authored-By: Narayan Kamath <narayan@google.com>
* | | | | | | | | | | | | | | Merge "Allow setting the active admin across users."Jessica Hummel2014-04-101-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Allow setting the active admin across users.Jessica Hummel2014-04-101-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required so that provisioning can call it from the primary user when it sets up the mdm on the managed profile. Change-Id: I185af168754aa4aeae61f1d4522c1794681cb400
* | | | | | | | | | | | | | | | Merge "Camera2: Add MANUAL capture intent"Zhijun He2014-04-103-2/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Camera2: Add MANUAL capture intentZhijun He2014-04-093-2/+19
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6a3ba818cc7d13e0fcf0d90a16c53884b6cc20ab
generated by cgit v1.1 at 2025-03-31 14:10:20 +0000