PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,734 Commits 1 Branch 0 Tags
d95f2a03677c0933d21920ba24f6b3daf7da70db
Commit Graph

28734 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
d95f2a0367 Merge "Import translations. DO NOT MERGE" 2016-05-31 03:54:29 +00:00
Roozbeh Pournader
4c0bfe9eb5 Merge "Merge "Merge "Show only up to two locales in Settings" into nyc-dev am: a260cf8931" into nyc-mr1-dev am: ed922ce20e" into nyc-mr1-dev-plus-aosp 
am: e2bc59b045

* commit 'e2bc59b04533f0c04599aecd21fb092141b33cf6':

Change-Id: I271d5a51f9181e37e99b2b4cb8a0289b8793ad39
 2016-05-31 02:24:43 +00:00
Roozbeh Pournader
b0a27649e9 Merge "Show only up to two locales in Settings" into nyc-dev am: a260cf8931 am: aacca81c31 
am: 3aaa715332

* commit '3aaa71533267226a4db6594ecc98a7e3c23a7700':

Change-Id: I9aeea74adad98447ef3f2eee2c656eed21ec6ad7
 2016-05-31 02:24:42 +00:00
Android Build Merger (Role)
e2bc59b045 Merge "Merge "Merge "Show only up to two locales in Settings" into nyc-dev am: a260cf8931" into nyc-mr1-dev am: ed922ce20e" into nyc-mr1-dev-plus-aosp 2016-05-31 02:19:50 +00:00
Roozbeh Pournader
c9d869ebab Merge "Merge "Show only up to two locales in Settings" into nyc-dev am: a260cf8931" into nyc-mr1-dev 
am: ed922ce20e

* commit 'ed922ce20e95ac5d441d0489e4702c9a74652f9b':

Change-Id: I8c3f2d29a706f65d406ff23e01e560ec53512707
 2016-05-31 02:19:39 +00:00
Roozbeh Pournader
3aaa715332 Merge "Show only up to two locales in Settings" into nyc-dev am: a260cf8931 
am: aacca81c31

* commit 'aacca81c314d9f5b677427dfc4c2cadfa194f4fb':

Change-Id: Ic00a466681fac4393990d17fc3eefa24486eb26b
 2016-05-31 02:19:37 +00:00
Roozbeh Pournader
ed922ce20e Merge "Merge "Show only up to two locales in Settings" into nyc-dev am: a260cf8931" into nyc-mr1-dev 2016-05-31 02:07:36 +00:00
Roozbeh Pournader
f297a3da49 Merge "Show only up to two locales in Settings" into nyc-dev am: a260cf8931 am: c34946b8fb 
am: e784c743d9

* commit 'e784c743d9e255a14030bc006c96433acdb9275c':
  Show only up to two locales in Settings

Change-Id: I9c7c5eaf55bf68aea8f23e28ccf14b622c049bac
 2016-05-31 01:31:58 +00:00
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
8f0b03b20d 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: I4e9d948e1d5d7e0c96116d2d850adf143b300b1c
 2016-05-31 01:14:39 +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
Bill Yi
cae7b1532b Import translations. DO NOT MERGE 
Change-Id: If0994c4614782c53c4b0f002dd12d87758f6a49e
Auto-generated-cl: translation import
 2016-05-30 11:19:55 -07:00
Jason Monk
80a32aa115 Merge "Fix pref availability for search" into nyc-dev am: 8eaa3de931 am: 6ed9be1352 
am: ec57cbf8fc

* commit 'ec57cbf8fcf5869e7de8bbd382bfa5e2215f9567':

Change-Id: Id889bcfcaed296a5fc287a37c2f940bab4cb051a
 2016-05-27 20:48:17 +00:00
Jason Monk
ac346f5a1d Merge "Don\'t allow restricted data usage of system" into nyc-dev am: da52f08b0a am: 3b8dd1eeae 
am: 797e708539

* commit '797e708539083cc87d04bcd0057dc81da828812b':

Change-Id: Idcda763fda97ed824f3c370976b9b2298e4789a5
 2016-05-27 20:48:16 +00:00
Jason Monk
f608350097 Merge "Fix pref availability for search" into nyc-dev am: 8eaa3de931 am: 83c2670cda 
am: 4a47287267

* commit '4a47287267136866eeecba3d8840454e81028b21':
  Fix pref availability for search

Change-Id: I03caca7f39056d028fa60fdf3f6aaec62619f830
 2016-05-27 20:48:14 +00:00
Jason Monk
b0e3a1925a Merge "Don\'t allow restricted data usage of system" into nyc-dev am: da52f08b0a am: ef19af788c 
am: 54ed02784f

* commit '54ed02784f15d66f9ad6ea67d27d348a167d83fb':
  Don't allow restricted data usage of system

Change-Id: I8b4142f0b395ba3b5bf907ac6181d9135ca3e8cd
 2016-05-27 20:48:12 +00:00
Jason Monk
ec57cbf8fc Merge "Fix pref availability for search" into nyc-dev am: 8eaa3de931 
am: 6ed9be1352

* commit '6ed9be13527fde9be3d013dc241e8c407452f62e':

Change-Id: I5b7449b747bc18df83173097ff4d8cf9eaec1984
 2016-05-27 17:16:07 +00:00
Jason Monk
797e708539 Merge "Don\'t allow restricted data usage of system" into nyc-dev am: da52f08b0a 
am: 3b8dd1eeae

* commit '3b8dd1eeaea4de4b374ae36b2bc1ea469513f567':

Change-Id: I867a11f05a7d57b553c841d21d2beb0997188996
 2016-05-27 17:16:05 +00: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
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