Roozbeh Pournader
e784c743d9
Merge "Show only up to two locales in Settings" into nyc-dev am: a260cf8931
...
am: c34946b8fb
* commit 'c34946b8fb2f612b29401b807a8d774fb64a7812':
Show only up to two locales in Settings
Change-Id: I14a74579f9742586c7a3ebec7adc2d1d73da32ab
2016-05-31 01:25:59 +00:00
Roozbeh Pournader
c34946b8fb
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
2016-05-31 01:20:52 +00:00
Roozbeh Pournader
aacca81c31
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: I34fae4ef523d9719ce09cc62cd556c56b232b003
2016-05-31 01:14:42 +00:00
Roozbeh Pournader
a260cf8931
Merge "Show only up to two locales in Settings" into nyc-dev
2016-05-31 01:02:41 +00:00
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
4a47287267
Merge "Fix pref availability for search" into nyc-dev am: 8eaa3de931
...
am: 83c2670cda
* commit '83c2670cda20810fc1f338456f36ec0df92b8cf4':
Fix pref availability for search
Change-Id: If335b521b4064b4f378c8e4aa24a34cb5daa2eba
2016-05-27 17:12:58 +00:00
Jason Monk
54ed02784f
Merge "Don\'t allow restricted data usage of system" into nyc-dev am: da52f08b0a
...
am: ef19af788c
* commit 'ef19af788c6698070dcb8017d084b746bde73abd':
Don't allow restricted data usage of system
Change-Id: Id7dfcfab1f700b861616dfc9e43a348343f5c64b
2016-05-27 17:12:57 +00: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
6ed9be1352
Merge "Fix pref availability for search" into nyc-dev
...
am: 8eaa3de931
* commit '8eaa3de9317eb21855db43ed276b90ca48ad1d28':
Fix pref availability for search
Change-Id: If1baba85d5d2897f5a360a75aad96ac72bfe1bd7
2016-05-27 17:08:54 +00:00
Jason Monk
3b8dd1eeae
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: Id5ad8e2b5ab03f397e0340f83b97e3598a308403
2016-05-27 17:08:54 +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
Julia Reynolds
af2e6d69a6
Importance slider updates.
...
am: 9782079130
* commit '9782079130fb6dd3a83bedde31afa4df6a03b63c':
Importance slider updates.
Change-Id: I267f2237a759b9f86a1b507b1d627ce5367c6cfe
2016-05-27 15:18:08 +00:00
Damien Vagner
38e93b85f0
Merge "Display connect button in the wifi connection menu" am: 9126cfba19 am: ace9f52725
...
am: aa5afb18fe
* commit 'aa5afb18fe24317584549460f6093826d59d414f':
Display connect button in the wifi connection menu
Change-Id: If596c032697643ddc1b530dca3827added381ea0
2016-05-27 15:10:43 +00:00
Paul Stewart
aa5afb18fe
Merge "Display connect button in the wifi connection menu" am: 9126cfba19
...
am: ace9f52725
* commit 'ace9f527253a5464308f8dd3aa97f841d5d2d996':
Display connect button in the wifi connection menu
Change-Id: Ia72d92c7e50cfb316772609e561b34d0b8c62333
2016-05-27 15:06:06 +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
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
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
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
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
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
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
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
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
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