OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoam 82e6edfe: am 95026e03: am eb372c93: Merge "Bug: 22718745 Intents to \'draw over...
Billy Lau [Thu, 30 Jul 2015 17:39:21 +0000 (17:39 +0000)]
am 82e6edfe: am 95026e03: am eb372c93: Merge "Bug: 22718745 Intents to \'draw over other apps\' should go direct to the package\'s page instead of the top level one" into mnc-dev

* commit '82e6edfe1bad73b6757aa93725e74fb7f69a26a4':
  Bug: 22718745 Intents to 'draw over other apps' should go direct to the package's page instead of the top level one

9 years agoam 95026e03: am eb372c93: Merge "Bug: 22718745 Intents to \'draw over other apps...
Billy Lau [Thu, 30 Jul 2015 17:30:01 +0000 (17:30 +0000)]
am 95026e03: am eb372c93: Merge "Bug: 22718745 Intents to \'draw over other apps\' should go direct to the package\'s page instead of the top level one" into mnc-dev

* commit '95026e032809f39fb2aece05e8b3d8f74eca77ea':
  Bug: 22718745 Intents to 'draw over other apps' should go direct to the package's page instead of the top level one

9 years agoam eb372c93: Merge "Bug: 22718745 Intents to \'draw over other apps\' should go direc...
Billy Lau [Thu, 30 Jul 2015 17:22:04 +0000 (17:22 +0000)]
am eb372c93: Merge "Bug: 22718745 Intents to \'draw over other apps\' should go direct to the package\'s page instead of the top level one" into mnc-dev

* commit 'eb372c93ee00fa9365206129136501497e6341c7':
  Bug: 22718745 Intents to 'draw over other apps' should go direct to the package's page instead of the top level one

9 years agoMerge "Bug: 22718745 Intents to 'draw over other apps' should go direct to the packag...
Billy Lau [Thu, 30 Jul 2015 17:14:17 +0000 (17:14 +0000)]
Merge "Bug: 22718745 Intents to 'draw over other apps' should go direct to the package's page instead of the top level one" into mnc-dev

9 years agoam e520015e: am bebcdd0c: am 19128bd1: Extend char limit by small amount
Jason Monk [Thu, 30 Jul 2015 15:54:36 +0000 (15:54 +0000)]
am e520015e: am bebcdd0c: am 19128bd1: Extend char limit by small amount

* commit 'e520015efa55b02938c8f1bafb5e45313c057dd1':
  Extend char limit by small amount

9 years agoam bebcdd0c: am 19128bd1: Extend char limit by small amount
Jason Monk [Thu, 30 Jul 2015 15:39:44 +0000 (15:39 +0000)]
am bebcdd0c: am 19128bd1: Extend char limit by small amount

* commit 'bebcdd0cb0405c03a72fe55bc4b198877a4f1516':
  Extend char limit by small amount

9 years agoam 19128bd1: Extend char limit by small amount
Jason Monk [Thu, 30 Jul 2015 15:22:41 +0000 (15:22 +0000)]
am 19128bd1: Extend char limit by small amount

* commit '19128bd1679cfcad3e38a447dd4584fa5280920f':
  Extend char limit by small amount

9 years agoExtend char limit by small amount
Jason Monk [Thu, 30 Jul 2015 15:05:09 +0000 (11:05 -0400)]
Extend char limit by small amount

Bug: 22822007
Bug: 22687961
Change-Id: I9a1528dc7175cfd530900e51d2210224ff07ab23

9 years agoam bca7e3d1: (-s ours) am cfb389e8: (-s ours) am 597d75ea: (-s ours) Import translati...
Geoff Mendal [Thu, 30 Jul 2015 13:11:40 +0000 (13:11 +0000)]
am bca7e3d1: (-s ours) am cfb389e8: (-s ours) am 597d75ea: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam cfb389e8: (-s ours) am 597d75ea: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 30 Jul 2015 12:58:45 +0000 (12:58 +0000)]
am cfb389e8: (-s ours) am 597d75ea: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 597d75ea: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 30 Jul 2015 12:46:45 +0000 (12:46 +0000)]
am 597d75ea: (-s ours) Import translations. DO NOT MERGE

* commit '597d75eaad03047d0f55c49ce9c0d788f5a72a72':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 30 Jul 2015 12:35:46 +0000 (05:35 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam de5d7ea9: (-s ours) am f273d917: (-s ours) am 53f771d8: (-s ours) Import translati...
Geoff Mendal [Wed, 29 Jul 2015 23:22:31 +0000 (23:22 +0000)]
am de5d7ea9: (-s ours) am f273d917: (-s ours) am 53f771d8: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam f273d917: (-s ours) am 53f771d8: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 29 Jul 2015 23:02:07 +0000 (23:02 +0000)]
am f273d917: (-s ours) am 53f771d8: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 53f771d8: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 29 Jul 2015 22:50:48 +0000 (22:50 +0000)]
am 53f771d8: (-s ours) Import translations. DO NOT MERGE

* commit '53f771d8218c553248d0954fba2f25b4257838b2':
  Import translations. DO NOT MERGE

9 years agoam 1b730cb7: am 434d55e5: am 23ace013: Merge "Adjustments for find sensor screen...
Jorim Jaggi [Wed, 29 Jul 2015 22:39:34 +0000 (22:39 +0000)]
am 1b730cb7: am 434d55e5: am 23ace013: Merge "Adjustments for find sensor screen" into mnc-dev

* commit '1b730cb77eb44e9e6938e11fe19522dcd909ec2f':
  Adjustments for find sensor screen

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 29 Jul 2015 22:31:28 +0000 (15:31 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 434d55e5: am 23ace013: Merge "Adjustments for find sensor screen" into mnc-dev
Jorim Jaggi [Wed, 29 Jul 2015 22:26:16 +0000 (22:26 +0000)]
am 434d55e5: am 23ace013: Merge "Adjustments for find sensor screen" into mnc-dev

* commit '434d55e591bfb7cc84fed8d8574624425348a711':
  Adjustments for find sensor screen

9 years agoam 23ace013: Merge "Adjustments for find sensor screen" into mnc-dev
Jorim Jaggi [Wed, 29 Jul 2015 22:14:09 +0000 (22:14 +0000)]
am 23ace013: Merge "Adjustments for find sensor screen" into mnc-dev

* commit '23ace01340906e9615f747b0adeaac4bf7bf1dc2':
  Adjustments for find sensor screen

9 years agoBug: 22718745 Intents to 'draw over other apps' should go direct to the package's
Billy Lau [Mon, 27 Jul 2015 11:57:07 +0000 (12:57 +0100)]
Bug: 22718745 Intents to 'draw over other apps' should go direct to the package's
page instead of the top level one

Settings:
Added two activities to handle app-specific Intent when app invoke permission
management UI.

SettingsActivity:
Added two fragment classes to handle app-specific Intent when app invoke permission
management UI.

AndroidManifest.xml:
We handle both Intent to top level settings and app-specific management UI for
app ops protected permissions.

AppStateAppOpsBridge:
Added a new field to PermissionState to keep track of permission declared vs one
that is actually granted during install time.

AppState{Overlay/Usage/WriteSettings}Bridge:
Updated the fields affected by changes in PermissionState.

{DrawOverlay/UsageAccess/WriteSettings}Details:
Disabled the toggling of permission if the app did not declare for the asked
permission.

Change-Id: Ibf63e4d9a4fbf7899a93d2176abb1204c4f75557

9 years agoMerge "Adjustments for find sensor screen" into mnc-dev
Jorim Jaggi [Wed, 29 Jul 2015 21:58:43 +0000 (21:58 +0000)]
Merge "Adjustments for find sensor screen" into mnc-dev

9 years agoam 0ce45dbb: am 1df9a7cc: am 3760e5e7: Merge "[ZenMode] Align text to viewStart in...
Maurice Lam [Wed, 29 Jul 2015 19:13:30 +0000 (19:13 +0000)]
am 0ce45dbb: am 1df9a7cc: am 3760e5e7: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev

* commit '0ce45dbbe74c45f89098cde7239c257e3cf87d5d':
  [ZenMode] Align text to viewStart in remove dialog

9 years agoam 1df9a7cc: am 3760e5e7: Merge "[ZenMode] Align text to viewStart in remove dialog...
Maurice Lam [Wed, 29 Jul 2015 18:53:41 +0000 (18:53 +0000)]
am 1df9a7cc: am 3760e5e7: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev

* commit '1df9a7cc16a9dd9892b633aad4ec246677d2c6b5':
  [ZenMode] Align text to viewStart in remove dialog

9 years agoam 3760e5e7: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev
Maurice Lam [Wed, 29 Jul 2015 18:39:00 +0000 (18:39 +0000)]
am 3760e5e7: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev

* commit '3760e5e7e4ae17012cf0f336fa0d8d62ecbf5e69':
  [ZenMode] Align text to viewStart in remove dialog

9 years agoam 24a1ac36: am c2f62f65: am 00b5488c: Merge "Change assist app warning message text...
Julia Reynolds [Wed, 29 Jul 2015 18:30:46 +0000 (18:30 +0000)]
am 24a1ac36: am c2f62f65: am 00b5488c: Merge "Change assist app warning message text" into mnc-dev

* commit '24a1ac3620f8fd983f42d38d24a32b13f74b8cda':
  Change assist app warning message text

9 years agoam 6785be73: am 089e9e9a: am ae422fd0: Merge "Change \'data\' label to \'data usage...
Julia Reynolds [Wed, 29 Jul 2015 18:30:45 +0000 (18:30 +0000)]
am 6785be73: am 089e9e9a: am ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev

* commit '6785be7362a158926e36f0bfe3f721082c9be3f3':
  Change 'data' label to 'data usage'.

9 years agoMerge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev
Maurice Lam [Wed, 29 Jul 2015 18:25:48 +0000 (18:25 +0000)]
Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev

9 years agoam c2f62f65: am 00b5488c: Merge "Change assist app warning message text" into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 18:03:57 +0000 (18:03 +0000)]
am c2f62f65: am 00b5488c: Merge "Change assist app warning message text" into mnc-dev

* commit 'c2f62f650a16aead5f6806ca2ac7ae400775c935':
  Change assist app warning message text

9 years agoam 089e9e9a: am ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 18:03:56 +0000 (18:03 +0000)]
am 089e9e9a: am ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev

* commit '089e9e9a0dc4ad2c87e0ca79c16b6375b9623554':
  Change 'data' label to 'data usage'.

9 years agoam 00b5488c: Merge "Change assist app warning message text" into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 17:41:15 +0000 (17:41 +0000)]
am 00b5488c: Merge "Change assist app warning message text" into mnc-dev

* commit '00b5488c67d3e7d1fd2905a24a6382f81026e5e7':
  Change assist app warning message text

9 years agoam ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 17:41:14 +0000 (17:41 +0000)]
am ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev

* commit 'ae422fd0991e5dd8fab6816153ed0f4b6653beb0':
  Change 'data' label to 'data usage'.

9 years agoMerge "Change assist app warning message text" into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 17:26:12 +0000 (17:26 +0000)]
Merge "Change assist app warning message text" into mnc-dev

9 years agoMerge "Change 'data' label to 'data usage'." into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 17:25:41 +0000 (17:25 +0000)]
Merge "Change 'data' label to 'data usage'." into mnc-dev

9 years agoChange 'data' label to 'data usage'.
Julia Reynolds [Wed, 29 Jul 2015 17:15:14 +0000 (13:15 -0400)]
Change 'data' label to 'data usage'.

Bug: 22350292
Change-Id: I70733b301e734213d2fdec5e7ffb62a7e30ef94c

9 years agoChange assist app warning message text
Julia Reynolds [Wed, 29 Jul 2015 17:01:10 +0000 (13:01 -0400)]
Change assist app warning message text

Bug: 22816916
Change-Id: I43259ab526710fd193a16c6cb49580042dca8555

9 years agoam 59f07cc7: am cb176a41: am 2a56d7f2: Merge "fix InactiveApps instrumentation" into...
Chris Wren [Wed, 29 Jul 2015 16:49:46 +0000 (16:49 +0000)]
am 59f07cc7: am cb176a41: am 2a56d7f2: Merge "fix InactiveApps instrumentation" into mnc-dev

* commit '59f07cc7c80b144c3ee618955fa6d8121347a6a7':
  fix InactiveApps instrumentation

9 years agoam cb176a41: am 2a56d7f2: Merge "fix InactiveApps instrumentation" into mnc-dev
Chris Wren [Wed, 29 Jul 2015 16:26:32 +0000 (16:26 +0000)]
am cb176a41: am 2a56d7f2: Merge "fix InactiveApps instrumentation" into mnc-dev

* commit 'cb176a41ad0ac94a65ed13bf1e18242f8220bd5b':
  fix InactiveApps instrumentation

9 years agoam 2a56d7f2: Merge "fix InactiveApps instrumentation" into mnc-dev
Chris Wren [Wed, 29 Jul 2015 16:11:21 +0000 (16:11 +0000)]
am 2a56d7f2: Merge "fix InactiveApps instrumentation" into mnc-dev

* commit '2a56d7f23b4ef87ffb44ab6fcc4fbae6283a3242':
  fix InactiveApps instrumentation

9 years agoMerge "fix InactiveApps instrumentation" into mnc-dev
Chris Wren [Wed, 29 Jul 2015 14:57:14 +0000 (14:57 +0000)]
Merge "fix InactiveApps instrumentation" into mnc-dev

9 years agoam f13f08be: (-s ours) am fe6fc96a: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 29 Jul 2015 14:36:40 +0000 (14:36 +0000)]
am f13f08be: (-s ours) am fe6fc96a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

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

9 years agoam d93b6412: am 3c975a9f: am edb2668c: Merge "Add contactless symbol to NFC resources...
Martijn Coenen [Wed, 29 Jul 2015 14:16:35 +0000 (14:16 +0000)]
am d93b6412: am 3c975a9f: am edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev

* commit 'd93b6412801706311b9389f789ecdf76969695db':
  Add contactless symbol to NFC resources.

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

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

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 29 Jul 2015 13:56:59 +0000 (06:56 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 3c975a9f: am edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev
Martijn Coenen [Wed, 29 Jul 2015 13:55:08 +0000 (13:55 +0000)]
am 3c975a9f: am edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev

* commit '3c975a9fc15c39077613ce741e71fa2baf789492':
  Add contactless symbol to NFC resources.

9 years agoam edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev
Martijn Coenen [Wed, 29 Jul 2015 13:34:38 +0000 (13:34 +0000)]
am edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev

* commit 'edb2668c6d7d2ccfc3b7b42abcc9b46ffdf3d155':
  Add contactless symbol to NFC resources.

9 years agoMerge "Add contactless symbol to NFC resources." into mnc-dev
Martijn Coenen [Wed, 29 Jul 2015 13:21:40 +0000 (13:21 +0000)]
Merge "Add contactless symbol to NFC resources." into mnc-dev

9 years agoam 1990f8f7: am cb91edae: am 300d6fd9: Merge "Use pattern visibility setting on confi...
Julia Reynolds [Wed, 29 Jul 2015 13:20:37 +0000 (13:20 +0000)]
am 1990f8f7: am cb91edae: am 300d6fd9: Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev

* commit '1990f8f722a050e8eccbf9755c5a6d7e1487132f':
  Use pattern visibility setting on confirm pattern screen.

9 years agoam f2d5e02c: am 39768c86: am f889faaf: Merge "Bump string char limit." into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 13:20:33 +0000 (13:20 +0000)]
am f2d5e02c: am 39768c86: am f889faaf: Merge "Bump string char limit." into mnc-dev

* commit 'f2d5e02c4d9334545247e437712f4407e97f84ca':
  Bump string char limit.

9 years agoam cb91edae: am 300d6fd9: Merge "Use pattern visibility setting on confirm pattern...
Julia Reynolds [Wed, 29 Jul 2015 13:00:27 +0000 (13:00 +0000)]
am cb91edae: am 300d6fd9: Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev

* commit 'cb91edaeb2fd9bdf8a77a994c4767fac808bbe36':
  Use pattern visibility setting on confirm pattern screen.

9 years agoam 39768c86: am f889faaf: Merge "Bump string char limit." into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 13:00:24 +0000 (13:00 +0000)]
am 39768c86: am f889faaf: Merge "Bump string char limit." into mnc-dev

* commit '39768c86af48e26717110814f2f208e64e854331':
  Bump string char limit.

9 years agoam 300d6fd9: Merge "Use pattern visibility setting on confirm pattern screen." into...
Julia Reynolds [Wed, 29 Jul 2015 12:39:12 +0000 (12:39 +0000)]
am 300d6fd9: Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev

* commit '300d6fd90c3b63948d86e140353604baa8339a34':
  Use pattern visibility setting on confirm pattern screen.

9 years agoam f889faaf: Merge "Bump string char limit." into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 12:39:11 +0000 (12:39 +0000)]
am f889faaf: Merge "Bump string char limit." into mnc-dev

* commit 'f889faaf0829f011225882b160aa61158a7f69c2':
  Bump string char limit.

9 years agoMerge "Use pattern visibility setting on confirm pattern screen." into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 12:25:54 +0000 (12:25 +0000)]
Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev

9 years agoMerge "Bump string char limit." into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 12:25:28 +0000 (12:25 +0000)]
Merge "Bump string char limit." into mnc-dev

9 years agoam b0390ed0: am de661d5b: am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev
Martijn Coenen [Wed, 29 Jul 2015 10:27:36 +0000 (10:27 +0000)]
am b0390ed0: am de661d5b: am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev

* commit 'b0390ed0e57af73a2ee6a692598fe8dd28748d72':
  Fix tap & pay strings.

9 years agoam de661d5b: am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev
Martijn Coenen [Wed, 29 Jul 2015 10:06:07 +0000 (10:06 +0000)]
am de661d5b: am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev

* commit 'de661d5b15e6d645229be4ea582a7d01fe160b9c':
  Fix tap & pay strings.

9 years agoAdd contactless symbol to NFC resources.
Martijn Coenen [Wed, 29 Jul 2015 08:10:35 +0000 (10:10 +0200)]
Add contactless symbol to NFC resources.

Bug: 22534220
Change-Id: I9227d74386716520d2cf98d7f032051815f34431

9 years agoam 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev
Martijn Coenen [Wed, 29 Jul 2015 08:10:14 +0000 (08:10 +0000)]
am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev

* commit '8e7b9cf9f67344192de98c951c11f144d1cdcd13':
  Fix tap & pay strings.

9 years agoMerge "Fix tap & pay strings." into mnc-dev
Martijn Coenen [Wed, 29 Jul 2015 07:54:04 +0000 (07:54 +0000)]
Merge "Fix tap & pay strings." into mnc-dev

9 years agoAdjustments for find sensor screen
Jorim Jaggi [Tue, 28 Jul 2015 23:55:00 +0000 (16:55 -0700)]
Adjustments for find sensor screen

Bug: 22484203
Change-Id: I3adb258c60eb165d7d4e695705dc430fc2dd4170

9 years agoam b5c146ee: am ecb19d54: am a425e864: Merge "Hide apps in the battery menu that...
Zach Johnson [Tue, 28 Jul 2015 23:33:58 +0000 (23:33 +0000)]
am b5c146ee: am ecb19d54: am a425e864: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev

* commit 'b5c146eef9dcbc405530ef1855d192ec59119100':
  Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED

9 years agoam ecb19d54: am a425e864: Merge "Hide apps in the battery menu that have COMPONENT_EN...
Zach Johnson [Tue, 28 Jul 2015 23:18:57 +0000 (23:18 +0000)]
am ecb19d54: am a425e864: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev

* commit 'ecb19d540025a6c1855d148f1b4015f3a107bfd1':
  Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED

9 years agoam a425e864: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_D...
Zach Johnson [Tue, 28 Jul 2015 22:57:58 +0000 (22:57 +0000)]
am a425e864: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev

* commit 'a425e86478b60c4eb1f90f47197fa244379879de':
  Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED

9 years agoMerge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL...
Zach Johnson [Tue, 28 Jul 2015 22:36:31 +0000 (22:36 +0000)]
Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev

9 years agoam 8bdb5561: am 85bdb773: am 5b5ed310: Merge "Prevent crash in app memory updater...
Julia Reynolds [Tue, 28 Jul 2015 21:37:27 +0000 (21:37 +0000)]
am 8bdb5561: am 85bdb773: am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev

* commit '8bdb556174bfb8a903040a5310e3d48f2c4be5bf':
  Prevent crash in app memory updater.

9 years agoam 2ade0a5e: am b7c6306b: am feeae4cd: Merge "Hide usage graph on app usage details...
Julia Reynolds [Tue, 28 Jul 2015 21:37:26 +0000 (21:37 +0000)]
am 2ade0a5e: am b7c6306b: am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev

* commit '2ade0a5e7bb52438732555f860f924c0eeacd3c2':
  Hide usage graph on app usage details pages.

9 years agoam 85bdb773: am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev
Julia Reynolds [Tue, 28 Jul 2015 21:16:06 +0000 (21:16 +0000)]
am 85bdb773: am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev

* commit '85bdb7730814c1f1d8d13dec40e203e94fa87215':
  Prevent crash in app memory updater.

9 years agoam b7c6306b: am feeae4cd: Merge "Hide usage graph on app usage details pages." into...
Julia Reynolds [Tue, 28 Jul 2015 21:16:03 +0000 (21:16 +0000)]
am b7c6306b: am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev

* commit 'b7c6306b8322de90e5a620ac5e670216685c7841':
  Hide usage graph on app usage details pages.

9 years agoam 831e3f66: am 7abb5164: am 5458688c: Merge "Make fingerprint error text a live...
Jorim Jaggi [Tue, 28 Jul 2015 20:54:38 +0000 (20:54 +0000)]
am 831e3f66: am 7abb5164: am 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev

* commit '831e3f665a1f2ea1fa95f6c3a3380713ce9c00b1':
  Make fingerprint error text a live region

9 years agoam 4d0b9669: am f6bdf532: am 74af384c: Merge "Adjust enrollment UI for sw400 devices...
Jorim Jaggi [Tue, 28 Jul 2015 20:54:36 +0000 (20:54 +0000)]
am 4d0b9669: am f6bdf532: am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev

* commit '4d0b9669e8d5813fa61f7515ae3cfc7aca13851b':
  Adjust enrollment UI for sw400 devices

9 years agoam a15cf227: am 22064d8b: am 4d9f5c91: Merge "Don\'t use screenshot if structure...
Jorim Jaggi [Tue, 28 Jul 2015 20:54:35 +0000 (20:54 +0000)]
am a15cf227: am 22064d8b: am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev

* commit 'a15cf2279619a35d1cfe868fb116d90ed0c4a0c8':
  Don't use screenshot if structure is disabled (2/2)

9 years agoam 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev
Julia Reynolds [Tue, 28 Jul 2015 20:54:07 +0000 (20:54 +0000)]
am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev

* commit '5b5ed310d4eaf5f1c74594ada81a148d4f67f4c0':
  Prevent crash in app memory updater.

9 years agoam feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev
Julia Reynolds [Tue, 28 Jul 2015 20:54:06 +0000 (20:54 +0000)]
am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev

* commit 'feeae4cdebfa1303581dbd284039bcf91068addd':
  Hide usage graph on app usage details pages.

9 years agoMerge "Prevent crash in app memory updater." into mnc-dev
Julia Reynolds [Tue, 28 Jul 2015 20:32:08 +0000 (20:32 +0000)]
Merge "Prevent crash in app memory updater." into mnc-dev

9 years agoMerge "Hide usage graph on app usage details pages." into mnc-dev
Julia Reynolds [Tue, 28 Jul 2015 20:32:05 +0000 (20:32 +0000)]
Merge "Hide usage graph on app usage details pages." into mnc-dev

9 years agoam 7abb5164: am 5458688c: Merge "Make fingerprint error text a live region" into...
Jorim Jaggi [Tue, 28 Jul 2015 20:30:43 +0000 (20:30 +0000)]
am 7abb5164: am 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev

* commit '7abb5164987b812271ac3ba2541e95400834ec70':
  Make fingerprint error text a live region

9 years agoam f6bdf532: am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 20:30:41 +0000 (20:30 +0000)]
am f6bdf532: am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev

* commit 'f6bdf5321f7102926da558a50e1ced6897192fd3':
  Adjust enrollment UI for sw400 devices

9 years agoam 22064d8b: am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled ...
Jorim Jaggi [Tue, 28 Jul 2015 20:30:40 +0000 (20:30 +0000)]
am 22064d8b: am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev

* commit '22064d8b89dbe4feb79acff3606540f416bd00a0':
  Don't use screenshot if structure is disabled (2/2)

9 years agoam 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 20:08:01 +0000 (20:08 +0000)]
am 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev

* commit '5458688c1a951142b9a0b7f74c4b57e5909a857d':
  Make fingerprint error text a live region

9 years agoam 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 20:08:00 +0000 (20:08 +0000)]
am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev

* commit '74af384cae9ea03f900c6f3aed2581477dedf68a':
  Adjust enrollment UI for sw400 devices

9 years agoam 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 20:07:58 +0000 (20:07 +0000)]
am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev

* commit '4d9f5c91aeb7ab1ab9828bce45d5f0a7c3ba0716':
  Don't use screenshot if structure is disabled (2/2)

9 years agoMerge "Make fingerprint error text a live region" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 19:51:03 +0000 (19:51 +0000)]
Merge "Make fingerprint error text a live region" into mnc-dev

9 years agoMerge "Adjust enrollment UI for sw400 devices" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 19:50:47 +0000 (19:50 +0000)]
Merge "Adjust enrollment UI for sw400 devices" into mnc-dev

9 years agoMerge "Don't use screenshot if structure is disabled (2/2)" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 19:49:43 +0000 (19:49 +0000)]
Merge "Don't use screenshot if structure is disabled (2/2)" into mnc-dev

9 years agoPrevent crash in app memory updater.
Julia Reynolds [Tue, 28 Jul 2015 19:49:39 +0000 (15:49 -0400)]
Prevent crash in app memory updater.

Bug: 22768769
Change-Id: I1eec14f5ffb46390aa6060babf86fc88ad76a16d

9 years agoDon't use screenshot if structure is disabled (2/2)
Jorim Jaggi [Tue, 28 Jul 2015 00:48:02 +0000 (17:48 -0700)]
Don't use screenshot if structure is disabled (2/2)

Bug: 22674955
Change-Id: I78208a4c746e3a501fe264918607ef94f64a8034

9 years agoBump string char limit.
Julia Reynolds [Tue, 28 Jul 2015 17:39:24 +0000 (13:39 -0400)]
Bump string char limit.

Bug: 19561615
Change-Id: I605becd30c0bece146a57995a0cd416d1c55c837

9 years ago[ZenMode] Align text to viewStart in remove dialog
Maurice Lam [Tue, 21 Jul 2015 18:36:43 +0000 (11:36 -0700)]
[ZenMode] Align text to viewStart in remove dialog

Bug: 22274462
Change-Id: I696c4b33c111a61b51e1581fd4a2830fc1844f40

9 years agofix InactiveApps instrumentation
Chris Wren [Tue, 28 Jul 2015 16:44:37 +0000 (12:44 -0400)]
fix InactiveApps instrumentation

Bug: 21114836
Change-Id: I84357981158d057c2d302822801fb54ad82a901c

9 years agoFix tap & pay strings.
Martijn Coenen [Mon, 27 Jul 2015 14:09:56 +0000 (16:09 +0200)]
Fix tap & pay strings.

Bug: 22534220
Bug: 22762332
Change-Id: Ifd98a6cf0490b6dd59cc6a0957db45509d6fd1d7

9 years agoUse pattern visibility setting on confirm pattern screen.
Julia Reynolds [Tue, 28 Jul 2015 13:44:59 +0000 (09:44 -0400)]
Use pattern visibility setting on confirm pattern screen.

Bug: 22683055
Change-Id: Icc4c0c20175e09a0079f7a6bab93d3de6862f1a3

9 years agoHide usage graph on app usage details pages.
Julia Reynolds [Mon, 27 Jul 2015 20:00:06 +0000 (16:00 -0400)]
Hide usage graph on app usage details pages.

Also make the back button work properly on these pages.
Bug: 22691655

Change-Id: Icb4d7730cfe5a89ffada0489a69e646cddff5560

9 years agoam e0120a8e: am cc5c7809: am 730389bd: Merge "Adjust choose assist app string" into...
Jorim Jaggi [Tue, 28 Jul 2015 01:19:29 +0000 (01:19 +0000)]
am e0120a8e: am cc5c7809: am 730389bd: Merge "Adjust choose assist app string" into mnc-dev

* commit 'e0120a8e382b30c72d45c16ce270d580b2be62cd':
  Adjust choose assist app string

9 years agoam bcb0011d: am afd5a848: am dcf61a2d: Merge "Fix blank confirm device credential...
Jorim Jaggi [Tue, 28 Jul 2015 01:19:26 +0000 (01:19 +0000)]
am bcb0011d: am afd5a848: am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev

* commit 'bcb0011dd9065f868a7b5e75c8ace4fed49aabb8':
  Fix blank confirm device credential activity

9 years agoam cc5c7809: am 730389bd: Merge "Adjust choose assist app string" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 01:06:24 +0000 (01:06 +0000)]
am cc5c7809: am 730389bd: Merge "Adjust choose assist app string" into mnc-dev

* commit 'cc5c7809c5062a3539e11d6650a52ed9010dbd8f':
  Adjust choose assist app string

9 years agoam afd5a848: am dcf61a2d: Merge "Fix blank confirm device credential activity" into...
Jorim Jaggi [Tue, 28 Jul 2015 01:06:22 +0000 (01:06 +0000)]
am afd5a848: am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev

* commit 'afd5a84830ed2d3dbff2c0a47d92bd34ef398394':
  Fix blank confirm device credential activity

9 years agoMake fingerprint error text a live region
Jorim Jaggi [Tue, 28 Jul 2015 00:59:05 +0000 (17:59 -0700)]
Make fingerprint error text a live region

Bug: 22698141
Change-Id: I85f904a2ab28b2e6f5f204cc80770a10a34b570d

9 years agoam 730389bd: Merge "Adjust choose assist app string" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 00:50:45 +0000 (00:50 +0000)]
am 730389bd: Merge "Adjust choose assist app string" into mnc-dev

* commit '730389bd82247a5e92d360a8bb0f5b4f1ded97c2':
  Adjust choose assist app string

9 years agoam dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 00:50:44 +0000 (00:50 +0000)]
am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev

* commit 'dcf61a2dfa392fa5994c4ad07869c02929989823':
  Fix blank confirm device credential activity