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

28694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Maurice Lam
6bdb1be0a0 Merge "Make fingerprint inherit from GLIF theme" into nyc-mr1-dev am: 2016b1acdb 
am: 4ba8e6b176

* commit '4ba8e6b176414321952adf9f040d8bad6bff7c63':
  Make fingerprint inherit from GLIF theme

Change-Id: Iebde116725e41401e456c8ab24b2925268ef53a3
 2016-05-26 19:02:37 +00:00
Maurice Lam
4ba8e6b176 Merge "Make fingerprint inherit from GLIF theme" into nyc-mr1-dev 
am: 2016b1acdb

* commit '2016b1acdb2839b6559a3e20c51f1eef9fc5719c':
  Make fingerprint inherit from GLIF theme

Change-Id: Icfe7e27d60137a69c0a2a4fe78964bb5595b3bd7
 2016-05-26 18:57:24 +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
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
Bill Yi
2e829c1c94 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: d2ecbf5cf6 -s ours 
am: e897deae00  -s ours

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

Change-Id: I04e31d4a3f3994356c1ec40f127da57bc36a7a6c
 2016-05-26 18:02:55 +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
Bill Yi
e897deae00 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: d2ecbf5cf6  -s ours

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

Change-Id: I2b200799212b382a4f7fda058cd017afb2fd6408
 2016-05-26 17:54:02 +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
Bill Yi
1c6e3e571f Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: d5f7c20a26  -s ours

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

Change-Id: Iec4e72b5683fb0cd6292d586e798b16bbe962e5e
 2016-05-26 17:42:02 +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
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