Commit Graph

12359 Commits

Author SHA1 Message Date
Daniel Nishi
ed39bf639b 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
2016-05-25 10:03:17 -07:00
Jason Monk
6cb280d146 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
2016-05-25 12:53:34 -04:00
Jeff Sharkey
c4eac99223 Skip indexing content while user is locked.
Otherwise we try touching printing services which throw.

Bug: 28912897
Change-Id: I25638794b35fd383fbe67604ac921d16743628ad
2016-05-25 10:52:34 -06:00
Ricky Wai
202b037524 Hide work profile key in user credentials screen am: 9579274cda
am: 7a2eb4d3a9

* commit '7a2eb4d3a9717f85e423b3ec1d83cb664a23705b':
  Hide work profile key in user credentials screen

Change-Id: I96b71597af058a20b462900cb9f4b73c80d68dda
2016-05-25 13:27:51 +00:00
Ricky Wai
7a2eb4d3a9 Hide work profile key in user credentials screen
am: 9579274cda

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

Change-Id: I1db0e7538f4e6e8cfddac9a4f94ee2d050c4d433
2016-05-25 13:21:01 +00:00
Ricky Wai
3652f20efb Hide work profile key in user credentials screen
am: 9579274cda

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

Change-Id: I1b0b50a5ff0cc8dd0bef132ac63790c677bba188
2016-05-25 13:18:43 +00:00
Ricky Wai
9579274cda Hide work profile key in user credentials screen
Bug: 28878708
Change-Id: Ic9733ea973e1cc37028cb5f740969b5e24fb5aef
2016-05-25 13:11:24 +00:00
Andrew Sapperstein
d6d7eaf95f Update color bar defaults to use theme attr colors
am: b40b0d2006

* commit 'b40b0d20066aeb53ae69e57979a92c337d0100df':
  Update color bar defaults to use theme attr colors

Change-Id: I6e2fc7d85f6b895a2ee3dfbc0912e0f1adb2dd98
2016-05-25 03:45:41 +00:00
Andrew Sapperstein
b40b0d2006 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
2016-05-24 18:08:36 -07:00
Adrian Roos
7226630b67 Merge "Remove option to configure emergency app" into nyc-dev am: 06b7d7cdf9
am: aea945a821

* commit 'aea945a82133cfc2704c14b214fd93e06624f4f3':
  Remove option to configure emergency app

Change-Id: I6fd3b85f96e22fb85960fcad56e09b8f8b0eef70
2016-05-25 00:31:58 +00:00
Adrian Roos
aea945a821 Merge "Remove option to configure emergency app" into nyc-dev
am: 06b7d7cdf9

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

Change-Id: I4643f4cae85c6e70d82a8a25f34c2f17305b240d
2016-05-25 00:23:29 +00:00
Adrian Roos
4b3ab5871c Merge "Remove option to configure emergency app" into nyc-dev
am: 06b7d7cdf9

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

Change-Id: Ia306455b8fe44d6e42493937fce6ad92904737fe
2016-05-25 00:23:28 +00:00
TreeHugger Robot
06b7d7cdf9 Merge "Remove option to configure emergency app" into nyc-dev 2016-05-25 00:17:20 +00:00
Daniel Nishi
5a546fbcaf Change Downloads to show individual files in the Deletion Helper.
am: 1370f7ed20

* commit '1370f7ed200ae4442c1d4a159584c26bc86d8a63':
  Change Downloads to show individual files in the Deletion Helper.

Change-Id: I52237038b49acdd1122c4ade19e408463027b0bb
2016-05-24 23:05:11 +00:00
Daniel Nishi
ce584ff754 Merge "Update the storage manager settings to match the mocks." into nyc-mr1-dev
am: 97ac5c773d

* commit '97ac5c773da07d637ef0e92edbde4052714683ab':
  Update the storage manager settings to match the mocks.

Change-Id: I9c6ed838d3f58fb97c93779c9378f59bb88b1b66
2016-05-24 21:32:37 +00:00
Daniel Nishi
1370f7ed20 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
2016-05-24 14:26:38 -07:00
Daniel Nishi
97ac5c773d Merge "Update the storage manager settings to match the mocks." into nyc-mr1-dev 2016-05-24 21:18:39 +00:00
Daniel Nishi
11b6563cb6 Merge "Fix a crash where the deletion helper crashes when app sizes load." into nyc-mr1-dev
am: c05c8617bc

* commit 'c05c8617bc1cb292b67b8c8d40723846914c20fc':
  Fix a crash where the deletion helper crashes when app sizes load.

Change-Id: I0f32008388d8f462df95d1655f43869031be0c20
2016-05-24 15:45:58 +00:00
Daniel Nishi
c05c8617bc Merge "Fix a crash where the deletion helper crashes when app sizes load." into nyc-mr1-dev 2016-05-24 15:36:22 +00:00
Victor Chang
27ca104ece 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
2016-05-24 15:57:23 +01:00
Victor Chang
19a1107089 Merge "Trust the certificate after unlocking screenlock" into nyc-dev am: 32e17d0862
am: 8cc4630521

* commit '8cc4630521d649146087fc898c65446064305626':
  Trust the certificate after unlocking screenlock

Change-Id: I120f9d1fac3742af4c1467c68b1fc34c2ffc54f3
2016-05-24 14:24:13 +00:00
Victor Chang
8cc4630521 Merge "Trust the certificate after unlocking screenlock" into nyc-dev
am: 32e17d0862

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

Change-Id: Id0f6da39fc3af71a85ebde93f854d2752c7422b5
2016-05-24 14:20:02 +00:00
Victor Chang
8a85828424 Merge "Trust the certificate after unlocking screenlock" into nyc-dev
am: 32e17d0862

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

Change-Id: Ib9e51ab5dac5d0f9a7e938a056cd99a0af4c22de
2016-05-24 14:20:01 +00:00
Victor Chang
32e17d0862 Merge "Trust the certificate after unlocking screenlock" into nyc-dev 2016-05-24 14:03:29 +00:00
Mahaver Chopra
150dd9cc4f Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev
am: e6e8c92134

* commit 'e6e8c92134b7a212058d7728007407eb74720625':
  Disallow OEM unlock when DISALLOW_FACTORY_RESET applies

Change-Id: I2389a5518a55fc3131a91fb5a5d8af376d79d936
2016-05-24 12:31:57 +00:00
Mahaver Chopra
e6e8c92134 Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev 2016-05-24 12:23:20 +00:00
Mahaver Chopra
dcf3d7c185 Disallow OEM unlock when DISALLOW_FACTORY_RESET applies
Bug: 28339424
Change-Id: I2ccba997fc6c9ccfab802c0f49a9e2115a314552
2016-05-24 12:04:49 +00:00
Ricky Wai
c0e5070cf2 Use LockPatternUtils.resetKeyStore() to clear keystore
Bug: 28878708
Change-Id: I6730b6947ea917772809bb045470bdf5e95d86ba
2016-05-24 11:13:56 +01:00
Maurice Lam
534d856458 Merge "Update margins to match specs" into nyc-mr1-dev
am: 3b15d6234d

* commit '3b15d6234dc9097869030c1e5e2b26a9b34d1f19':
  Update margins to match specs

Change-Id: Iceacbab85dd0697708ddfad1b95b9faccae11a2d
2016-05-24 00:54:11 +00:00
Maurice Lam
3b15d6234d Merge "Update margins to match specs" into nyc-mr1-dev 2016-05-24 00:45:15 +00:00
Maurice Lam
b357e4a81a 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
2016-05-23 14:51:22 -07:00
Daniel Nishi
f16b8be7b4 Merge "Materialize the button bar in the Deletion Helper." into nyc-mr1-dev
am: 64b25588b7

* commit '64b25588b7aa1f377ffb1585c1a9f07c1705b7f0':
  Materialize the button bar in the Deletion Helper.

Change-Id: Iece17635fc4c7a0ffd112381068b39a84bc3daeb
2016-05-23 20:28:56 +00:00
Daniel Nishi
ba03d2ff21 Update the storage manager settings to match the mocks.
Bug: 28560570
Change-Id: I0f218da1d23b687e38c52b5a927f7b84645958c7
2016-05-23 13:27:30 -07:00
Daniel Nishi
64b25588b7 Merge "Materialize the button bar in the Deletion Helper." into nyc-mr1-dev 2016-05-23 20:23:47 +00:00
Victor Chang
45ca906e27 Trust the certificate after unlocking screenlock
When trust button is clicked, if ConfirmCredential (CC) is shown,
and user successfully unlock CC, trust the cert immediately

Bug: 28752364
Change-Id: Ied4aeda59a668a9dd2bf079a385b1fecd8eabb9e
2016-05-23 20:11:18 +01:00
宋凯伦
cca2d70b85 Merge "Fix the momery leak in DrawOverlayDetails" am: 34646006ce am: 05c4c91a6c
am: 9d16b2ddf3

* commit '9d16b2ddf3fb25e619cfd2ed9b643fa728a52e15':
  Fix the momery leak in DrawOverlayDetails

Change-Id: I2bf7b0a1a1bc98956aed0e537b4e1952dab0c435
2016-05-23 14:28:50 +00:00
Jason Monk
9d16b2ddf3 Merge "Fix the momery leak in DrawOverlayDetails" am: 34646006ce
am: 05c4c91a6c

* commit '05c4c91a6c6799527eae900973efea49875c97da':
  Fix the momery leak in DrawOverlayDetails

Change-Id: I9971a74e0afa36c275a70b171c101a3058c240eb
2016-05-23 14:25:55 +00:00
宋凯伦
4feb4d9a8b Fix the momery leak in DrawOverlayDetails
https://code.google.com/p/android/issues/detail?id=210852

we need to release the mOverlayBridge in onDestroy, or it will cause Memory Leak issue
Signed-off-by: 宋凯伦 <songkailun@xiaomi.com>

Change-Id: If0113ed72773c366596a2c915ec504c1c68fe3b7
2016-05-23 14:12:34 +00:00
Felipe Leme
3fe0957d62 Merge "Fixed whitelist stats so it\'s only logged on add." into nyc-dev am: b103f4497d
am: ddc0c42464

* commit 'ddc0c42464b31a1c602006089c3769d9956dcb6f':
  Fixed whitelist stats so it's only logged on add.

Change-Id: I0258e76b41420244589e40e967d218677828db06
2016-05-23 13:57:07 +00:00
Felipe Leme
7ffd5a7bc5 Merge "Fixed whitelist stats so it\'s only logged on add." into nyc-dev
am: b103f4497d

* commit 'b103f4497d0137fb47ebb51d5d26901300071fce':
  Fixed whitelist stats so it's only logged on add.

Change-Id: I46dcd529ac09bcf6f152f034847cd11a8d4b24f1
2016-05-23 13:54:17 +00:00
Felipe Leme
ddc0c42464 Merge "Fixed whitelist stats so it\'s only logged on add." into nyc-dev
am: b103f4497d

* commit 'b103f4497d0137fb47ebb51d5d26901300071fce':
  Fixed whitelist stats so it's only logged on add.

Change-Id: I63e6346d0d3a68037ddafb2a6b725eb41f09dd8e
2016-05-23 13:54:16 +00:00
TreeHugger Robot
b103f4497d Merge "Fixed whitelist stats so it's only logged on add." into nyc-dev 2016-05-23 13:45:55 +00:00
Victor Chang
937b468fb2 Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev am: b0054ec4e2
am: e8df0892d4

* commit 'e8df0892d427cd8eec0f43970e1241f8e42bc918':
  Fix Continous loop in unifed screenlock when trying to Trust a CA cert

Change-Id: Iac21f081af2d0cbad3c1174134854cdbcc204ec6
2016-05-23 12:03:44 +00:00
Victor Chang
4d43e9a764 Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev
am: b0054ec4e2

* commit 'b0054ec4e2275d8d0444b94c0560374630e077f6':
  Fix Continous loop in unifed screenlock when trying to Trust a CA cert

Change-Id: I01cd2b287d78484c1653476b75b6d300dec0c34d
2016-05-23 11:59:19 +00:00
Victor Chang
e8df0892d4 Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev
am: b0054ec4e2

* commit 'b0054ec4e2275d8d0444b94c0560374630e077f6':
  Fix Continous loop in unifed screenlock when trying to Trust a CA cert

Change-Id: If02ac2e8ddb0438e3b96491686fcd57a646d5a1f
2016-05-23 11:58:58 +00:00
Victor Chang
b0054ec4e2 Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev 2016-05-23 11:51:54 +00:00
Daniel Nishi
5af567eca7 Materialize the button bar in the Deletion Helper.
Older Android style buttons were used for the bottom button bar.
By changing them to use the buttonBarBottomStyle, they are updated
to flat buttons. The bottom button bar for settings preference
fragments now more closely tracks the Material Design spec as seen
here in [0].

The other Settings views which use the button bar buttons are the
Redaction settings and WiFi network picker in some contexts. These
should be unaffected as they are based on the SettingsActivity,
rather than the SettingsFragment, and inflate a different view.

[0] https://material-design.storage.googleapis.com/publish/material_v_8/material_ext_publish/0B7WCemMG6e0VaDdZWXpLXzNicjg/components_buttons_usage6.png

Bug: 28845586
Change-Id: I9ea55aa2fe1e76f8f952880675501cbb0f76719d
2016-05-20 16:34:59 -07:00
Felipe Leme
1d6d3723ba Merge "Defined help page for Data Saver." into nyc-dev am: f8265a8f1e
am: d21e63fe4b

* commit 'd21e63fe4b381354a2033bac1251f4152a7e14a3':
  Defined help page for Data Saver.

Change-Id: Ie8761cd677ee5a14a92ba52419d1ee21dfa1befa
2016-05-20 22:08:22 +00:00
Felipe Leme
d21e63fe4b Merge "Defined help page for Data Saver." into nyc-dev
am: f8265a8f1e

* commit 'f8265a8f1ed751d93ef15596658b82748d2a8d28':
  Defined help page for Data Saver.

Change-Id: I1430270ab4ac368a6909038ad90816ba67e1d664
2016-05-20 22:06:06 +00:00
Adrian Roos
78091bf8ca Remove option to configure emergency app
Bug: 28873644
Change-Id: Iddf4e781af8cb3ca3b62d1141c58402933bd8ec8
2016-05-20 14:36:24 -07:00