summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Camera: Change origin of poseTranslation." into mnc-devEino-Ville Talvala2015-06-042-12/+54
|\
| * Camera: Change origin of poseTranslation.Eino-Ville Talvala2015-06-042-12/+54
| | | | | | | | | | | | | | | | | | No actual defined center for the Android sensor coordinate system exists, so define the translation relative to the largest camera device facing the same way. Bug: 20123879 Change-Id: Ica33d23717c976c063c26b768af5b6148483909c
* | Merge "Ensure RenderScript tracing is always balanced via try/finally" into ↵Chris Craik2015-06-041-278/+348
|\ \ | | | | | | | | | mnc-dev
| * | Ensure RenderScript tracing is always balanced via try/finallyChris Craik2015-06-021-278/+348
| | | | | | | | | | | | | | | | | | bug:21560057 Change-Id: I6709b81636822135848c10adca8ba425f3c2212e
* | | Merge "Fix CameraManager#open exception handling." into mnc-devRuben Brunk2015-06-041-4/+3
|\ \ \
| * | | Fix CameraManager#open exception handling.Ruben Brunk2015-06-041-4/+3
| | | | | | | | | | | | | | | | | | | | Bug: 21620938 Change-Id: I062989c5fed6f99c0566da2f56bfb6b657734a33
* | | | Merge "CameraManager: Ensure all public methods connect to camera service." ↵Eino-Ville Talvala2015-06-041-6/+12
|\ \ \ \ | | | | | | | | | | | | | | | into mnc-dev
| * | | | CameraManager: Ensure all public methods connect to camera service.Eino-Ville Talvala2015-06-041-6/+12
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, registerAvailabilityCallback won't actually cause caller to receive callbacks, if no other methods on CameraManager are ever invoked. Bug: 21536556 Change-Id: I5cded8a59846a971d6272ac3bced44678a533165
* | | | Merge "Make WindowInsets#hasInsets check for stable insets as well" into mnc-devAdam Powell2015-06-041-1/+1
|\ \ \ \
| * | | | Make WindowInsets#hasInsets check for stable insets as wellAdam Powell2015-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 20091509 Change-Id: Ia7dda5ab94a0904277c1078f3f73a59a735860d8
* | | | | Merge "Add optional additional entropy to finish" into mnc-devChad Brubaker2015-06-042-3/+9
|\ \ \ \ \
| * | | | | Add optional additional entropy to finishChad Brubaker2015-06-042-3/+9
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If provided the extra entropy will be added to the device before calling finish. If entropy is provided and the device does not support supplying additional entropy then finish will fail with KM_ERROR_UNIMPLEMENTED. (cherry-picked from commit 9ce30624a448f439e19960d0dd88103c04676e7d) Change-Id: If26be118bf382604f6f8e96e833b76e6f9e94d58
* | | | | Merge "AAPT2: Change xml file parsing to DOM based" into mnc-devAdam Lesinski2015-06-0412-830/+1272
|\ \ \ \ \
| * | | | | AAPT2: Change xml file parsing to DOM basedAdam Lesinski2015-06-0412-830/+1272
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We modify the XML of layouts and AndroidManifest enough that it warrants we operate on the tree in memory. These files are never very large so this should be fine. Change-Id: I5d597abdb3fca2a203cf7c0b40fcd926aecb3137
* | | | | | Merge "Add DENSITY_360" into mnc-devAdam Powell2015-06-043-0/+10
|\ \ \ \ \ \
| * | | | | | Add DENSITY_360Adam Powell2015-06-043-0/+10
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 360dpi as a supported screen density to closer match some hardware's physical specifications. This gives a dp multiplier of 2.25. Bug 19529059 Change-Id: Ibf9c768fba53765ea684ff228d24caf091f27a3e
* | | | | | Fixed punctuation in comment.Amit Mahajan2015-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21559800 Change-Id: I47dc8e7be809cc586c307e72c7e9e11d5268cd5f
* | | | | | Merge "Update getVoiceMessageCount() comments." into mnc-devAmit Mahajan2015-06-041-1/+2
|\ \ \ \ \ \
| * | | | | | Update getVoiceMessageCount() comments.Amit Mahajan2015-06-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21559800 Change-Id: I7a737ae8a93c59391f232b5da6e3b36874126f3a
* | | | | | | Merge "Ringtone: keep a reference until playback completion." into mnc-devEric Laurent2015-06-041-2/+38
|\ \ \ \ \ \ \
| * | | | | | | Ringtone: keep a reference until playback completion.Eric Laurent2015-06-041-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep a reference on active Ringtones to avoid garbage collection before playback is complete. Bug: 11366759. Change-Id: Icb04da427c20e0b4657e9e8b13b3ecab98e5a333
* | | | | | | | Merge "Fix the empty reason field in connectivity change intent." into mnc-devFeixiong Zhang2015-06-041-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix the empty reason field in connectivity change intent.Feixiong Zhang2015-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code set it to null instead of info.getReason. Change-Id: I1b26ad040c23da7080dbfaeb5376181998115805
* | | | | | | | | Merge "Fix abi detection for system apks" into mnc-devDmitriy Ivanov2015-06-041-87/+38
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Fix abi detection for system apksDmitriy Ivanov2015-06-041-87/+38
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prebuilts open their libraries directly from apk. Because of that abi detection is no longer as special as it was before. Bug: 20810492 Bug: 8076853 Change-Id: Icbd39d6062f3c1fcad2038e712b98fbdd9aa2196
* | | | | | | | Merge "Fix Flashlight tile animation" into mnc-devJason Monk2015-06-041-1/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix Flashlight tile animationJason Monk2015-06-041-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't refresh the state if its not different. (This way setAllowAnimation won't get called when it shouldn't) Bug: 21335624 Change-Id: Id6f8961b32d12141db5ac0bb847e4751b8a159b8
* | | | | | | | Merge "Clean up the enter transition even if there is not entering ↵George Mount2015-06-041-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | fragment." into mnc-dev
| * | | | | | | | Clean up the enter transition even if there is not entering fragment.George Mount2015-06-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 21618103 Change-Id: Id670465afd0b743f964d24d7d36d49706b459ac8
* | | | | | | | | Merge "Don't leak windows on removal with dummy animations" into mnc-devAndroid (Google) Code Review2015-06-042-5/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't leak windows on removal with dummy animationsStefan Kuhne2015-06-042-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dummy animations might never end. Do not hold a window removal for it. Bug: 21403998 Change-Id: Ie907d31f51e130e245a70249a983d490f3d42b21
* | | | | | | | | | Merge "Revert "Synchronize selected item data on-demand after data set ↵Alan Viverette2015-06-042-56/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | invalidation"" into mnc-dev
| * | | | | | | | | | Revert "Synchronize selected item data on-demand after data set invalidation"Alan Viverette2015-06-042-56/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL was a can of worms. More extensive changes are needed to decouple AdapterView state from measure/layout passes. This reverts commit abed07f6c0186e16e1c8e8aaceaf8cf961695c66. Change-Id: I4e4e01692a1f660a04e9dfd16db882f13c3d0b94
* | | | | | | | | | | Merge "Also refresh FloatingToolbar for "icon" menu item changes." into mnc-devAbodunrinwa Toki2015-06-041-7/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Also refresh FloatingToolbar for "icon" menu item changes.Abodunrinwa Toki2015-06-011-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21512730 Change-Id: I77f62c46e2d2a11e6cb4329fa8b659bb1a97a6b9
* | | | | | | | | | | | Merge "More API changes." into mnc-devDianne Hackborn2015-06-0420-148/+296
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | More API changes.Dianne Hackborn2015-06-0220-148/+296
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start moving Assist* stuff to android.app.assist. Clean up some more of the VoiceInteractionSession APIs. Clearly document that finish() is not the same as hide(), always call hide() instead, and fix the finish() path to also always do a hide to make sure everything is cleaned up correctly. Change-Id: I962d4069fcb34fe89547a95d395ae1b9fa3b4148
* | | | | | | | | | | | | Merge "Prevent poorly-extended ParcelableSpans from writing to parcels" into ↵Alan Viverette2015-06-0427-34/+273
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | | | | | | | | Prevent poorly-extended ParcelableSpans from writing to parcelsAlan Viverette2015-06-0227-34/+273
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a developer extends an existing ParcelableSpan and overwrites writeToParcel, TextUtils will crash when attempting to unparcel since the span type ID is not accurate. This CL makes a separate framework-private method for writeToParcel to ensure that even if a developer extends a ParcelableSpan class, they won't modify the parceling or unparceling code that's tied to the span type ID. Bug: 21274544 Change-Id: If4c3506a55999df7a3b6d87cb8d550235d7a02c6
* | | | | | | | | | | | | | Merge changes Ia219ff78,I3fd52525 into mnc-devYorke Lee2015-06-042-9/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Add phone permissions to Shell Add adb shell command to register/unregister phone accounts
| * | | | | | | | | | | | | | Add phone permissions to ShellYorke Lee2015-06-032-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are needed for adb shell telecom commands to work on non-eng builds. Also fix a couple of typos in telecom documentation. Change-Id: Ia219ff78f5d65878e43e6b9216f979185495ce7f
| * | | | | | | | | | | | | | Add adb shell command to register/unregister phone accountsYorke Lee2015-06-031-7/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21583012 Change-Id: I3fd525259860fd9e0f9fda5b77cbb9ee7bfab6ca
* | | | | | | | | | | | | | | Enabled expansion and dragging down when QS is expandedSelim Cinek2015-06-043-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously going to the full shade and expanding notifications where disabled when QS was expanded even though there was enough space to allow it. This is now allowed again in order to have a consistent experience. Bug: 19712809 Change-Id: Ie756d9c3fbf9dc2e60a05d02f0f4cc5dd6c7ebe0
* | | | | | | | | | | | | | | Moved the circle finishing animation to the RenderThreadSelim Cinek2015-06-041-3/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the preview clipper animation and our own circle drawing are in sync again when launching an affordance! Bug: 21440634 Change-Id: I96cda04926fb9ae62db6690ddebaf73df38e9ca9
* | | | | | | | | | | | | | | Fixed layer trashing when opening / closing the shadeSelim Cinek2015-06-042-16/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21445574 Change-Id: I67ed5f28581a366a4fa7fdc6355371c1fdd0dac3
* | | | | | | | | | | | | | | Fixed the touch handling when QS was openSelim Cinek2015-06-042-5/+4
| |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QS was open, the panel could not always be correctly scrolled. Bug: 21525300 Change-Id: If18878d08d20254d9d822d80a295163703d897aa
* | | | | | | | | | | | | | Merge "Added logging to debug empty keyguard state" into mnc-devSelim Cinek2015-06-044-4/+84
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Added logging to debug empty keyguard stateSelim Cinek2015-06-044-4/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21124013 Change-Id: Icdc085e993aae073ed7c42333f49644624971787
* | | | | | | | | | | | | | | Merge "Increased the touch target size for the keyboard affordances" into ↵Selim Cinek2015-06-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | | | | | | | | | Increased the touch target size for the keyboard affordancesSelim Cinek2015-06-011-1/+1
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21536583 Change-Id: Id0b693d36cd9d059d84a8b50c1f7ec3ae5938a84