Commit Graph

29564 Commits

Author SHA1 Message Date
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
8bd2978f02 Importance slider updates. am: 9782079130
am: af2e6d69a6

* commit 'af2e6d69a63a3115d9905d3cbb5ad11718afe9b7':
  Importance slider updates.

Change-Id: Id02ae7849bb2ed01afd12a6294418a1bd402fee3
2016-05-27 15:32:40 +00:00
Paul Stewart
536a7fbe79 Merge "Display connect button in the wifi connection menu" am: 9126cfba19 am: ace9f52725 am: aa5afb18fe
am: 38e93b85f0

* commit '38e93b85f0d3d5dff06034d0e3616015b73f50dc':
  Display connect button in the wifi connection menu

Change-Id: Id7025428de1e16e481bfbca8fa61004df36f34dc
2016-05-27 15:32:37 +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
Damien Vagner
ace9f52725 Merge "Display connect button in the wifi connection menu"
am: 9126cfba19

* commit '9126cfba19c92d9fbce928ddd0caf7b098b94d3b':
  Display connect button in the wifi connection menu

Change-Id: I92ec007a194f6717ec3bea22107c97c555bca09c
2016-05-27 14:59:10 +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
0f5748b69c Revert "Importance slider updates." am: 72167fe650
am: ca4fc0e4a2

* commit 'ca4fc0e4a25b5ad9486d51dd50d9a5ee0bae88c1':
  Revert "Importance slider updates."

Change-Id: Ia30b1449fa67d2ea2db5aefb379826af3d9aabdf
2016-05-27 05:06:50 +00:00
Roozbeh Pournader
bdf4409e0f Merge "Force dashboard summary to single-line and ellipsize it" into nyc-dev am: 24aa3b01af am: e0adabcd87
am: 53d5f79d33

* commit '53d5f79d33eaf4f252175837294d33a611e62eca':

Change-Id: I496fcde0fd8e224fac401f36c6d81306031082ba
2016-05-27 05:06:49 +00:00
Maurice Lam
8605b29c6a Merge "Add activity label to encryption interstitial" into nyc-dev am: 19c0046422 am: 6b24f367f8
am: 3dd8372542

* commit '3dd83725429b0b91e47f9a5bce8a8ccfca9c6d3d':

Change-Id: Id7bbc8b30b58b5b0acb1fce739a2de135047d222
2016-05-27 05:06:48 +00:00
Bill Yi
362c151a0b Merge "Import translations. DO NOT MERGE" into nyc-dev am: d5f7c20a26 -s ours am: 4422014feb -s ours
am: 3bef07780b  -s ours

* commit '3bef07780b92550bc7e5c4975ef4c0bcf91d9a72':

Change-Id: I4ac03c679a57638aacb18a69c82749c7b1ae1ac4
2016-05-27 05:06:46 +00:00
Julia Reynolds
8c74b65b22 Merge "Importance slider updates." into nyc-dev am: 7c2c025e4f am: b0f0d299cf
am: 247697277a

* commit '247697277ab49e9a1eeff48db0f20381fc66d57e':

Change-Id: I4132c9265677d41be98805abf04619c563c57010
2016-05-27 05:06:44 +00:00
Bart Sears
ca4fc0e4a2 Revert "Importance slider updates."
am: 72167fe650

* commit '72167fe65030fffedf728bdd700b8207518c19f3':
  Revert "Importance slider updates."

Change-Id: I49edab23842d354bcf321423f46a6a328e2db9c4
2016-05-27 04:54:37 +00: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
53d5f79d33 Merge "Force dashboard summary to single-line and ellipsize it" into nyc-dev am: 24aa3b01af
am: e0adabcd87

* commit 'e0adabcd87e0b3a2a1e6918e87c1b917043ded85':

Change-Id: Ib1f946d7515ade63d9ded354615e8d51e4cbad4f
2016-05-27 04:19:43 +00:00
Maurice Lam
3dd8372542 Merge "Add activity label to encryption interstitial" into nyc-dev am: 19c0046422
am: 6b24f367f8

* commit '6b24f367f8ed4ba9dcd406094478f79ea8e7f68a':

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

* commit '4422014febeaa68768e8256cfa6e3560e4a166da':

Change-Id: Ic55f28a5fac46ae170113ff127e22031ad32dfd4
2016-05-27 04:19:37 +00:00
Julia Reynolds
247697277a Merge "Importance slider updates." into nyc-dev am: 7c2c025e4f
am: b0f0d299cf

* commit 'b0f0d299cf034bebc32336b9af8286b7951f6bc8':

Change-Id: Icc3ace9876d1407112c357c0d18be4aef8974377
2016-05-27 04:19:33 +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
Bart Sears
e691368c65 Revert "Importance slider updates."
am: 690f712595

* commit '690f71259568dafd4e54367e8d13bfc6157de05a':
  Revert "Importance slider updates."

Change-Id: I55aff390f45832066d99beaa1d88089b47e2889d
2016-05-27 03:31:36 +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
Roozbeh Pournader
d630e584d2 Merge "Force dashboard summary to single-line and ellipsize it" into nyc-dev am: 24aa3b01af am: 49d704c228
am: 8208d69e34

* commit '8208d69e34c1ff186cc65eb89a9b4e3af4f31c2a':
  Force dashboard summary to single-line and ellipsize it

Change-Id: I7e96432e943609b3580d4352e09e03ea1f6a0293
2016-05-27 00:32:36 +00:00
Maurice Lam
225d64cc5d Merge "Add activity label to encryption interstitial" into nyc-dev am: 19c0046422 am: 2ddf85b94b
am: 934bb00ac3

* commit '934bb00ac317001db159bc28e12e4c43905a88c9':
  Add activity label to encryption interstitial

Change-Id: I7e2eaabb379bf878f88b12cee4c4909b5100499e
2016-05-27 00:32:35 +00:00
Bill Yi
8d212eb8ba Merge "Import translations. DO NOT MERGE" into nyc-dev am: d5f7c20a26 -s ours am: 1c6e3e571f -s ours
am: 202f94bb11  -s ours

* commit '202f94bb11d646879b5cf630144264d3f7d0aaa3':
  Import translations. DO NOT MERGE

Change-Id: I043dd252b76d1e48d248071f9303b27fc882a800
2016-05-27 00:32:35 +00: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
Jason Monk
af0a805023 Merge "Fix crash from battery saver switch" into nyc-dev am: 371aec1e92 am: 031faa05e0
am: 1049b0b7f8

* commit '1049b0b7f8a4447b2f9df4f547ded5e94caa5dbd':

Change-Id: I5418e43649a4d8f6b7effc431a86915869e43927
2016-05-27 00:32:32 +00:00
Roozbeh Pournader
8208d69e34 Merge "Force dashboard summary to single-line and ellipsize it" into nyc-dev am: 24aa3b01af
am: 49d704c228

* commit '49d704c228cfbae65546523db4a6fee3cdbbf5ea':
  Force dashboard summary to single-line and ellipsize it

Change-Id: I59c98ac0e5d79f4bfb00d2dbffb1d773a5d5d4f5
2016-05-27 00:30:00 +00:00
Maurice Lam
934bb00ac3 Merge "Add activity label to encryption interstitial" into nyc-dev am: 19c0046422
am: 2ddf85b94b

* commit '2ddf85b94b696730189dfda4e680d25a47874eb8':
  Add activity label to encryption interstitial

Change-Id: I3922ed6182b5b3b34e0a031af872c5e1a7069143
2016-05-27 00:30:00 +00:00
Bill Yi
202f94bb11 Merge "Import translations. DO NOT MERGE" into nyc-dev am: d5f7c20a26 -s ours
am: 1c6e3e571f  -s ours

* commit '1c6e3e571fd133a7a888fa3c4b37c9b8e3232da5':
  Import translations. DO NOT MERGE

Change-Id: Ia54f0858fa61d2d2fc6b1c19b13fee6c5053df04
2016-05-27 00:29:59 +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
Jason Monk
1049b0b7f8 Merge "Fix crash from battery saver switch" into nyc-dev am: 371aec1e92
am: 031faa05e0

* commit '031faa05e0a5b04086db880844460972a9e24c88':

Change-Id: I455b2db4ad4999f626eecf975d12ddb7a9951fe5
2016-05-27 00:26:00 +00:00
Roozbeh Pournader
49d704c228 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: If6a43255eb932c479031826caef353138bd35525
2016-05-27 00:20:42 +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
Roozbeh Pournader
24aa3b01af Merge "Force dashboard summary to single-line and ellipsize it" into nyc-dev 2016-05-27 00:11:47 +00:00
Maurice Lam
2ddf85b94b Merge "Add activity label to encryption interstitial" into nyc-dev
am: 19c0046422

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

Change-Id: I6aef221cd49b0bab4ae7da332f388865effb4e20
2016-05-26 23:58:26 +00:00