OSDN Git Service

android-x86/packages-apps-Settings.git
8 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 1 Jun 2016 13:40:08 +0000 (06:40 -0700)]
Import translations. DO NOT MERGE

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

8 years agoLaunch E911 address management activity at turning on Wifi Calling
Meng Wang [Thu, 26 May 2016 00:12:27 +0000 (17:12 -0700)]
Launch E911 address management activity at turning on Wifi Calling

Bug: 28404126
Change-Id: Id551d784d151e5f24cfcec96e6cf4b999f39ce0f

8 years agoMerge "Remove the last vestiges of #ff009587." into nyc-mr1-dev
Andrew Sapperstein [Tue, 31 May 2016 18:38:07 +0000 (18:38 +0000)]
Merge "Remove the last vestiges of #ff009587." into nyc-mr1-dev

8 years agoMerge "Add an automatic storage management job service." into nyc-mr1-dev
Daniel Nishi [Tue, 31 May 2016 18:25:18 +0000 (18:25 +0000)]
Merge "Add an automatic storage management job service." into nyc-mr1-dev

8 years agoAdd an automatic storage management job service.
Daniel Nishi [Wed, 4 May 2016 17:08:36 +0000 (10:08 -0700)]
Add an automatic storage management job service.

This service runs once a day when plugged in when the device has
under 15% free space remaining. If the FeatureFactory has a
storage management job, it runs the job to begin to free up space
on the device.

This is a temporary landing place and will be refactored very
quickly out of Settings.

Bug: 28600825

Change-Id: Id2ebb42a333b3b4e3daef4e50cf985fe055b85c7

8 years agoMerge "Change Nav bar style to use system nav (new style for Nexus N+) Bug: 27612740...
Anna Galusza [Tue, 31 May 2016 16:39:46 +0000 (16:39 +0000)]
Merge "Change Nav bar style to use system nav (new style for Nexus N+) Bug: 27612740" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Tue, 31 May 2016 16:36:46 +0000 (16:36 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: aa56eef3fd  -s ours

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

Change-Id: I8d141f7bb06750c09b60084105ec51f6aeb244ad

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 31 May 2016 16:22:39 +0000 (16:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 31 May 2016 03:54:15 +0000 (03:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Merge "Show only up to two locales in Settings" into nyc-dev am: a260cf8931...
Roozbeh Pournader [Tue, 31 May 2016 02:07:35 +0000 (02:07 +0000)]
Merge "Merge "Show only up to two locales in Settings" into nyc-dev am: a260cf8931" into nyc-mr1-dev

8 years agoMerge "Show only up to two locales in Settings" into nyc-dev
Roozbeh Pournader [Tue, 31 May 2016 01:20:52 +0000 (01:20 +0000)]
Merge "Show only up to two locales in Settings" into nyc-dev
am: a260cf8931

* commit 'a260cf8931bb51e2a8879deb8461c9444595b786':
  Show only up to two locales in Settings

Change-Id: I8da73979371f5342fc1cd636e0483b7507a06697

8 years agoMerge "Show only up to two locales in Settings" into nyc-dev
Roozbeh Pournader [Tue, 31 May 2016 01:14:39 +0000 (01:14 +0000)]
Merge "Show only up to two locales in Settings" into nyc-dev
am: a260cf8931

* commit 'a260cf8931bb51e2a8879deb8461c9444595b786':
  Show only up to two locales in Settings

Change-Id: I4e9d948e1d5d7e0c96116d2d850adf143b300b1c

8 years agoMerge "Show only up to two locales in Settings" into nyc-dev
Roozbeh Pournader [Tue, 31 May 2016 01:02:41 +0000 (01:02 +0000)]
Merge "Show only up to two locales in Settings" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 30 May 2016 19:22:06 +0000 (12:22 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 30 May 2016 19:06:25 +0000 (12:06 -0700)]
Import translations. DO NOT MERGE

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

8 years agoChange Nav bar style to use system nav (new style for Nexus N+)
Anna Galusza [Thu, 31 Mar 2016 00:25:36 +0000 (17:25 -0700)]
Change Nav bar style to use system nav (new style for Nexus N+)
Bug: 27612740

Change-Id: I309cf8252285130a0e1d2c03ca664706e73cce16

8 years agoMerge "Fix pref availability for search" into nyc-dev
Jason Monk [Fri, 27 May 2016 17:09:56 +0000 (17:09 +0000)]
Merge "Fix pref availability for search" into nyc-dev
am: 8eaa3de931

* commit '8eaa3de9317eb21855db43ed276b90ca48ad1d28':
  Fix pref availability for search

Change-Id: I777450a2531d9c817d6ff76068b6ac7c02fcb782

8 years agoMerge "Don\'t allow restricted data usage of system" into nyc-dev
Jason Monk [Fri, 27 May 2016 17:09:55 +0000 (17:09 +0000)]
Merge "Don\'t allow restricted data usage of system" into nyc-dev
am: da52f08b0a

* commit 'da52f08b0a86182cef1f0949f0ef45d5efa092cc':
  Don't allow restricted data usage of system

Change-Id: Ic6bba24f75979f9c9ac1fdcf8127f89770bf1f57

8 years agoMerge "Fix pref availability for search" into nyc-dev
Jason Monk [Fri, 27 May 2016 17:07:23 +0000 (17:07 +0000)]
Merge "Fix pref availability for search" into nyc-dev

8 years agoFix pref availability for search
Jason Monk [Fri, 27 May 2016 16:58:53 +0000 (12:58 -0400)]
Fix pref availability for search

Change-Id: Ic080e131c6c751456b22d370aade77748d912b6b
Fixes: 28987828

8 years agoMerge "Don't allow restricted data usage of system" into nyc-dev
Jason Monk [Fri, 27 May 2016 16:51:59 +0000 (16:51 +0000)]
Merge "Don't allow restricted data usage of system" into nyc-dev

8 years agoDon't allow restricted data usage of system
Jason Monk [Fri, 27 May 2016 14:57:10 +0000 (10:57 -0400)]
Don't allow restricted data usage of system

Cause it will just crash

Change-Id: I4ee43633eb3fa488816b1d2767073cbe404c2c33
Fixes: 28979013

8 years agoImportance slider updates.
Julia Reynolds [Thu, 26 May 2016 15:08:16 +0000 (11:08 -0400)]
Importance slider updates.

Icon & tint.

Bug: 28911161
Change-Id: Ic56270c8803557863f914ee0eaf6801f1341387d

8 years agoRevert "Importance slider updates."
Bart Sears [Fri, 27 May 2016 01:58:26 +0000 (01:58 +0000)]
Revert "Importance slider updates."

This reverts commit 373a9e2fcfedda0dbf736d2e3f95edaf38833756.

Change-Id: I3279163eb052f93cf6b87710c17cfa0c2eae56ba

8 years agoMerge "Force dashboard summary to single-line and ellipsize it" into nyc-dev
Roozbeh Pournader [Fri, 27 May 2016 04:05:46 +0000 (04:05 +0000)]
Merge "Force dashboard summary to single-line and ellipsize it" into nyc-dev
am: 24aa3b01af

* commit '24aa3b01af017c0d020a4e31ff88203f20140ce3':
  Force dashboard summary to single-line and ellipsize it

Change-Id: I16fb9f03066017c946fa787ca5b0214e1b9f64de

8 years agoMerge "Add activity label to encryption interstitial" into nyc-dev
Maurice Lam [Fri, 27 May 2016 04:05:45 +0000 (04:05 +0000)]
Merge "Add activity label to encryption interstitial" into nyc-dev
am: 19c0046422

* commit '19c0046422e0cf5586e37323157a27331db45572':
  Add activity label to encryption interstitial

Change-Id: I9bcda822435a42c9bf7d5486b7497fb6a8f30cf4

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Fri, 27 May 2016 04:05:43 +0000 (04:05 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: d5f7c20a26  -s ours

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

Change-Id: I9387ffb81450e3a57e725a9994c915037eabc49c

8 years agoMerge "Importance slider updates." into nyc-dev
Julia Reynolds [Fri, 27 May 2016 04:04:31 +0000 (04:04 +0000)]
Merge "Importance slider updates." into nyc-dev
am: 7c2c025e4f

* commit '7c2c025e4ff6b91ab3ab1e78e278a12a8051c542':
  Importance slider updates.

Change-Id: Ieb897d94383c401154fde35dc9bf94ca57ce1ca6

8 years agoShow only up to two locales in Settings
Roozbeh Pournader [Fri, 27 May 2016 02:01:06 +0000 (19:01 -0700)]
Show only up to two locales in Settings

The list could otherwise grow very long, spamming the screen.

Bug: 28872122
Change-Id: I8c4dbe659e1c088eba8b5ba1b2905b5eb8bc0229

8 years agoRemove the last vestiges of #ff009587.
Andrew Sapperstein [Fri, 27 May 2016 00:18:38 +0000 (17:18 -0700)]
Remove the last vestiges of #ff009587.

It was very close the proper colorAccent, so just use that everywhere.
This change updates the Memory Settings page and the running processes
page.

BUG: 28987891
Change-Id: I3895ae9b596125d7e4bda0d02f0686c87a75ead6

8 years agoMerge "Force dashboard summary to single-line and ellipsize it" into nyc-dev
Roozbeh Pournader [Fri, 27 May 2016 00:11:47 +0000 (00:11 +0000)]
Merge "Force dashboard summary to single-line and ellipsize it" into nyc-dev

8 years agoForce dashboard summary to single-line and ellipsize it
Roozbeh Pournader [Wed, 25 May 2016 21:33:20 +0000 (14:33 -0700)]
Force dashboard summary to single-line and ellipsize it

Previously, the summary could become multiline. In rare combinations
of text and screen width, to indicate to the user that the text is
cut, we now ellipsize it too. Finally, since the ellipsis can get
too close to the end of the line, we add a padding equal to the left
margin of the icon.

Bug: 28872122
Change-Id: I27226e5de7781cf096508ddbef4f9095961ce028

8 years agoMerge "Add activity label to encryption interstitial" into nyc-dev
Maurice Lam [Thu, 26 May 2016 23:46:06 +0000 (23:46 +0000)]
Merge "Add activity label to encryption interstitial" into nyc-dev

8 years agoMerge "Hide the Deletion Helper entry points from Settings." into nyc-mr1-dev
Daniel Nishi [Thu, 26 May 2016 20:28:14 +0000 (20:28 +0000)]
Merge "Hide the Deletion Helper entry points from Settings." into nyc-mr1-dev

8 years agoMerge "Make fingerprint inherit from GLIF theme" into nyc-mr1-dev
Maurice Lam [Thu, 26 May 2016 18:54:02 +0000 (18:54 +0000)]
Merge "Make fingerprint inherit from GLIF theme" into nyc-mr1-dev

8 years agoHide the Deletion Helper entry points from Settings.
Daniel Nishi [Thu, 26 May 2016 18:12:56 +0000 (11:12 -0700)]
Hide the Deletion Helper entry points from Settings.

Remove the menu item which enters the Deletion Helper fragment.
The deletion helper can still be accessed if storage management is
enabled in the storage management settings.

Bug: 28967987
Change-Id: Iff4730998edbab5889b2b8e23b6ad260ae0c0359

8 years agoMerge "Fix crash from battery saver switch" into nyc-dev
Jason Monk [Thu, 26 May 2016 17:53:41 +0000 (17:53 +0000)]
Merge "Fix crash from battery saver switch" into nyc-dev
am: 371aec1e92

* commit '371aec1e92aa4b5cf6e4ed2b5f39faf180c17d1f':
  Fix crash from battery saver switch

Change-Id: I0416b92dbc9b18a97c9d6d0617cba636e310690b

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 17:07:20 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 26 May 2016 17:06:33 +0000 (17:06 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Importance slider updates." into nyc-dev
Julia Reynolds [Thu, 26 May 2016 16:50:56 +0000 (16:50 +0000)]
Merge "Importance slider updates." into nyc-dev

8 years agoMerge "Fix crash from battery saver switch" into nyc-dev
Jason Monk [Thu, 26 May 2016 16:46:51 +0000 (16:46 +0000)]
Merge "Fix crash from battery saver switch" into nyc-dev

8 years agoImportance slider updates.
Julia Reynolds [Thu, 26 May 2016 15:08:16 +0000 (11:08 -0400)]
Importance slider updates.

Icon & tint.

Bug: 28911161
Change-Id: Ic56270c8803557863f914ee0eaf6801f1341387d

8 years agoFix crash from battery saver switch
Jason Monk [Thu, 26 May 2016 15:07:53 +0000 (11:07 -0400)]
Fix crash from battery saver switch

Turns out most things expect the conditions to be loaded immediately
so if the dashboard hasn't been hit, they crash.  Instead load
immediately for everything but the dashboard.

Change-Id: Iaa1114c88b3766e2ac513acb417ef2a55a0f4e7f
Fixes: 28952354

8 years agoMerge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev
Ricky Wai [Thu, 26 May 2016 14:04:21 +0000 (14:04 +0000)]
Merge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev
am: fec38d0699

* commit 'fec38d06991b0c49750d02e27e6d8a452a1bca29':
  Use LockPatternUtils.resetKeyStore() to clear keystore

Change-Id: I1231288f2e7c5166885992b103e720f467358858

8 years agoMerge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev
Ricky Wai [Thu, 26 May 2016 13:46:25 +0000 (13:46 +0000)]
Merge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev

8 years agoMerge "Fix Work Challenge / personal confirm credential is shown on top of keyguard...
Victor Chang [Thu, 26 May 2016 11:13:40 +0000 (11:13 +0000)]
Merge "Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation" into nyc-dev
am: eb02435cbf

* commit 'eb02435cbf06335dc641a20a9c244323f7567710':
  Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation

Change-Id: I179673366395df90dcef132d17599282ee4d191c

8 years agoMerge "Fix Work Challenge / personal confirm credential is shown on top of keyguard...
Victor Chang [Thu, 26 May 2016 10:55:26 +0000 (10:55 +0000)]
Merge "Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation" into nyc-dev

8 years agoMake fingerprint inherit from GLIF theme
Maurice Lam [Wed, 25 May 2016 23:34:09 +0000 (16:34 -0700)]
Make fingerprint inherit from GLIF theme

Set SuwThemeGlif.Light as the parent of fingerprint theme so that it
will inherit the margins and any other attributes.

There should be no visual change other than the fixed margins.

Bug: 28965312
Change-Id: I4e51c501c8ddb0e412e194e47bcee728da151ec5

8 years agoMerge "Update button styles in fingerprint setup" into nyc-mr1-dev
Maurice Lam [Wed, 25 May 2016 23:56:36 +0000 (23:56 +0000)]
Merge "Update button styles in fingerprint setup" into nyc-mr1-dev

8 years agoMerge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev
Derek Tan [Wed, 25 May 2016 23:51:49 +0000 (23:51 +0000)]
Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev
am: 08e24d43b6

* commit '08e24d43b6f1021b4eb6cd71543f16226d43bded':
  Use getConfigForSubId instead of getConfig(int).

Change-Id: Ib804dcf00e5e183d3d9c02bc14513c98a7852ace

8 years agoMerge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev
Derek Tan [Wed, 25 May 2016 23:41:19 +0000 (23:41 +0000)]
Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 25 May 2016 23:21:16 +0000 (16:21 -0700)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Guard against IllegalArgumentException" into nyc-dev
Sudheer Shanka [Wed, 25 May 2016 23:10:43 +0000 (23:10 +0000)]
Merge "Guard against IllegalArgumentException" into nyc-dev
am: 96305a2b34

* commit '96305a2b34b9b22d815200372c7636d28175b8fd':
  Guard against IllegalArgumentException

Change-Id: I03ad7e1ed4fe1c2ebd65ab822364566eba1d5b34

8 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 25 May 2016 23:07:25 +0000 (16:07 -0700)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Guard against IllegalArgumentException" into nyc-dev
TreeHugger Robot [Wed, 25 May 2016 23:07:00 +0000 (23:07 +0000)]
Merge "Guard against IllegalArgumentException" into nyc-dev

8 years agoMerge "Add an option allowing to skip wallpaper apps selection." into nyc-mr1-dev
Sunny Goyal [Wed, 25 May 2016 22:50:43 +0000 (22:50 +0000)]
Merge "Add an option allowing to skip wallpaper apps selection." into nyc-mr1-dev

8 years agoUpdate button styles in fingerprint setup
Maurice Lam [Wed, 25 May 2016 22:25:13 +0000 (15:25 -0700)]
Update button styles in fingerprint setup

Bug: 28888250
Change-Id: I2f9e7b4c886f27deac6b42860452a3fa0006facd

8 years agoUse getConfigForSubId instead of getConfig(int).
Derek Tan [Wed, 25 May 2016 22:00:27 +0000 (15:00 -0700)]
Use getConfigForSubId instead of getConfig(int).

Per API review, we want to revert getConfig(int) to
getConfigForSubId(int) (ag/1075011). This CL changes all
callers to use getConfigForSubId(int).

Bug: 28295813
Change-Id: I0e44a5e758aed34ce26740632270700bde66cff6

8 years agoMerge "Don\'t crash trying to disable lockdown VPN" into nyc-dev
Robin Lee [Wed, 25 May 2016 21:19:23 +0000 (21:19 +0000)]
Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev
am: a6269236a2

* commit 'a6269236a24e00947efd3471f2901783413d56e5':
  Don't crash trying to disable lockdown VPN

Change-Id: I71ecde2a45a26c775f5738c232b7d0da834af42a

8 years agoMerge "Don't crash trying to disable lockdown VPN" into nyc-dev
Robin Lee [Wed, 25 May 2016 21:05:53 +0000 (21:05 +0000)]
Merge "Don't crash trying to disable lockdown VPN" into nyc-dev

8 years agoGuard against IllegalArgumentException
Sudheer Shanka [Wed, 25 May 2016 20:17:12 +0000 (13:17 -0700)]
Guard against IllegalArgumentException

Bug: 28742227
Change-Id: If436ec3f743ca11ea40dce2033b7b993cb6ad170

8 years agoMerge "Update the summary strings in the Deletion Helper to match the latest mocks...
Daniel Nishi [Wed, 25 May 2016 20:02:25 +0000 (20:02 +0000)]
Merge "Update the summary strings in the Deletion Helper to match the latest mocks." into nyc-mr1-dev

8 years agoMerge "Hook up the automatic storage manager settings with the flag." into nyc-mr1-dev
Daniel Nishi [Wed, 25 May 2016 19:55:57 +0000 (19:55 +0000)]
Merge "Hook up the automatic storage manager settings with the flag." into nyc-mr1-dev

8 years agoAdd an option allowing to skip wallpaper apps selection.
Sunny Goyal [Wed, 25 May 2016 19:41:16 +0000 (12:41 -0700)]
Add an option allowing to skip wallpaper apps selection.

This commit adds an option to the Settings application, making it
possible to launch a different activity for wallpaper selection

Also removing te intent constant android.settings.WALLPAPER_SETTINGS
The target for this action can't be easily overriden when the
wallpaper target is overriden, which would provide an inconsistant
experience.

Bug: 28554244
Bug: 26688904
Change-Id: I25367fbb4505615351fbad9e1aa1ca88df0cd034

8 years agoMerge "More theming fixes." into nyc-mr1-dev
Andrew Sapperstein [Wed, 25 May 2016 19:40:50 +0000 (19:40 +0000)]
Merge "More theming fixes." into nyc-mr1-dev

8 years agoMerge "Skip indexing content while user is locked." into nyc-dev
Jeff Sharkey [Wed, 25 May 2016 18:30:30 +0000 (18:30 +0000)]
Merge "Skip indexing content while user is locked." into nyc-dev
am: c416433a9e

* commit 'c416433a9ee55e2ac44fdb8e6c6d6ca4ed4cde62':
  Skip indexing content while user is locked.

Change-Id: I749bebca289615b2a68fb87e463cadee4fb8840e

8 years agoDon\'t update conditions on background threads
Jason Monk [Wed, 25 May 2016 18:28:02 +0000 (18:28 +0000)]
Don\'t update conditions on background threads
am: 6cb280d146

* commit '6cb280d14641327b32378504544d125bbc3bcaf3':
  Don't update conditions on background threads

Change-Id: I446e85dc5462e3c06a75e2e53f1990990bb06f48

8 years agoMerge "Skip indexing content while user is locked." into nyc-dev
TreeHugger Robot [Wed, 25 May 2016 18:27:29 +0000 (18:27 +0000)]
Merge "Skip indexing content while user is locked." into nyc-dev

8 years agoUpdate the summary strings in the Deletion Helper to match the latest mocks.
Daniel Nishi [Tue, 24 May 2016 01:11:49 +0000 (18:11 -0700)]
Update the summary strings in the Deletion Helper to match the latest mocks.

Bug: 28917902
Change-Id: I35af7483f2a97dffc230093a90f0b7d87a4532c1

8 years agoMore theming fixes.
Andrew Sapperstein [Wed, 25 May 2016 01:07:48 +0000 (18:07 -0700)]
More theming fixes.

Updated the importance seekbar to use colorAccent instead of a hardcoded
color.

Refactored the various gear icons to all use ic_settings (a rename of
ic_bt_config). Deleted the png version (ic_sysbar_quicksettings).

Cleaned up the add icon. Now there are two vector drawables (one white,
one tinted with the accent color). Deleted the existing pngs and updated
the usages to use one of the two vector drawables. Deleted the theme
attr for ic_menu_add that had no usages.

BUG: 28760785

Change-Id: Icd5561d5b3f5ddee8aab78a3da7daa2dca0e30e3

8 years agoMerge "Fix confirm lock UI theme." into nyc-mr1-dev
Andrew Sapperstein [Wed, 25 May 2016 17:16:09 +0000 (17:16 +0000)]
Merge "Fix confirm lock UI theme." into nyc-mr1-dev

8 years agoHook up the automatic storage manager settings with the flag.
Daniel Nishi [Mon, 23 May 2016 21:20:36 +0000 (14:20 -0700)]
Hook up the automatic storage manager settings with the flag.

This allows the settings menu to actually toggle the feature on
and off.

Bug: 28905328
Change-Id: I132c0930970b70a0f88b8fc21e85b6829aaef8c8

8 years agoDon't update conditions on background threads
Jason Monk [Wed, 25 May 2016 16:53:34 +0000 (12:53 -0400)]
Don't update conditions on background threads

Instead build a list and set it on the main thread to avoid
concurrent modification crashes.

Change-Id: I936fbeb70359583e55ae8ddcb0ea46b5753cb3b0
Fixes: 28794277

8 years agoSkip indexing content while user is locked.
Jeff Sharkey [Wed, 25 May 2016 16:52:33 +0000 (10:52 -0600)]
Skip indexing content while user is locked.

Otherwise we try touching printing services which throw.

Bug: 28912897
Change-Id: I25638794b35fd383fbe67604ac921d16743628ad

8 years agoHide work profile key in user credentials screen
Ricky Wai [Wed, 25 May 2016 13:18:43 +0000 (13:18 +0000)]
Hide work profile key in user credentials screen
am: 9579274cda

* commit '9579274cda38c552b43febe0980f0ec6bd07277d':
  Hide work profile key in user credentials screen

Change-Id: I1b0b50a5ff0cc8dd0bef132ac63790c677bba188

8 years agoHide work profile key in user credentials screen
Ricky Wai [Tue, 24 May 2016 18:28:53 +0000 (19:28 +0100)]
Hide work profile key in user credentials screen

Bug: 28878708
Change-Id: Ic9733ea973e1cc37028cb5f740969b5e24fb5aef

8 years agoAdd activity label to encryption interstitial
Maurice Lam [Wed, 25 May 2016 03:03:08 +0000 (20:03 -0700)]
Add activity label to encryption interstitial

So that TalkBack refers to the screen by this more specific name.

Bug: 28868846
Change-Id: I93139959dcdbd156d57f01699283e01b178305b8

8 years agoFix confirm lock UI theme.
Andrew Sapperstein [Mon, 23 May 2016 23:38:28 +0000 (16:38 -0700)]
Fix confirm lock UI theme.

Now uses colorPrimary as its background color and sets colorAccent
directly. Some other mild cleanup as well.

BUG: 28760785

Change-Id: Ib8e5140b789449e518b498bc49438cb4a2bc6451

8 years agoUpdate color bar defaults to use theme attr colors
Andrew Sapperstein [Sat, 21 May 2016 01:38:01 +0000 (18:38 -0700)]
Update color bar defaults to use theme attr colors

Previously the values were hardcoded. Now the default value
for left and middle are colorAccent. Also updated SummaryPreference
to not call LinearColorBar.setColors unless its own setColors is called.

BUG: 28760785

Change-Id: Id28e809e6b5f0f6508258c995d5dcfacbc9c8725

8 years agoUpdate Theme.DialogWhenLarge to use theme colors.
Andrew Sapperstein [Fri, 20 May 2016 23:50:35 +0000 (16:50 -0700)]
Update Theme.DialogWhenLarge to use theme colors.

This theme is at least used by the Phone Status activity and probably
others as well.

BUG: 28760785

Change-Id: If3faa84ad9d291f007c7191f1c0dba8d98fe9bf8

8 years agoUpdate alertDialogTheme to use proper colorAccent.
Andrew Sapperstein [Thu, 19 May 2016 20:48:53 +0000 (13:48 -0700)]
Update alertDialogTheme to use proper colorAccent.

The settings dialogs were all using the default colorAccent.
Now it uses the app's version.

BUG: 28760785

Change-Id: Ic9bf90745db7d2ef5b1fd047474bab5c6bbdab23

8 years agoMerge "Remove option to configure emergency app" into nyc-dev
Adrian Roos [Wed, 25 May 2016 00:23:28 +0000 (00:23 +0000)]
Merge "Remove option to configure emergency app" into nyc-dev
am: 06b7d7cdf9

* commit '06b7d7cdf954902dad8fde766fe54ea315a463b3':
  Remove option to configure emergency app

Change-Id: Ia306455b8fe44d6e42493937fce6ad92904737fe

8 years agoMerge "Remove option to configure emergency app" into nyc-dev
TreeHugger Robot [Wed, 25 May 2016 00:17:20 +0000 (00:17 +0000)]
Merge "Remove option to configure emergency app" into nyc-dev

8 years agoMerge "Replace bluetooth pngs with vector drawables." into nyc-mr1-dev
TreeHugger Robot [Tue, 24 May 2016 23:50:29 +0000 (23:50 +0000)]
Merge "Replace bluetooth pngs with vector drawables." into nyc-mr1-dev

8 years agoReplace bluetooth pngs with vector drawables.
Andrew Sapperstein [Thu, 19 May 2016 01:03:25 +0000 (18:03 -0700)]
Replace bluetooth pngs with vector drawables.

The current pngs are hardcoded to the green accent color.
Instead, the new vector drawable replacements have colorAccent
set as a tint.

BUG: 28760785
Change-Id: I01853d4e93bca6651460ad86505d0943dc68bf93

8 years agoChange Downloads to show individual files in the Deletion Helper.
Daniel Nishi [Fri, 20 May 2016 18:07:12 +0000 (11:07 -0700)]
Change Downloads to show individual files in the Deletion Helper.

The first implementation simply had every file in the Downloads folder
be under a single checkbox. This iteration makes Downloads an
expandable dropdown preference listing every single file individually
for selection to be deleted.

Bug: 28621781
Change-Id: I5169caf718cee4c0fa7f0248bc4c443984766005

8 years agoMerge "Update the storage manager settings to match the mocks." into nyc-mr1-dev
Daniel Nishi [Tue, 24 May 2016 21:18:39 +0000 (21:18 +0000)]
Merge "Update the storage manager settings to match the mocks." into nyc-mr1-dev

8 years agoMerge "Refactor Settings theme colors." into nyc-mr1-dev
TreeHugger Robot [Tue, 24 May 2016 21:13:23 +0000 (21:13 +0000)]
Merge "Refactor Settings theme colors." into nyc-mr1-dev

8 years agoRefactor Settings theme colors.
Andrew Sapperstein [Tue, 17 May 2016 00:27:12 +0000 (17:27 -0700)]
Refactor Settings theme colors.

Introduces stock colors (primary_color, primary_dark_color, etc) to allow
overriding the colors via resource overlays.

Creates new colorSecondary attribute and updates switches to use theme
attributes for foreground/background colors rather than hardcoded values.

Some other mild color cleanup to make things more straightforward.

BUG: 28760785
Change-Id: I4deba962357217bdb2e08c08e8f83b9b57a683d4

8 years agoMerge "Fix a crash where the deletion helper crashes when app sizes load." into nyc...
Daniel Nishi [Tue, 24 May 2016 15:36:22 +0000 (15:36 +0000)]
Merge "Fix a crash where the deletion helper crashes when app sizes load." into nyc-mr1-dev

8 years agoFix Work Challenge / personal confirm credential is shown on top of keyguard after...
Victor Chang [Tue, 24 May 2016 14:46:55 +0000 (15:46 +0100)]
Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation

ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED has been abused.
We should not set onfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED
for work challenge and most other cases.

It's temp fix for the rotation bug. Because it's inconsistent the activity is shown
on top of keyguard with/without rotation (or any config change). In long term,
SHOW_WHEN_LOCKED should be set only if it's truly on purpose, and remove
isKeyguardLocked checking.

Bug: 28878075
Change-Id: I19db913f5bcaf2644c8c46c25e9584103d7fee8a

8 years agoMerge "Trust the certificate after unlocking screenlock" into nyc-dev
Victor Chang [Tue, 24 May 2016 14:20:01 +0000 (14:20 +0000)]
Merge "Trust the certificate after unlocking screenlock" into nyc-dev
am: 32e17d0862

* commit '32e17d08629e745cb21ba381f752ec84d2ed591e':
  Trust the certificate after unlocking screenlock

Change-Id: Ib9e51ab5dac5d0f9a7e938a056cd99a0af4c22de

8 years agoMerge "Trust the certificate after unlocking screenlock" into nyc-dev
Victor Chang [Tue, 24 May 2016 14:03:28 +0000 (14:03 +0000)]
Merge "Trust the certificate after unlocking screenlock" into nyc-dev

8 years agoMerge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev
Mahaver Chopra [Tue, 24 May 2016 12:23:20 +0000 (12:23 +0000)]
Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev

8 years agoDisallow OEM unlock when DISALLOW_FACTORY_RESET applies
Mahaver Chopra [Wed, 11 May 2016 17:18:23 +0000 (18:18 +0100)]
Disallow OEM unlock when DISALLOW_FACTORY_RESET applies

Bug: 28339424
Change-Id: I2ccba997fc6c9ccfab802c0f49a9e2115a314552

8 years agoUse LockPatternUtils.resetKeyStore() to clear keystore
Ricky Wai [Tue, 24 May 2016 10:13:56 +0000 (11:13 +0100)]
Use LockPatternUtils.resetKeyStore() to clear keystore

Bug: 28878708
Change-Id: I6730b6947ea917772809bb045470bdf5e95d86ba

8 years agoMerge "Update margins to match specs" into nyc-mr1-dev
Maurice Lam [Tue, 24 May 2016 00:45:14 +0000 (00:45 +0000)]
Merge "Update margins to match specs" into nyc-mr1-dev

8 years agoUpdate margins to match specs
Maurice Lam [Mon, 23 May 2016 21:51:22 +0000 (14:51 -0700)]
Update margins to match specs

- Update settings to use GLIF versions for margins and styles
- Removed learn more link from AOSP Fingerprint intro screen because
  it won't have a link to show.

Bug: 28885476
Change-Id: I5d2fd730a1bca2c5da8626da066da3a3f03b4428

8 years agoUpdate the storage manager settings to match the mocks.
Daniel Nishi [Thu, 19 May 2016 23:35:44 +0000 (16:35 -0700)]
Update the storage manager settings to match the mocks.

Bug: 28560570
Change-Id: I0f218da1d23b687e38c52b5a927f7b84645958c7

8 years agoMerge "Materialize the button bar in the Deletion Helper." into nyc-mr1-dev
Daniel Nishi [Mon, 23 May 2016 20:23:47 +0000 (20:23 +0000)]
Merge "Materialize the button bar in the Deletion Helper." into nyc-mr1-dev