PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,282 Commits 1 Branch 0 Tags
c51143a35ace37a8aeb3fea828dbf40f43c2b81c
Commit Graph

30282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Baligh Uddin
6728a06ac2 Merge "Import translations. DO NOT MERGE" 2016-05-26 16:31:53 +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
67c044d5d5 Merge "Merge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev am: fec38d0699 am: cc4e5c5443" into nyc-mr1-dev-plus-aosp 
am: 8c346e3ed7

* commit '8c346e3ed7a180d025617e9c670ef3c3d26b807e':

Change-Id: Id86f895120ba6644909910d29fa4bf3ba97ad916
 2016-05-26 14:52:14 +00: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
Android Build Merger (Role)
8c346e3ed7 Merge "Merge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev am: fec38d0699 am: cc4e5c5443" into nyc-mr1-dev-plus-aosp 2016-05-26 14:37:25 +00:00
Ricky Wai
030d1d20d7 Merge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev am: fec38d0699 
am: cc4e5c5443

* commit 'cc4e5c5443d7984460a358bae5868cb1f2050de6':
  Use LockPatternUtils.resetKeyStore() to clear keystore

Change-Id: Ifeef780b1df20e328a4b8cf6b963598f6bb52bf3
 2016-05-26 14:35:57 +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
25f21cdb69 Merge "Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation" into nyc-dev am: eb02435cbf am: ec4ea60b63 
am: 669e101047

* commit '669e101047cad4d2a251d5d627bce9e14712577d':

Change-Id: If0838fa9419fb92318bb196df57cf47226aaff8d
 2016-05-26 11:46:01 +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