Commit Graph

26548 Commits

Author SHA1 Message Date
Anna Galusza
6b1e9dbea4 Change Nav bar style to use system nav (new style for Nexus N+)
Bug: 27612740

Change-Id: I309cf8252285130a0e1d2c03ca664706e73cce16
2016-05-27 18:21:54 -07:00
Jason Monk
83c2670cda Merge "Fix pref availability for search" into nyc-dev
am: 8eaa3de931

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

Change-Id: I777450a2531d9c817d6ff76068b6ac7c02fcb782
2016-05-27 17:09:56 +00:00
Jason Monk
ef19af788c 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
2016-05-27 17:09:55 +00:00
Jason Monk
8eaa3de931 Merge "Fix pref availability for search" into nyc-dev 2016-05-27 17:07:23 +00:00
Jason Monk
be9412107d Fix pref availability for search
Change-Id: Ic080e131c6c751456b22d370aade77748d912b6b
Fixes: 28987828
2016-05-27 12:58:53 -04:00
Jason Monk
da52f08b0a Merge "Don't allow restricted data usage of system" into nyc-dev 2016-05-27 16:51:59 +00:00
Jason Monk
9b926c0bc6 Don't allow restricted data usage of system
Cause it will just crash

Change-Id: I4ee43633eb3fa488816b1d2767073cbe404c2c33
Fixes: 28979013
2016-05-27 10:57:10 -04:00
Julia Reynolds
9782079130 Importance slider updates.
Icon & tint.

Bug: 28911161
Change-Id: Ic56270c8803557863f914ee0eaf6801f1341387d
2016-05-27 10:00:46 -04:00
Bart Sears
72167fe650 Revert "Importance slider updates."
This reverts commit 373a9e2fcf.

Change-Id: I3279163eb052f93cf6b87710c17cfa0c2eae56ba
2016-05-27 04:47:02 +00:00
Roozbeh Pournader
e0adabcd87 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
2016-05-27 04:05:46 +00:00
Maurice Lam
6b24f367f8 Merge "Add activity label to encryption interstitial" into nyc-dev
am: 19c0046422

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

Change-Id: I9bcda822435a42c9bf7d5486b7497fb6a8f30cf4
2016-05-27 04:05:45 +00:00
Bill Yi
4422014feb Merge "Import translations. DO NOT MERGE" into nyc-dev
am: d5f7c20a26  -s ours

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

Change-Id: I9387ffb81450e3a57e725a9994c915037eabc49c
2016-05-27 04:05:43 +00:00
Julia Reynolds
b0f0d299cf Merge "Importance slider updates." into nyc-dev
am: 7c2c025e4f

* commit '7c2c025e4ff6b91ab3ab1e78e278a12a8051c542':
  Importance slider updates.

Change-Id: Ieb897d94383c401154fde35dc9bf94ca57ce1ca6
2016-05-27 04:04:31 +00:00
Roozbeh Pournader
24aa3b01af Merge "Force dashboard summary to single-line and ellipsize it" into nyc-dev 2016-05-27 00:11:47 +00:00
Roozbeh Pournader
5272b1cfd6 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
2016-05-26 16:48:12 -07:00
Maurice Lam
19c0046422 Merge "Add activity label to encryption interstitial" into nyc-dev 2016-05-26 23:46:07 +00:00
Daniel Nishi
39d2913e1c Merge "Hide the Deletion Helper entry points from Settings." into nyc-mr1-dev 2016-05-26 20:28:14 +00:00
Maurice Lam
2016b1acdb Merge "Make fingerprint inherit from GLIF theme" into nyc-mr1-dev 2016-05-26 18:54:02 +00:00
Daniel Nishi
728eebe3c0 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
2016-05-26 11:14:07 -07:00
Jason Monk
e3b9c3dd63 Merge "Fix crash from battery saver switch" into nyc-dev
am: 371aec1e92

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

Change-Id: I0416b92dbc9b18a97c9d6d0617cba636e310690b
2016-05-26 17:53:41 +00:00
TreeHugger Robot
d5f7c20a26 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-26 17:07:21 +00:00
TreeHugger Robot
d2ecbf5cf6 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-26 17:06:33 +00:00
Julia Reynolds
7c2c025e4f Merge "Importance slider updates." into nyc-dev 2016-05-26 16:50:57 +00:00
Jason Monk
371aec1e92 Merge "Fix crash from battery saver switch" into nyc-dev 2016-05-26 16:46:51 +00:00
Julia Reynolds
373a9e2fcf Importance slider updates.
Icon & tint.

Bug: 28911161
Change-Id: Ic56270c8803557863f914ee0eaf6801f1341387d
2016-05-26 11:08:16 -04:00
Jason Monk
e4d0ed502d 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
2016-05-26 11:07:53 -04:00
Ricky Wai
cc4e5c5443 Merge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev
am: fec38d0699

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

Change-Id: I1231288f2e7c5166885992b103e720f467358858
2016-05-26 14:04:21 +00:00
Ricky Wai
fec38d0699 Merge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev 2016-05-26 13:46:25 +00:00
Victor Chang
ec4ea60b63 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
2016-05-26 11:13:40 +00:00
Victor Chang
eb02435cbf Merge "Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation" into nyc-dev 2016-05-26 10:55:26 +00:00
Maurice Lam
b75baac925 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
2016-05-26 00:22:36 +00:00
Maurice Lam
92d90a9df0 Merge "Update button styles in fingerprint setup" into nyc-mr1-dev 2016-05-25 23:56:37 +00:00
Derek Tan
6193fb90ae Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev
am: 08e24d43b6

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

Change-Id: Ib804dcf00e5e183d3d9c02bc14513c98a7852ace
2016-05-25 23:51:49 +00:00
Derek Tan
08e24d43b6 Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev 2016-05-25 23:41:20 +00:00
Bill Yi
2515805c20 Import translations. DO NOT MERGE
Change-Id: I587fce9e3728b76d7167c2049ecdd4c412e1d6e8
Auto-generated-cl: translation import
2016-05-25 16:21:16 -07: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
Bill Yi
5b8dafec31 Import translations. DO NOT MERGE
Change-Id: I62ad1f9b258253eda03814f9a7bd93986c85f902
Auto-generated-cl: translation import
2016-05-25 16:07:25 -07: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
Maurice Lam
558c82ffd8 Update button styles in fingerprint setup
Bug: 28888250
Change-Id: I2f9e7b4c886f27deac6b42860452a3fa0006facd
2016-05-25 15:25:13 -07: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