Commit Graph

12480 Commits

Author SHA1 Message Date
Derek Tan
08e24d43b6 Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev 2016-05-25 23:41:20 +00:00
Sudheer Shanka
319961f7c4 Merge "Guard against IllegalArgumentException" into nyc-dev
am: 96305a2b34

* commit '96305a2b34b9b22d815200372c7636d28175b8fd':
  Guard against IllegalArgumentException

Change-Id: I03ad7e1ed4fe1c2ebd65ab822364566eba1d5b34
2016-05-25 23:10:43 +00:00
TreeHugger Robot
96305a2b34 Merge "Guard against IllegalArgumentException" into nyc-dev 2016-05-25 23:07:01 +00:00
Sunny Goyal
60a4dc652d Merge "Add an option allowing to skip wallpaper apps selection." into nyc-mr1-dev 2016-05-25 22:50:43 +00:00
Derek Tan
d1151c19d8 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
2016-05-25 15:00:27 -07:00
Robin Lee
74cc9772e9 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
2016-05-25 21:19:23 +00:00
Robin Lee
a6269236a2 Merge "Don't crash trying to disable lockdown VPN" into nyc-dev 2016-05-25 21:05:54 +00:00
Sudheer Shanka
1fa37f3bb3 Guard against IllegalArgumentException
Bug: 28742227
Change-Id: If436ec3f743ca11ea40dce2033b7b993cb6ad170
2016-05-25 13:17:12 -07:00
Daniel Nishi
668c297603 Merge "Update the summary strings in the Deletion Helper to match the latest mocks." into nyc-mr1-dev 2016-05-25 20:02:25 +00:00
Daniel Nishi
4c5e2bb526 Merge "Hook up the automatic storage manager settings with the flag." into nyc-mr1-dev 2016-05-25 19:55:58 +00:00
Sunny Goyal
21ef89fd6b 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
2016-05-25 12:46:43 -07:00
Andrew Sapperstein
9341ac980e Merge "More theming fixes." into nyc-mr1-dev 2016-05-25 19:40:50 +00:00
Jeff Sharkey
4061fd1ddd 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
2016-05-25 18:30:30 +00:00
Jason Monk
928dbe3462 Don\'t update conditions on background threads
am: 6cb280d146

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

Change-Id: I446e85dc5462e3c06a75e2e53f1990990bb06f48
2016-05-25 18:28:02 +00:00
TreeHugger Robot
c416433a9e Merge "Skip indexing content while user is locked." into nyc-dev 2016-05-25 18:27:29 +00:00
Daniel Nishi
84d944b0bc Update the summary strings in the Deletion Helper to match the latest mocks.
Bug: 28917902
Change-Id: I35af7483f2a97dffc230093a90f0b7d87a4532c1
2016-05-25 11:11:03 -07:00
Andrew Sapperstein
7232e4f7ee 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
2016-05-25 10:55:11 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Felipe Leme
f8265a8f1e Merge "Defined help page for Data Saver." into nyc-dev 2016-05-20 21:27:57 +00:00
Felipe Leme
746b384700 Fixed whitelist stats so it's only logged on add.
BUG: 28166693
Change-Id: If1f91167c21054e78a966670c20c174c3f73d2a5
2016-05-20 14:13:22 -07:00
Daniel Nishi
1320de307c Fix a crash where the deletion helper crashes when app sizes load.
This was caused by a change I made to the extraInfo on the app.
The extra info used to be a long which was the last usage time.
I changed it to a UsageStatsState and missed this usage of it.
The attempted cast to long caused a crash.

Bug: 28885317
Change-Id: Ie0d6bcea5d0afccd2762acd19d628c742c7e3db9
2016-05-20 14:11:27 -07:00
Jason Monk
00e73e75d5 Merge "Protect against monkey crash" into nyc-dev
am: d3ce331b94

* commit 'd3ce331b94af2c896864f78459c8656629d3455f':
  Protect against monkey crash

Change-Id: Ie079d13887e9159d78ef5485bfa96878cee01d6a
2016-05-20 18:24:35 +00:00