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
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
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
109da1ed6c Merge "Update button styles in fingerprint setup" into nyc-mr1-dev am: 92d90a9df0 
am: 433671278f

* commit '433671278fc1c94305702b407ec9f5c661acdd16':
  Update button styles in fingerprint setup

Change-Id: Iacb863186a8701d90d62ff06981a41f31b58c4cd
 2016-05-26 00:23:11 +00:00
Maurice Lam
b75baac925 Make fingerprint inherit from GLIF theme 
Set SuwThemeGlif.Light as the parent of fingerprint theme so that it
will inherit the margins and any other attributes.

There should be no visual change other than the fixed margins.

Bug: 28965312
Change-Id: I4e51c501c8ddb0e412e194e47bcee728da151ec5
 2016-05-26 00:22:36 +00:00
Derek Tan
131a53b548 Merge "Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev am: 08e24d43b6 am: 6193fb90ae" into nyc-mr1-dev-plus-aosp 
am: 2a94bc34df

* commit '2a94bc34df4d0354359ac24ec1cec79e3c039557':

Change-Id: I216b512d7cc4e82af0ef9556ed46e6c64a28657e
 2016-05-26 00:17:43 +00:00
Derek Tan
680b960047 Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev am: 08e24d43b6 am: a12ac3c683 
am: 3f1ca3a975

* commit '3f1ca3a975dedb91d8a974fd06edde7ce97f8b11':
  Use getConfigForSubId instead of getConfig(int).

Change-Id: Ia45f3a929c79d94f738b4bcc1a6f01cadc95150e
 2016-05-26 00:14:53 +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
Amit Mahajan
71eb0ba809 Merge "Fix ApnEditor UI -- specifically protocol and roamingProtocol summary" 2016-05-25 23:30:48 +00:00
Sudheer Shanka
963266755a Merge "Guard against IllegalArgumentException" into nyc-dev am: 96305a2b34 am: 319961f7c4 
am: b1a7ba74bb

* commit 'b1a7ba74bb535e4050acb0510c5f3866d5b4057e':

Change-Id: I44abfcca920eca4a46b1c39abc2fa0b708dd1cde
 2016-05-25 23:27:27 +00:00
Sunny Goyal
9588e9bd50 Merge "Add an option allowing to skip wallpaper apps selection." into nyc-mr1-dev am: 60a4dc652d 
am: a635c735ea

* commit 'a635c735eaba545ef428ff76d9d4a50303bb4331':
  Add an option allowing to skip wallpaper apps selection.

Change-Id: I8a2bae00cdf82dedacb492c6c0eee3f72251ac33
 2016-05-25 23:27:24 +00:00
Sudheer Shanka
14fd2ed541 Merge "Guard against IllegalArgumentException" into nyc-dev am: 96305a2b34 am: 68a4e6c104 
am: 3958474fb3

* commit '3958474fb3c19c81e339feb86dd46d7fe9242ac4':
  Guard against IllegalArgumentException

Change-Id: I3247e2bd7cba49899e1db074037a8a29a231fa2d
 2016-05-25 23:27:21 +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
Bill Yi
5b8dafec31 Import translations. DO NOT MERGE 
Change-Id: I62ad1f9b258253eda03814f9a7bd93986c85f902
Auto-generated-cl: translation import
 2016-05-25 16:07:25 -07:00
TreeHugger Robot
96305a2b34 Merge "Guard against IllegalArgumentException" into nyc-dev 2016-05-25 23:07:01 +00:00
TreeHugger Robot
56592b63c6 Merge "Disable FallbackHome on User 0 in split user system." 2016-05-25 22:52:49 +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
Sunny Goyal
d41d829dd5 Merge "Revert "Add an option allowing to skip wallpaper apps selection."" 2016-05-25 22:50:36 +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
Robin Lee
33a72635a6 Merge "Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev am: a6269236a2 am: cb5c925432" into nyc-mr1-dev-plus-aosp 
am: d34faeaded

* commit 'd34faeaded2705b3cd70ef9b30b93aba2dea3a94':

Change-Id: I8810a87d00bd90d505a5daa658ed674182bdb108
 2016-05-25 21:38:38 +00:00
Robin Lee
558123bc38 Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev am: a6269236a2 am: 74cc9772e9 
am: 2e98acf1ba

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

Change-Id: Ic1947363f51c9769415602752a650206a60b32a6
 2016-05-25 21:37:47 +00: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
Sunny Goyal
1598d73c12 Revert "Add an option allowing to skip wallpaper apps selection." 
This reverts commit fe4e80b98b.

This change is covered in https://googleplex-android-review.git.corp.google.com/#/c/1075489/

Change-Id: I4a9cf9f5199f315d2512ef211c8e617090acf244
 2016-05-25 21:08:47 +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
Muyuan Li
4811ab4b6d Disable FallbackHome on User 0 in split user system. 
Bug: 28870689
Change-Id: Ib0707cc31b1dd0851c918e4effe6d7a3798c801a
(cherry picked from commit 40066f7bfb4feb871d3db88e7575d67971257bea)
 2016-05-25 20:29:56 +00:00
Amit Mahajan
91fb480efa Fix ApnEditor UI -- specifically protocol and roamingProtocol summary 
Summary was being overwritten with the value for these fields.

Bug: 28962919
Change-Id: I563213b10253b1c519c31762186c922368d38ef9
 2016-05-25 20:26:13 +00:00
Sudheer Shanka
1fa37f3bb3 Guard against IllegalArgumentException 
Bug: 28742227
Change-Id: If436ec3f743ca11ea40dce2033b7b993cb6ad170
 2016-05-25 13:17:12 -07:00