OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 737f0b22: am 7201bf2b: Merge "Unify View alpha implies clipping behavior" into...
Chris Craik [Wed, 29 Apr 2015 19:42:49 +0000 (19:42 +0000)]
am 737f0b22: am 7201bf2b: Merge "Unify View alpha implies clipping behavior" into mnc-dev

* commit '737f0b22bec07297eea782ea2cb29b056e849efc':
  Unify View alpha implies clipping behavior

9 years agoam 7201bf2b: Merge "Unify View alpha implies clipping behavior" into mnc-dev
Chris Craik [Wed, 29 Apr 2015 19:32:42 +0000 (19:32 +0000)]
am 7201bf2b: Merge "Unify View alpha implies clipping behavior" into mnc-dev

* commit '7201bf2b7ebac4ed0be6efd6b046f93a8de5b2d0':
  Unify View alpha implies clipping behavior

9 years agoMerge "Unify View alpha implies clipping behavior" into mnc-dev
Chris Craik [Wed, 29 Apr 2015 19:23:40 +0000 (19:23 +0000)]
Merge "Unify View alpha implies clipping behavior" into mnc-dev

9 years agoam bdf9ffdd: am c0667853: Merge "Add SystemApis in GpsMeasurements APIs to reflect...
destradaa [Wed, 29 Apr 2015 18:25:52 +0000 (18:25 +0000)]
am bdf9ffdd: am c0667853: Merge "Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206" into mnc-dev

* commit 'bdf9ffdd834f5cd021f79c33ce82a16b461f454f':
  Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206

9 years agoam c0667853: Merge "Add SystemApis in GpsMeasurements APIs to reflect changes in...
destradaa [Wed, 29 Apr 2015 18:14:17 +0000 (18:14 +0000)]
am c0667853: Merge "Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206" into mnc-dev

* commit 'c0667853ffad211a5dd40202ff1a4601449b745e':
  Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206

9 years agoMerge "Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/199382...
destradaa [Wed, 29 Apr 2015 18:01:03 +0000 (18:01 +0000)]
Merge "Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206" into mnc-dev

9 years agoam 45b04c1a: am 47ea8b3d: Merge "DO NOT MERGE: Update floatingtoolbar position when...
Abodunrinwa Toki [Wed, 29 Apr 2015 17:43:40 +0000 (17:43 +0000)]
am 45b04c1a: am 47ea8b3d: Merge "DO NOT MERGE: Update floatingtoolbar position when cursor moves." into mnc-dev

* commit '45b04c1a5ef4f21b14b40dd0c1035933188da322':
  DO NOT MERGE: Update floatingtoolbar position when cursor moves.

9 years agoam fbad902a: am 80fa2cc8: Merge "Add android.speech.RecognizerIntent EXTRA_PREFER_OFF...
Cedric Ho [Wed, 29 Apr 2015 17:43:34 +0000 (17:43 +0000)]
am fbad902a: am 80fa2cc8: Merge "Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine." into mnc-dev

* commit 'fbad902aad433f4eaa82192019fef1dcaba26d47':
  Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine.

9 years agoam fb5caad6: am 721474bb: Merge "Add OP_AUTH_NEEDED KeyStore result code" into mnc-dev
Chad Brubaker [Wed, 29 Apr 2015 17:43:30 +0000 (17:43 +0000)]
am fb5caad6: am 721474bb: Merge "Add OP_AUTH_NEEDED KeyStore result code" into mnc-dev

* commit 'fb5caad6d71c1ed0c2ea7065f5bc650822d70e16':
  Add OP_AUTH_NEEDED KeyStore result code

9 years agoam 47ea8b3d: Merge "DO NOT MERGE: Update floatingtoolbar position when cursor moves...
Abodunrinwa Toki [Wed, 29 Apr 2015 17:32:36 +0000 (17:32 +0000)]
am 47ea8b3d: Merge "DO NOT MERGE: Update floatingtoolbar position when cursor moves." into mnc-dev

* commit '47ea8b3d6bcef193a2d0ec9f0141525c83a0bcda':
  DO NOT MERGE: Update floatingtoolbar position when cursor moves.

9 years agoam 80fa2cc8: Merge "Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indic...
Cedric Ho [Wed, 29 Apr 2015 17:32:32 +0000 (17:32 +0000)]
am 80fa2cc8: Merge "Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine." into mnc-dev

* commit '80fa2cc8a96e05cec574bd06c9038ad4255ecafb':
  Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine.

9 years agoam 721474bb: Merge "Add OP_AUTH_NEEDED KeyStore result code" into mnc-dev
Chad Brubaker [Wed, 29 Apr 2015 17:32:27 +0000 (17:32 +0000)]
am 721474bb: Merge "Add OP_AUTH_NEEDED KeyStore result code" into mnc-dev

* commit '721474bb9cfb76e29e0fe6e98c6b582c6fa78fe4':
  Add OP_AUTH_NEEDED KeyStore result code

9 years agoMerge "DO NOT MERGE: Update floatingtoolbar position when cursor moves." into mnc-dev
Abodunrinwa Toki [Wed, 29 Apr 2015 17:26:27 +0000 (17:26 +0000)]
Merge "DO NOT MERGE: Update floatingtoolbar position when cursor moves." into mnc-dev

9 years agoMerge "Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether...
Cedric Ho [Wed, 29 Apr 2015 17:19:38 +0000 (17:19 +0000)]
Merge "Add android.speech.RecognizerIntent EXTRA_PREFER_OFFLINE to indicate whether to only use an offline speech recognition engine." into mnc-dev

9 years agoMerge "Add OP_AUTH_NEEDED KeyStore result code" into mnc-dev
Chad Brubaker [Wed, 29 Apr 2015 17:17:29 +0000 (17:17 +0000)]
Merge "Add OP_AUTH_NEEDED KeyStore result code" into mnc-dev

9 years agoam d2d8f27a: am 2333912c: Restore checkbox checked color to colorControlActivated
Alan Viverette [Wed, 29 Apr 2015 17:12:33 +0000 (17:12 +0000)]
am d2d8f27a: am 2333912c: Restore checkbox checked color to colorControlActivated

* commit 'd2d8f27ab9e0bb13f7aab4929e2ff4a8b547fdde':
  Restore checkbox checked color to colorControlActivated

9 years agoam 91b5e328: (-s ours) am 0e0c9d93: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 29 Apr 2015 17:12:28 +0000 (17:12 +0000)]
am 91b5e328: (-s ours) am 0e0c9d93: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '91b5e32824ae93666a129ca43f9a434328d82f5b':
  Import translations. DO NOT MERGE

9 years agoam 71ce6e9f: am 7a6caae6: Merge "Adjust display inversion matrix to account for lumin...
Alan Viverette [Wed, 29 Apr 2015 17:01:26 +0000 (17:01 +0000)]
am 71ce6e9f: am 7a6caae6: Merge "Adjust display inversion matrix to account for luminance" into mnc-dev

* commit '71ce6e9f6c39ac951d4bdd65b256816e8924cc6b':
  Adjust display inversion matrix to account for luminance

9 years agoam 2333912c: Restore checkbox checked color to colorControlActivated
Alan Viverette [Wed, 29 Apr 2015 16:58:00 +0000 (16:58 +0000)]
am 2333912c: Restore checkbox checked color to colorControlActivated

* commit '2333912c6e4d51995a3fd01286c21c4d0328eb1a':
  Restore checkbox checked color to colorControlActivated

9 years agoam 0e0c9d93: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 29 Apr 2015 16:57:54 +0000 (16:57 +0000)]
am 0e0c9d93: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '0e0c9d9392e4b4580939632ca4e74f2073e59290':
  Import translations. DO NOT MERGE

9 years agoRestore checkbox checked color to colorControlActivated
Alan Viverette [Wed, 29 Apr 2015 16:51:35 +0000 (09:51 -0700)]
Restore checkbox checked color to colorControlActivated

Bug: 20683633
Change-Id: I8997ad5829eda7afa03b7c56d4f44e4abfe34bee

9 years agoam 78a4348a: am eea5a9e0: Merge "DO NOT MERGE - Minor clean up: redundant functionali...
Andrei Stingaceanu [Wed, 29 Apr 2015 16:47:25 +0000 (16:47 +0000)]
am 78a4348a: am eea5a9e0: Merge "DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView." into mnc-dev

* commit '78a4348a535e530ae77c0e7777247d495596be7c':
  DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView.

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 29 Apr 2015 16:46:28 +0000 (16:46 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoam 7a6caae6: Merge "Adjust display inversion matrix to account for luminance" into...
Alan Viverette [Wed, 29 Apr 2015 16:46:08 +0000 (16:46 +0000)]
am 7a6caae6: Merge "Adjust display inversion matrix to account for luminance" into mnc-dev

* commit '7a6caae616fedab08aa3bcb1e37edf5f1e756dda':
  Adjust display inversion matrix to account for luminance

9 years agoMerge "Adjust display inversion matrix to account for luminance" into mnc-dev
Alan Viverette [Wed, 29 Apr 2015 16:38:42 +0000 (16:38 +0000)]
Merge "Adjust display inversion matrix to account for luminance" into mnc-dev

9 years agoam eea5a9e0: Merge "DO NOT MERGE - Minor clean up: redundant functionality in Editor...
Andrei Stingaceanu [Wed, 29 Apr 2015 16:35:23 +0000 (16:35 +0000)]
am eea5a9e0: Merge "DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView." into mnc-dev

* commit 'eea5a9e0de5825bf3629ad52a51a0dcf5f064fe5':
  DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView.

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 29 Apr 2015 16:27:09 +0000 (09:27 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie2516ab34be72c0de86e3d546b349118be9c093c
Auto-generated-cl: translation import

9 years agoMerge "DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView...
Andrei Stingaceanu [Wed, 29 Apr 2015 16:21:14 +0000 (16:21 +0000)]
Merge "DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView." into mnc-dev

9 years agoAdd a libbase static depedency for aapt2.
Narayan Kamath [Wed, 29 Apr 2015 15:32:23 +0000 (16:32 +0100)]
Add a libbase static depedency for aapt2.

Required by libziparchive.

(cherry picked from commit 231e054dfd9dfc2e51ecd41dca5e8d93ae648954)
Change-Id: Ifa33c9e44ebd583cf58b8a1239061c613fde92bc

9 years agoam ad3fcc02: am 19be9d31: Merge "Update bottom area alpha when stack height changes...
Xiyuan Xia [Wed, 29 Apr 2015 16:13:28 +0000 (16:13 +0000)]
am ad3fcc02: am 19be9d31: Merge "Update bottom area alpha when stack height changes" into mnc-dev

* commit 'ad3fcc02719ee0edcf413a54271beb237ec17d13':
  Update bottom area alpha when stack height changes

9 years agoam 19be9d31: Merge "Update bottom area alpha when stack height changes" into mnc-dev
Xiyuan Xia [Wed, 29 Apr 2015 15:59:59 +0000 (15:59 +0000)]
am 19be9d31: Merge "Update bottom area alpha when stack height changes" into mnc-dev

* commit '19be9d31c834f7703a4584eba84bbf4d22027a93':
  Update bottom area alpha when stack height changes

9 years agoMerge "Update bottom area alpha when stack height changes" into mnc-dev
Xiyuan Xia [Wed, 29 Apr 2015 15:46:23 +0000 (15:46 +0000)]
Merge "Update bottom area alpha when stack height changes" into mnc-dev

9 years agoam 6c921033: am b77a7551: Merge "Remove View:hasStaticLayer()" into mnc-dev
John Reck [Wed, 29 Apr 2015 15:11:33 +0000 (15:11 +0000)]
am 6c921033: am b77a7551: Merge "Remove View:hasStaticLayer()" into mnc-dev

* commit '6c9210332c259570259cd1a92c4ae95f9c298f32':
  Remove View:hasStaticLayer()

9 years agoam b77a7551: Merge "Remove View:hasStaticLayer()" into mnc-dev
John Reck [Wed, 29 Apr 2015 14:59:23 +0000 (14:59 +0000)]
am b77a7551: Merge "Remove View:hasStaticLayer()" into mnc-dev

* commit 'b77a7551121561f4ea7d5ce0c4030aeb7ce709e8':
  Remove View:hasStaticLayer()

9 years agoMerge "Remove View:hasStaticLayer()" into mnc-dev
John Reck [Wed, 29 Apr 2015 14:48:27 +0000 (14:48 +0000)]
Merge "Remove View:hasStaticLayer()" into mnc-dev

9 years agoam 6b960a9e: (-s ours) am e1b43ee9: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 29 Apr 2015 14:46:24 +0000 (14:46 +0000)]
am 6b960a9e: (-s ours) am e1b43ee9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '6b960a9e04f25a5827fcc0e675b2de582f8aff84':
  Import translations. DO NOT MERGE

9 years agoam 815d9bb1: Merge "Add a static dependency on libbase."
Narayan Kamath [Wed, 29 Apr 2015 14:38:15 +0000 (14:38 +0000)]
am 815d9bb1: Merge "Add a static dependency on libbase."

* commit '815d9bb178a0488ed1579cd230d447630ad0891b':
  Add a static dependency on libbase.

9 years agoam e1b43ee9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 29 Apr 2015 14:29:19 +0000 (14:29 +0000)]
am e1b43ee9: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'e1b43ee91898b4c24a45cbdaa62b572068f998cf':
  Import translations. DO NOT MERGE

9 years agoam eb3d1a1b: (-s ours) am 62cb506f: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 29 Apr 2015 14:27:24 +0000 (14:27 +0000)]
am eb3d1a1b: (-s ours) am 62cb506f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'eb3d1a1bd7c6c51c8b2701768f27121a17a20b36':
  Import translations. DO NOT MERGE

9 years agoam 2d67b288: am 8dbcda1b: Merge "Volume: Simple dialog footer, DND in quick settings...
John Spurlock [Wed, 29 Apr 2015 14:27:19 +0000 (14:27 +0000)]
am 2d67b288: am 8dbcda1b: Merge "Volume: Simple dialog footer, DND in quick settings." into mnc-dev

* commit '2d67b2887c0a279aa182646f0e23b176783a1aca':
  Volume: Simple dialog footer, DND in quick settings.

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 29 Apr 2015 14:18:40 +0000 (14:18 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 29 Apr 2015 14:18:14 +0000 (07:18 -0700)]
Import translations. DO NOT MERGE

Change-Id: Icf8a8e3bc6d5a88293a6954c35e766ac8c494a4d
Auto-generated-cl: translation import

9 years agoam 62cb506f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 29 Apr 2015 14:11:39 +0000 (14:11 +0000)]
am 62cb506f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '62cb506f27374aecb414d8fa3f064c194d3c69ec':
  Import translations. DO NOT MERGE

9 years agoam 8dbcda1b: Merge "Volume: Simple dialog footer, DND in quick settings." into mnc-dev
John Spurlock [Wed, 29 Apr 2015 14:11:35 +0000 (14:11 +0000)]
am 8dbcda1b: Merge "Volume: Simple dialog footer, DND in quick settings." into mnc-dev

* commit '8dbcda1b33ad9cd1c19052a332404cc221da42ee':
  Volume: Simple dialog footer, DND in quick settings.

9 years agoMerge "Add a static dependency on libbase."
Narayan Kamath [Wed, 29 Apr 2015 14:09:03 +0000 (14:09 +0000)]
Merge "Add a static dependency on libbase."

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 29 Apr 2015 14:08:23 +0000 (14:08 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoAdd a static dependency on libbase.
Narayan Kamath [Tue, 28 Apr 2015 08:23:26 +0000 (09:23 +0100)]
Add a static dependency on libbase.

Used by libziparchive.

Change-Id: I120494b620c72b36a725b01f1f274f5dc862a9a3

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 29 Apr 2015 14:03:31 +0000 (07:03 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ied1d50de849ab195e9f3c9e70c0f8e8dbf9104fe
Auto-generated-cl: translation import

9 years agoMerge "Volume: Simple dialog footer, DND in quick settings." into mnc-dev
John Spurlock [Wed, 29 Apr 2015 14:02:49 +0000 (14:02 +0000)]
Merge "Volume: Simple dialog footer, DND in quick settings." into mnc-dev

9 years agoVolume: Simple dialog footer, DND in quick settings.
John Spurlock [Tue, 28 Apr 2015 15:19:13 +0000 (11:19 -0400)]
Volume: Simple dialog footer, DND in quick settings.

 - Show DND tile by default, this is now the only
   place to manage DND modes / end conditions.
 - Remove super footer from volume dialog, replace with
   a simplified version that displays the current mode
   and allows ending DND.
 - Remove obsolete text-only footer from codebase.
 - Migrate remaining volume items into main resource files.
 - Rename "No interruptions" to "Total silence".
 - Add new user information banner for "Total silence"
 - Crude media filtering for Total Silence.
   (deeper muting changes will be done as a followup)
 - Disable volume dialog sliders completely if muted due
   to zen.
 - Cleanup ZenModePanel: assume embedded mode, remove
   expandable subhead
 - Remember "favorite" DND mode inside the DND config panel.
 - AudioService: consult ringer-mode-delegate before voluming
   down into silent.
 - Add new hour options to time-based exit conditions.
 - Volume dialog visual updates to move closer to final visuals.
 - Unify ringer=silent with DND.

Bug: 19260237
Change-Id: I05d7e001eca3b5125418ec3bc4087d0cb8866717

9 years agoam 4c4471e2: am 1c4a44e5: Do not return cross-profile intent results to a non-enabled...
Nicolas Prevot [Wed, 29 Apr 2015 13:50:04 +0000 (13:50 +0000)]
am 4c4471e2: am 1c4a44e5: Do not return cross-profile intent results to a non-enabled user.

* commit '4c4471e230b0e654a1cfd1468e73b9f58e050b9e':
  Do not return cross-profile intent results to a non-enabled user.

9 years agoam 1c4a44e5: Do not return cross-profile intent results to a non-enabled user.
Nicolas Prevot [Wed, 29 Apr 2015 13:35:01 +0000 (13:35 +0000)]
am 1c4a44e5: Do not return cross-profile intent results to a non-enabled user.

* commit '1c4a44e577c7b8316172d1bf5357d006776ae75e':
  Do not return cross-profile intent results to a non-enabled user.

9 years agoDo not return cross-profile intent results to a non-enabled user.
Nicolas Prevot [Thu, 23 Apr 2015 16:11:47 +0000 (17:11 +0100)]
Do not return cross-profile intent results to a non-enabled user.

In PackageManagerService.queryIntentActivities, do not return
ResolveInfos targeting a user which is not enabled.

BUG:19578138
Change-Id: Id4e730ca8671c26f8cf077bc9c66b3dbd37be482

9 years agoam af275e15: am c4aa3c78: Merge "Add status bar flag to disable quick settings" into...
Benjamin Franz [Wed, 29 Apr 2015 09:35:38 +0000 (09:35 +0000)]
am af275e15: am c4aa3c78: Merge "Add status bar flag to disable quick settings" into mnc-dev

* commit 'af275e157abb8b3add62e5bf1827519820cdf238':
  Add status bar flag to disable quick settings

9 years agoam c4aa3c78: Merge "Add status bar flag to disable quick settings" into mnc-dev
Benjamin Franz [Wed, 29 Apr 2015 09:15:20 +0000 (09:15 +0000)]
am c4aa3c78: Merge "Add status bar flag to disable quick settings" into mnc-dev

* commit 'c4aa3c781a0ddce64853cd5d88bf97f8a9faf98b':
  Add status bar flag to disable quick settings

9 years agoMerge "Add status bar flag to disable quick settings" into mnc-dev
Benjamin Franz [Wed, 29 Apr 2015 08:35:57 +0000 (08:35 +0000)]
Merge "Add status bar flag to disable quick settings" into mnc-dev

9 years agoam 633a45a0: am 25466e0a: Merge "TIF: throw an exception if an operation takes too...
Dongwon Kang [Wed, 29 Apr 2015 05:52:39 +0000 (05:52 +0000)]
am 633a45a0: am 25466e0a: Merge "TIF: throw an exception if an operation takes too long." into mnc-dev

* commit '633a45a0d4e095ae81fc2c3e882c23a6513bbaee':
  TIF: throw an exception if an operation takes too long.

9 years agoam 15c7f90c: am b42d6946: Method to wipe all adoptable disks.
Jeff Sharkey [Wed, 29 Apr 2015 05:52:35 +0000 (05:52 +0000)]
am 15c7f90c: am b42d6946: Method to wipe all adoptable disks.

* commit '15c7f90c8d84ce992659d0ec29bb0e60f1b603d1':
  Method to wipe all adoptable disks.

9 years agoam 25466e0a: Merge "TIF: throw an exception if an operation takes too long." into...
Dongwon Kang [Wed, 29 Apr 2015 05:41:35 +0000 (05:41 +0000)]
am 25466e0a: Merge "TIF: throw an exception if an operation takes too long." into mnc-dev

* commit '25466e0a8f3e0f7f1e758642519f3aa8643f6f26':
  TIF: throw an exception if an operation takes too long.

9 years agoam aa4e35eb: am b36586a7: Split some VolumeInfo state into VolumeRecord.
Jeff Sharkey [Wed, 29 Apr 2015 05:41:33 +0000 (05:41 +0000)]
am aa4e35eb: am b36586a7: Split some VolumeInfo state into VolumeRecord.

* commit 'aa4e35eb6540806958cb37c5c564c5d20dd7a978':
  Split some VolumeInfo state into VolumeRecord.

9 years agoam b42d6946: Method to wipe all adoptable disks.
Jeff Sharkey [Wed, 29 Apr 2015 05:41:30 +0000 (05:41 +0000)]
am b42d6946: Method to wipe all adoptable disks.

* commit 'b42d694691e73d094df616fe78627ada7e1239ef':
  Method to wipe all adoptable disks.

9 years agoMerge "TIF: throw an exception if an operation takes too long." into mnc-dev
Dongwon Kang [Wed, 29 Apr 2015 05:34:24 +0000 (05:34 +0000)]
Merge "TIF: throw an exception if an operation takes too long." into mnc-dev

9 years agoTIF: throw an exception if an operation takes too long.
Dongwon Kang [Mon, 27 Apr 2015 08:43:52 +0000 (17:43 +0900)]
TIF: throw an exception if an operation takes too long.

Bug: 19383373
Change-Id: I915f77af3ab12d10810fd85e55d7d5c5da3d6136

9 years agoam b36586a7: Split some VolumeInfo state into VolumeRecord.
Jeff Sharkey [Wed, 29 Apr 2015 05:29:50 +0000 (05:29 +0000)]
am b36586a7: Split some VolumeInfo state into VolumeRecord.

* commit 'b36586a7c9b7718f33961406537e27bbd9b16211':
  Split some VolumeInfo state into VolumeRecord.

9 years agoMethod to wipe all adoptable disks.
Jeff Sharkey [Wed, 29 Apr 2015 05:25:26 +0000 (22:25 -0700)]
Method to wipe all adoptable disks.

Will be used by various classes doing factory reset.

Bug: 9433509
Change-Id: I0701abe00abc2fb9085ce1ffe6e28fb27c91ab51

9 years agoSplit some VolumeInfo state into VolumeRecord.
Jeff Sharkey [Mon, 27 Apr 2015 15:42:28 +0000 (08:42 -0700)]
Split some VolumeInfo state into VolumeRecord.

VolumeRecord is a historical record of a volume that we've seen in
the past.  It's now surfaced outside the framework for SystemUI to
drive the notifications that bug users to reinsert missing private
volumes.

Show progress notifications for both storage and package movement
operations.  Notify when an empty disk is inserted (no usable volumes)
which launches into the normal format flow.

Add API to forget volumes.

Bug: 2027542420275424
Change-Id: I75602c17fdcd4d1f1f62324e1a08c4a33093eefa

9 years agoam adbbba9f: Merge "Add missing error codes from keymaster_defs.h."
Shawn Willden [Wed, 29 Apr 2015 04:54:33 +0000 (04:54 +0000)]
am adbbba9f: Merge "Add missing error codes from keymaster_defs.h."

* commit 'adbbba9f1dc364e4d3911562fdb8f2e666922e2f':
  Add missing error codes from keymaster_defs.h.

9 years agoam 2ddfcc4a: Merge "Context leaks in EditText causes out of memory"
Alan Viverette [Wed, 29 Apr 2015 04:54:28 +0000 (04:54 +0000)]
am 2ddfcc4a: Merge "Context leaks in EditText causes out of memory"

* commit '2ddfcc4ade5d6db69808a340ae54280872559ec1':
  Context leaks in EditText causes out of memory

9 years agoam c69018da: am 30565ed2: am a39e4d37: am 77ad81b5: am ff1bfac6: am c637af9e: am...
David Friedman [Wed, 29 Apr 2015 04:33:11 +0000 (04:33 +0000)]
am c69018da: am 30565ed2: am a39e4d37: am 77ad81b5: am ff1bfac6: am c637af9e: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs

* commit 'c69018daff3563d5016010ca17820e5e774c3b86':

9 years agoMerge "Add missing error codes from keymaster_defs.h."
Shawn Willden [Wed, 29 Apr 2015 04:30:17 +0000 (04:30 +0000)]
Merge "Add missing error codes from keymaster_defs.h."

9 years agoam 30565ed2: am a39e4d37: am 77ad81b5: am ff1bfac6: am c637af9e: am 75f071df: Merge...
David Friedman [Wed, 29 Apr 2015 04:20:41 +0000 (04:20 +0000)]
am 30565ed2: am a39e4d37: am 77ad81b5: am ff1bfac6: am c637af9e: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs

* commit '30565ed225e6d91c37b438a64f715725b1663058':

9 years agoMerge "Context leaks in EditText causes out of memory"
Alan Viverette [Wed, 29 Apr 2015 04:19:38 +0000 (04:19 +0000)]
Merge "Context leaks in EditText causes out of memory"

9 years agoam 1775e0b2: am 16bf47e8: am 3d983dea: am 21a9fa47: am 75f071df: Merge "Localized...
David Friedman [Wed, 29 Apr 2015 04:18:15 +0000 (04:18 +0000)]
am 1775e0b2: am 16bf47e8: am 3d983dea: am 21a9fa47: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs

* commit '1775e0b295b463996c4617210b9bfdfc4833c12b':
  Localized Android landing pages Bug: 19124242

9 years agoam 16bf47e8: am 3d983dea: am 21a9fa47: am 75f071df: Merge "Localized Android landing...
David Friedman [Wed, 29 Apr 2015 04:08:29 +0000 (04:08 +0000)]
am 16bf47e8: am 3d983dea: am 21a9fa47: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs

* commit '16bf47e8d6c9b9b4a9618fef998d6c9808cb17cb':
  Localized Android landing pages Bug: 19124242

9 years agoam a39e4d37: am 77ad81b5: am ff1bfac6: am c637af9e: am 75f071df: Merge "Localized...
David Friedman [Wed, 29 Apr 2015 04:05:47 +0000 (04:05 +0000)]
am a39e4d37: am 77ad81b5: am ff1bfac6: am c637af9e: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs

* commit 'a39e4d3716a10e84acbfc0813745ee4303f1edb2':

9 years agoam 3d983dea: am 21a9fa47: am 75f071df: Merge "Localized Android landing pages Bug...
David Friedman [Wed, 29 Apr 2015 03:51:39 +0000 (03:51 +0000)]
am 3d983dea: am 21a9fa47: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs

* commit '3d983deace20df9437bc9efebc67550f3904eee3':
  Localized Android landing pages Bug: 19124242

9 years agoam 77ad81b5: am ff1bfac6: am c637af9e: am 75f071df: Merge "Localized Android landing...
David Friedman [Wed, 29 Apr 2015 03:48:52 +0000 (03:48 +0000)]
am 77ad81b5: am ff1bfac6: am c637af9e: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs

* commit '77ad81b5301bfbf1691bdad203dd70ce68ce40b3':

9 years agoam ff1bfac6: am c637af9e: am 75f071df: Merge "Localized Android landing pages Bug...
David Friedman [Wed, 29 Apr 2015 03:25:38 +0000 (03:25 +0000)]
am ff1bfac6: am c637af9e: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs

* commit 'ff1bfac68b977f577d537172d87daa5c816be3b7':
  Localized Android landing pages Bug: 19124242

9 years agoam 21a9fa47: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into...
David Friedman [Wed, 29 Apr 2015 03:25:15 +0000 (03:25 +0000)]
am 21a9fa47: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs

* commit '21a9fa471bcc57196a19e40ca29dbaa97233244c':
  Localized Android landing pages Bug: 19124242

9 years agoam c637af9e: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into...
David Friedman [Wed, 29 Apr 2015 03:13:59 +0000 (03:13 +0000)]
am c637af9e: am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs

* commit 'c637af9eee48334e6d8d65428734c8928e9bac55':
  Localized Android landing pages Bug: 19124242

9 years agoam 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs
David Friedman [Wed, 29 Apr 2015 03:01:57 +0000 (03:01 +0000)]
am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs

* commit '75f071df44d3231f2f9d2616277b9065e1dedc12':
  Localized Android landing pages Bug: 19124242

9 years agoam 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs
David Friedman [Wed, 29 Apr 2015 03:01:10 +0000 (03:01 +0000)]
am 75f071df: Merge "Localized Android landing pages Bug: 19124242" into lmp-docs

* commit '75f071df44d3231f2f9d2616277b9065e1dedc12':
  Localized Android landing pages Bug: 19124242

9 years agoMerge "Localized Android landing pages Bug: 19124242" into lmp-docs
David Friedman [Wed, 29 Apr 2015 02:49:23 +0000 (02:49 +0000)]
Merge "Localized Android landing pages Bug: 19124242" into lmp-docs

9 years agoam ecde0330: am 0838084a: Merge "Align AndroidKeyStore API with user auth API." into...
Alex Klyubin [Wed, 29 Apr 2015 02:01:16 +0000 (02:01 +0000)]
am ecde0330: am 0838084a: Merge "Align AndroidKeyStore API with user auth API." into mnc-dev

* commit 'ecde03306541259d786aeac9a658f440a2e1b098':
  Align AndroidKeyStore API with user auth API.

9 years agoam d5a9ff0e: am b957a742: Merge changes from topic \'brightness\' into mnc-dev
Jeff Brown [Wed, 29 Apr 2015 02:01:11 +0000 (02:01 +0000)]
am d5a9ff0e: am b957a742: Merge changes from topic \'brightness\' into mnc-dev

* commit 'd5a9ff0e7bec6d1e4b93fc8475ca18f5ec0256e1':
  Add code to collect data about auto-brightness adjustments.
  Add float support to binary event log.

9 years agoam c55ab042: am 46fc1101: Merge "Use Default Browser App for IntentResolution when...
Fabrice Di Meglio [Wed, 29 Apr 2015 02:01:06 +0000 (02:01 +0000)]
am c55ab042: am 46fc1101: Merge "Use Default Browser App for IntentResolution when needed" into mnc-dev

* commit 'c55ab0422e4232a0c6bfc3fe5c01dc7d995fcd99':
  Use Default Browser App for IntentResolution when needed

9 years agoam a01fade4: am d6db7eac: Merge "Don\'t ostensibly back off fstrim but then do it...
Christopher Tate [Wed, 29 Apr 2015 02:01:02 +0000 (02:01 +0000)]
am a01fade4: am d6db7eac: Merge "Don\'t ostensibly back off fstrim but then do it anyway" into mnc-dev

* commit 'a01fade4c9d34f9575c4c8023fc9610ab8bac9c7':
  Don't ostensibly back off fstrim but then do it anyway

9 years agoam b3c7ad32: am 7c97a3dd: Merge "Permissions control via profile/device owner admin...
Amith Yamasani [Wed, 29 Apr 2015 02:00:50 +0000 (02:00 +0000)]
am b3c7ad32: am 7c97a3dd: Merge "Permissions control via profile/device owner admin" into mnc-dev

* commit 'b3c7ad328d0a9467ed3864a84ed822720e970334':
  Permissions control via profile/device owner admin

9 years agoam 7374dc35: am 1f1b88b2: Merge "AccountsDb Logging]: Introducing logging in accounts...
Simranjit Singh Kohli [Wed, 29 Apr 2015 02:00:45 +0000 (02:00 +0000)]
am 7374dc35: am 1f1b88b2: Merge "AccountsDb Logging]: Introducing logging in accountsDb." into mnc-dev

* commit '7374dc3547128ed6330c9fbd99fc84e56ce97513':
  AccountsDb Logging]: Introducing logging in accountsDb.

9 years agoam 1e66f25a: am 325a5721: Merge "Properly describe exception" into mnc-dev
Mathieu Chartier [Wed, 29 Apr 2015 02:00:40 +0000 (02:00 +0000)]
am 1e66f25a: am 325a5721: Merge "Properly describe exception" into mnc-dev

* commit '1e66f25a167a0300152c953271df8aabeecdfcf2':
  Properly describe exception

9 years agoam 837bf24e: am e861c8eb: Merge "Fix DatePicker max date, disabled day color, and...
Alan Viverette [Wed, 29 Apr 2015 02:00:31 +0000 (02:00 +0000)]
am 837bf24e: am e861c8eb: Merge "Fix DatePicker max date, disabled day color, and arrow visibility" into mnc-dev

* commit '837bf24ee4c44d344f6fc5959c758bf3c287e8b3':
  Fix DatePicker max date, disabled day color, and arrow visibility

9 years agoam 49937b5c: am b1c9539d: Merge "@hide resizeableActivity attribute and remove from...
Wale Ogunwale [Wed, 29 Apr 2015 02:00:25 +0000 (02:00 +0000)]
am 49937b5c: am b1c9539d: Merge "@hide resizeableActivity attribute and remove from public api" into mnc-dev

* commit '49937b5c464582a44d119c07f3b71412dbb2051e':
  @hide resizeableActivity attribute and remove from public api

9 years agoam 15ec725c: am b3a020a6: Merge "Fix build." into mnc-dev
Jorim Jaggi [Wed, 29 Apr 2015 02:00:19 +0000 (02:00 +0000)]
am 15ec725c: am b3a020a6: Merge "Fix build." into mnc-dev

* commit '15ec725ce2a4811f8e5948d56609793dc3dfcf17':
  Fix build.

9 years agoam 3a9c049d: am 61a75423: Merge "Follow up CL for heads up notification refactoring...
Selim Cinek [Wed, 29 Apr 2015 02:00:14 +0000 (02:00 +0000)]
am 3a9c049d: am 61a75423: Merge "Follow up CL for heads up notification refactoring" into mnc-dev

* commit '3a9c049d03b250cf309895179821604a443a961a':
  Follow up CL for heads up notification refactoring

9 years agoam f77899f9: am f7143ce6: Merge "Make BIND_INCALL_SERVICE and BIND_CONNECTION_SERVICE...
Yorke Lee [Wed, 29 Apr 2015 02:00:08 +0000 (02:00 +0000)]
am f77899f9: am f7143ce6: Merge "Make BIND_INCALL_SERVICE and BIND_CONNECTION_SERVICE public" into mnc-dev

* commit 'f77899f90b5a6498eda6bdc482c5c0f1ba00fc21':
  Make BIND_INCALL_SERVICE and BIND_CONNECTION_SERVICE public

9 years agoam 25e17ef6: am de8c7526: Merge "Give scheduled jobs a more substantial timeslice...
Christopher Tate [Wed, 29 Apr 2015 02:00:03 +0000 (02:00 +0000)]
am 25e17ef6: am de8c7526: Merge "Give scheduled jobs a more substantial timeslice" into mnc-dev

* commit '25e17ef6d7f56d0f157b799bfc2ad0315b413286':
  Give scheduled jobs a more substantial timeslice

9 years agoam 463444fb: am 420f2688: Merge "Only listen for fingerprint if needed." into mnc-dev
Jorim Jaggi [Wed, 29 Apr 2015 01:59:56 +0000 (01:59 +0000)]
am 463444fb: am 420f2688: Merge "Only listen for fingerprint if needed." into mnc-dev

* commit '463444fb231ed724ec915ce9f99de5ef94c53e05':
  Only listen for fingerprint if needed.

9 years agoam de2aef5a: am 9a1df486: Merge "Add animation for fingerprint error state" into...
Jorim Jaggi [Wed, 29 Apr 2015 01:59:51 +0000 (01:59 +0000)]
am de2aef5a: am 9a1df486: Merge "Add animation for fingerprint error state" into mnc-dev

* commit 'de2aef5a4e9735fadfe96f587706c526c07cc578':
  Add animation for fingerprint error state

9 years agoam 78cc38d5: am 4e678ff8: Merge "Fix a bug when constructing a ChooserTargetAdapter...
Adam Powell [Wed, 29 Apr 2015 01:59:44 +0000 (01:59 +0000)]
am 78cc38d5: am 4e678ff8: Merge "Fix a bug when constructing a ChooserTargetAdapter without custom targets" into mnc-dev

* commit '78cc38d5011df42eb8d15eef81a6bef63c5f2eaa':
  Fix a bug when constructing a ChooserTargetAdapter without custom targets

9 years agoam dffb90fe: am ca067e97: Merge "Rename windowLightStatusBar" into mnc-dev
Adrian Roos [Wed, 29 Apr 2015 01:59:32 +0000 (01:59 +0000)]
am dffb90fe: am ca067e97: Merge "Rename windowLightStatusBar" into mnc-dev

* commit 'dffb90fe1baa19c5de6156048420e8988b901949':
  Rename windowLightStatusBar