Paul Stewart
9126cfba19
Merge "Display connect button in the wifi connection menu"
2016-05-27 14:50:10 +00: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
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
Bart Sears
690f712595
Revert "Importance slider updates."
...
This reverts commit 373a9e2fcf
.
Change-Id: I3279163eb052f93cf6b87710c17cfa0c2eae56ba
2016-05-27 03:09:53 +00:00
Bart Sears
4b377b1ee6
Revert "Importance slider updates."
...
This reverts commit 373a9e2fcf
.
Change-Id: I3279163eb052f93cf6b87710c17cfa0c2eae56ba
2016-05-27 02:04:03 +00:00
Roozbeh Pournader
217b1d1581
Show only up to two locales in Settings
...
The list could otherwise grow very long, spamming the screen.
Bug: 28872122
Change-Id: I8c4dbe659e1c088eba8b5ba1b2905b5eb8bc0229
2016-05-26 19:01:06 -07:00
Julia Reynolds
dbaf5ceda2
Merge "Importance slider updates." into nyc-dev am: 7c2c025e4f
am: fe77548afc
...
am: 034fb9184e
* commit '034fb9184e3d6e764c8364b20b87282c5269cab1':
Importance slider updates.
Change-Id: Icecd3e73e9aba034eb760c916e6eb1b4b094dfa1
2016-05-27 00:32:34 +00:00
Julia Reynolds
034fb9184e
Merge "Importance slider updates." into nyc-dev am: 7c2c025e4f
...
am: fe77548afc
* commit 'fe77548afc37b88fbba44febc18d276137b4c762':
Importance slider updates.
Change-Id: I76c14c4dd5c50d790ec56e24932738e8b0601ccf
2016-05-27 00:27:40 +00:00
Andrew Sapperstein
517f14f3d8
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
2016-05-26 17:18:38 -07:00
Daniel Nishi
af5efb69b7
Merge "Hide the Deletion Helper entry points from Settings." into nyc-mr1-dev am: 39d2913e1c
...
am: 5ba545ee06
* commit '5ba545ee0667553265e707c0ce08b4496089c75a':
Hide the Deletion Helper entry points from Settings.
Change-Id: I5791f07e9ae06e19e0ccc5219c8cfad33b61f1d0
2016-05-26 20:34:48 +00:00
Daniel Nishi
5ba545ee06
Merge "Hide the Deletion Helper entry points from Settings." into nyc-mr1-dev
...
am: 39d2913e1c
* commit '39d2913e1cfd455b0f8d571e4656ee6288392425':
Hide the Deletion Helper entry points from Settings.
Change-Id: I5f436a6d19e5e31f6fb5dc04e02a0ad63baaca42
2016-05-26 20:31:53 +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
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
e5e4a555e7
Merge "Fix crash from battery saver switch" into nyc-dev am: 371aec1e92
am: e3b9c3dd63
...
am: 362287567e
* commit '362287567e1b66421c9bbdf1fd1ca7ae7c547113':
Fix crash from battery saver switch
Change-Id: I01a71bf6f60c634baa2b4784dd757ca729b7075c
2016-05-26 18:02:56 +00:00
Jason Monk
362287567e
Merge "Fix crash from battery saver switch" into nyc-dev am: 371aec1e92
...
am: e3b9c3dd63
* commit 'e3b9c3dd6353ce662b80afb431ffa75e4fcd5f37':
Fix crash from battery saver switch
Change-Id: Iebf8ed4ae246986d5c6c97ff423260caa5e29ea4
2016-05-26 17:59:21 +00: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
Julia Reynolds
fe77548afc
Merge "Importance slider updates." into nyc-dev
...
am: 7c2c025e4f
* commit '7c2c025e4ff6b91ab3ab1e78e278a12a8051c542':
Importance slider updates.
Change-Id: Ief2d1785b756e6dad315e286a28115b044174daf
2016-05-26 17:37:02 +00:00
Jason Monk
031faa05e0
Merge "Fix crash from battery saver switch" into nyc-dev
...
am: 371aec1e92
* commit '371aec1e92aa4b5cf6e4ed2b5f39faf180c17d1f':
Fix crash from battery saver switch
Change-Id: If0c08614030b97453fb7bd7fe756738e288864ae
2016-05-26 17:37:00 +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
bc5535d9b2
Merge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev am: fec38d0699
am: fed850c9b6
...
am: 6fd382f470
* commit '6fd382f47015a8d98652b0195b1b877806d194db':
Use LockPatternUtils.resetKeyStore() to clear keystore
Change-Id: I95bec03ac3b860b6e9571b70bb72ea7284402114
2016-05-26 14:51:29 +00:00
Ricky Wai
6fd382f470
Merge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev am: fec38d0699
...
am: fed850c9b6
* commit 'fed850c9b63d0419bad398681d5aaf414aebd65c':
Use LockPatternUtils.resetKeyStore() to clear keystore
Change-Id: Icf11c905d4f9f846b6906e933dfe2e4fd8ecab52
2016-05-26 14:35:50 +00:00
Ricky Wai
fed850c9b6
Merge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev
...
am: fec38d0699
* commit 'fec38d06991b0c49750d02e27e6d8a452a1bca29':
Use LockPatternUtils.resetKeyStore() to clear keystore
Change-Id: I72265dbbcd34c30c7399ab9c7782763459a19a57
2016-05-26 14:04:25 +00: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
4813f94a25
Merge "Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation" into nyc-dev am: eb02435cbf
am: 195330a9c2
...
am: 07d34b7c28
* commit '07d34b7c2868012e0aa517379d210143fe9832b0':
Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation
Change-Id: I457b3cbfb1e98232c93291cc387eb575bde525c8
2016-05-26 11:45:58 +00:00
Victor Chang
07d34b7c28
Merge "Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation" into nyc-dev am: eb02435cbf
...
am: 195330a9c2
* commit '195330a9c2cea8d367e5c94cc34cf3454ed17110':
Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation
Change-Id: I5b2799dfc2cd7bceeed463bfa90ad64e63f13c4b
2016-05-26 11:27:27 +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
195330a9c2
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: I37e0fd839f1daaa8c639fdd22f45329dbf91e689
2016-05-26 11:13:39 +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
Derek Tan
680b960047
Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev am: 08e24d43b6
am: a12ac3c683
...
am: 3f1ca3a975
* commit '3f1ca3a975dedb91d8a974fd06edde7ce97f8b11':
Use getConfigForSubId instead of getConfig(int).
Change-Id: Ia45f3a929c79d94f738b4bcc1a6f01cadc95150e
2016-05-26 00:14:53 +00:00
Derek Tan
3f1ca3a975
Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev am: 08e24d43b6
...
am: a12ac3c683
* commit 'a12ac3c683e5bf675d844f5bde549b231353b0e8':
Use getConfigForSubId instead of getConfig(int).
Change-Id: I1ffe959d6279c1390f2d364ff5ceb8d46f0a295a
2016-05-26 00:01:52 +00:00
Derek Tan
a12ac3c683
Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev
...
am: 08e24d43b6
* commit '08e24d43b6f1021b4eb6cd71543f16226d43bded':
Use getConfigForSubId instead of getConfig(int).
Change-Id: I21c3a65f2c6000ca207c0ca8bceb5316325c5e22
2016-05-25 23:51:58 +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
Amit Mahajan
71eb0ba809
Merge "Fix ApnEditor UI -- specifically protocol and roamingProtocol summary"
2016-05-25 23:30:48 +00:00
Sunny Goyal
9588e9bd50
Merge "Add an option allowing to skip wallpaper apps selection." into nyc-mr1-dev am: 60a4dc652d
...
am: a635c735ea
* commit 'a635c735eaba545ef428ff76d9d4a50303bb4331':
Add an option allowing to skip wallpaper apps selection.
Change-Id: I8a2bae00cdf82dedacb492c6c0eee3f72251ac33
2016-05-25 23:27:24 +00:00
Sudheer Shanka
14fd2ed541
Merge "Guard against IllegalArgumentException" into nyc-dev am: 96305a2b34
am: 68a4e6c104
...
am: 3958474fb3
* commit '3958474fb3c19c81e339feb86dd46d7fe9242ac4':
Guard against IllegalArgumentException
Change-Id: I3247e2bd7cba49899e1db074037a8a29a231fa2d
2016-05-25 23:27:21 +00:00
Sunny Goyal
a635c735ea
Merge "Add an option allowing to skip wallpaper apps selection." into nyc-mr1-dev
...
am: 60a4dc652d
* commit '60a4dc652db643d23417fb2f037369b15177b7e2':
Add an option allowing to skip wallpaper apps selection.
Change-Id: I79a0ab340470a4a9e0489ddb86d217f7495284c1
2016-05-25 23:18:33 +00:00
Sudheer Shanka
3958474fb3
Merge "Guard against IllegalArgumentException" into nyc-dev am: 96305a2b34
...
am: 68a4e6c104
* commit '68a4e6c104d08d4adadbec1077eadcf59629cec2':
Guard against IllegalArgumentException
Change-Id: I894f473938f6b623791f412fe688e616b1bd9962
2016-05-25 23:17:33 +00:00
Sudheer Shanka
68a4e6c104
Merge "Guard against IllegalArgumentException" into nyc-dev
...
am: 96305a2b34
* commit '96305a2b34b9b22d815200372c7636d28175b8fd':
Guard against IllegalArgumentException
Change-Id: I8589c4c63d355d51ff0be27cd1ae6bd98eb2c0d9
2016-05-25 23:10:43 +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
TreeHugger Robot
56592b63c6
Merge "Disable FallbackHome on User 0 in split user system."
2016-05-25 22:52:49 +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
Sunny Goyal
d41d829dd5
Merge "Revert "Add an option allowing to skip wallpaper apps selection.""
2016-05-25 22:50:36 +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