PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,656 Commits 1 Branch 0 Tags
362287567e1b66421c9bbdf1fd1ca7ae7c547113
Commit Graph

27656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
TreeHugger Robot
d2ecbf5cf6 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-26 17:06:33 +00:00
Jason Monk
371aec1e92 Merge "Fix crash from battery saver switch" into nyc-dev 2016-05-26 16:46:51 +00: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
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
669e101047 Merge "Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation" into nyc-dev am: eb02435cbf 
am: ec4ea60b63

* commit 'ec4ea60b63bec3ba80dead1e4fcbdc19ec37d1d1':

Change-Id: Ie64b89b4cbbedea69e39162dbb7fea66bd33ff5a
 2016-05-26 11:36:29 +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
Maurice Lam
433671278f Merge "Update button styles in fingerprint setup" into nyc-mr1-dev 
am: 92d90a9df0

* commit '92d90a9df0c1c19a6682f105c3f48c4d0f8ac130':
  Update button styles in fingerprint setup

Change-Id: I4f825bf184213205d0a54fa9fe26274be1a31ede
 2016-05-26 00:09:05 +00:00
Android Build Merger (Role)
2a94bc34df Merge "Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev am: 08e24d43b6 am: 6193fb90ae" into nyc-mr1-dev-plus-aosp 2016-05-26 00:04:17 +00:00
Derek Tan
ba8680e7c6 Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev am: 08e24d43b6 
am: 6193fb90ae

* commit '6193fb90ae7a83895f9af25b5928aadd1b8a8752':
  Use getConfigForSubId instead of getConfig(int).

Change-Id: I8eef19e43551efc5685db02438590c576a28d73c
 2016-05-26 00:02:19 +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
Maurice Lam
92d90a9df0 Merge "Update button styles in fingerprint setup" into nyc-mr1-dev 2016-05-25 23:56:37 +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
Bill Yi
2515805c20 Import translations. DO NOT MERGE 
Change-Id: I587fce9e3728b76d7167c2049ecdd4c412e1d6e8
Auto-generated-cl: translation import
 2016-05-25 16:21:16 -07:00
Sudheer Shanka
b1a7ba74bb Merge "Guard against IllegalArgumentException" into nyc-dev am: 96305a2b34 
am: 319961f7c4

* commit '319961f7c4910bd3942fc52b4911a7274939c7fc':

Change-Id: If4f198eeb3e61d3e5cd97f74707350d2cfe091be
 2016-05-25 23:18:37 +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
Sudheer Shanka
3958474fb3 Merge "Guard against IllegalArgumentException" into nyc-dev am: 96305a2b34 
am: 68a4e6c104

* commit '68a4e6c104d08d4adadbec1077eadcf59629cec2':
  Guard against IllegalArgumentException

Change-Id: I894f473938f6b623791f412fe688e616b1bd9962
 2016-05-25 23:17:33 +00:00
Sudheer Shanka
68a4e6c104 Merge "Guard against IllegalArgumentException" into nyc-dev 
am: 96305a2b34

* commit '96305a2b34b9b22d815200372c7636d28175b8fd':
  Guard against IllegalArgumentException

Change-Id: I8589c4c63d355d51ff0be27cd1ae6bd98eb2c0d9
 2016-05-25 23:10:43 +00:00
Sudheer Shanka
319961f7c4 Merge "Guard against IllegalArgumentException" into nyc-dev 
am: 96305a2b34

* commit '96305a2b34b9b22d815200372c7636d28175b8fd':
  Guard against IllegalArgumentException

Change-Id: I03ad7e1ed4fe1c2ebd65ab822364566eba1d5b34
 2016-05-25 23:10:43 +00:00
TreeHugger Robot
96305a2b34 Merge "Guard against IllegalArgumentException" into nyc-dev 2016-05-25 23:07:01 +00:00
Sunny Goyal
60a4dc652d Merge "Add an option allowing to skip wallpaper apps selection." into nyc-mr1-dev 2016-05-25 22:50:43 +00:00
Maurice Lam
558c82ffd8 Update button styles in fingerprint setup 
Bug: 28888250
Change-Id: I2f9e7b4c886f27deac6b42860452a3fa0006facd
 2016-05-25 15:25:13 -07:00
Derek Tan
d1151c19d8 Use getConfigForSubId instead of getConfig(int). 
Per API review, we want to revert getConfig(int) to
getConfigForSubId(int) (ag/1075011). This CL changes all
callers to use getConfigForSubId(int).

Bug: 28295813
Change-Id: I0e44a5e758aed34ce26740632270700bde66cff6
 2016-05-25 15:00:27 -07:00
Android Build Merger (Role)
d34faeaded Merge "Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev am: a6269236a2 am: cb5c925432" into nyc-mr1-dev-plus-aosp 2016-05-25 21:29:56 +00:00
Robin Lee
2e98acf1ba Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev am: a6269236a2 
am: 74cc9772e9

* commit '74cc9772e9769b8c6a8cd6a6bb36cc8cfd5efb74':
  Don't crash trying to disable lockdown VPN

Change-Id: I8f69b83a4bf66b022f58d8deb9e70e911801b960
 2016-05-25 21:28:35 +00:00
Robin Lee
95c10c536b Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev am: a6269236a2 
am: cb5c925432

* commit 'cb5c925432f00d0fb555286f400cdd0c29683e25':
  Don't crash trying to disable lockdown VPN

Change-Id: I80f61b1a95d44f0be18577f37a709e4d15196d04
 2016-05-25 21:28:34 +00:00
Robin Lee
cb5c925432 Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev 
am: a6269236a2

* commit 'a6269236a24e00947efd3471f2901783413d56e5':
  Don't crash trying to disable lockdown VPN

Change-Id: Ic83af8894c66947586d84ebdbfa667a6b1d2a93c
 2016-05-25 21:20:48 +00:00
Robin Lee
74cc9772e9 Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev 
am: a6269236a2

* commit 'a6269236a24e00947efd3471f2901783413d56e5':
  Don't crash trying to disable lockdown VPN

Change-Id: I71ecde2a45a26c775f5738c232b7d0da834af42a
 2016-05-25 21:19:23 +00:00
Robin Lee
a6269236a2 Merge "Don't crash trying to disable lockdown VPN" into nyc-dev 2016-05-25 21:05:54 +00:00
Sudheer Shanka
1fa37f3bb3 Guard against IllegalArgumentException 
Bug: 28742227
Change-Id: If436ec3f743ca11ea40dce2033b7b993cb6ad170
 2016-05-25 13:17:12 -07:00
Daniel Nishi
dd8ab483cb Merge "Update the summary strings in the Deletion Helper to match the latest mocks." into nyc-mr1-dev 
am: 668c297603

* commit '668c297603c6ae20225717741d90d06e819216c0':
  Update the summary strings in the Deletion Helper to match the latest mocks.

Change-Id: I9936874c26db790379b6b5781547182c21e74470
 2016-05-25 20:04:06 +00:00
Daniel Nishi
606f1fc7cc Merge "Hook up the automatic storage manager settings with the flag." into nyc-mr1-dev 
am: 4c5e2bb526

* commit '4c5e2bb526d93e3e5a3958f44a4fe2d012a6ffe7':
  Hook up the automatic storage manager settings with the flag.

Change-Id: Ia3be5191adf3eee5fcf407ced923c94435e9da73
 2016-05-25 20:04:05 +00:00
Daniel Nishi
668c297603 Merge "Update the summary strings in the Deletion Helper to match the latest mocks." into nyc-mr1-dev 2016-05-25 20:02:25 +00:00
Daniel Nishi
4c5e2bb526 Merge "Hook up the automatic storage manager settings with the flag." into nyc-mr1-dev 2016-05-25 19:55:58 +00:00
Andrew Sapperstein
4a8586cfe6 Merge "More theming fixes." into nyc-mr1-dev 
am: 9341ac980e

* commit '9341ac980e29e6a692c4c3a61096fabbd35c9902':
  More theming fixes.

Change-Id: Id18687881ca1529f10266c58dbc8f16a42b62c33
 2016-05-25 19:54:34 +00:00
Sunny Goyal
21ef89fd6b Add an option allowing to skip wallpaper apps selection. 
This commit adds an option to the Settings application, making it
possible to launch a different activity for wallpaper selection

Also removing te intent constant android.settings.WALLPAPER_SETTINGS
The target for this action can't be easily overriden when the
wallpaper target is overriden, which would provide an inconsistant
experience.

Bug: 28554244
Bug: 26688904
Change-Id: I25367fbb4505615351fbad9e1aa1ca88df0cd034
 2016-05-25 12:46:43 -07:00
Andrew Sapperstein
9341ac980e Merge "More theming fixes." into nyc-mr1-dev 2016-05-25 19:40:50 +00:00
Jeff Sharkey
e06f74af73 Merge "Skip indexing content while user is locked." into nyc-dev am: c416433a9e 
am: a592e55e5f

* commit 'a592e55e5ff8e7b4e799745f076888e6bbbcdf55':

Change-Id: Ie64ecbe217deec122560d62b94816c92e5970301
 2016-05-25 18:58:20 +00:00