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

27717 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Nishi
97ac5c773d Merge "Update the storage manager settings to match the mocks." into nyc-mr1-dev 2016-05-24 21:18:39 +00:00
TreeHugger Robot
076731b825 Merge "Refactor Settings theme colors." into nyc-mr1-dev 2016-05-24 21:13:24 +00:00
Andrew Sapperstein
8dd11327b6 Refactor Settings theme colors. 
Introduces stock colors (primary_color, primary_dark_color, etc) to allow
overriding the colors via resource overlays.

Creates new colorSecondary attribute and updates switches to use theme
attributes for foreground/background colors rather than hardcoded values.

Some other mild color cleanup to make things more straightforward.

BUG: 28760785
Change-Id: I4deba962357217bdb2e08c08e8f83b9b57a683d4
 2016-05-24 12:49:17 -07:00
Daniel Nishi
11b6563cb6 Merge "Fix a crash where the deletion helper crashes when app sizes load." into nyc-mr1-dev 
am: c05c8617bc

* commit 'c05c8617bc1cb292b67b8c8d40723846914c20fc':
  Fix a crash where the deletion helper crashes when app sizes load.

Change-Id: I0f32008388d8f462df95d1655f43869031be0c20
 2016-05-24 15:45:58 +00:00
Daniel Nishi
c05c8617bc Merge "Fix a crash where the deletion helper crashes when app sizes load." into nyc-mr1-dev 2016-05-24 15:36:22 +00:00
Victor Chang
27ca104ece Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation 
ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED has been abused.
We should not set onfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED
for work challenge and most other cases.

It's temp fix for the rotation bug. Because it's inconsistent the activity is shown
on top of keyguard with/without rotation (or any config change). In long term,
SHOW_WHEN_LOCKED should be set only if it's truly on purpose, and remove
isKeyguardLocked checking.

Bug: 28878075
Change-Id: I19db913f5bcaf2644c8c46c25e9584103d7fee8a
 2016-05-24 15:57:23 +01:00
Android Build Merger (Role)
f1cbf0a3f2 Merge "Merge "Trust the certificate after unlocking screenlock" into nyc-dev am: 32e17d0862 am: 8a85828424" into nyc-mr1-dev-plus-aosp 2016-05-24 14:24:22 +00:00
Victor Chang
0c9117a546 Merge "Trust the certificate after unlocking screenlock" into nyc-dev am: 32e17d0862 
am: 8a85828424

* commit '8a858284242d428e9db69d337a717a48edc88714':
  Trust the certificate after unlocking screenlock

Change-Id: I6ec7b8cc19605ede281c8ed1f80e7647a0edea51
 2016-05-24 14:24:14 +00:00
Victor Chang
19a1107089 Merge "Trust the certificate after unlocking screenlock" into nyc-dev am: 32e17d0862 
am: 8cc4630521

* commit '8cc4630521d649146087fc898c65446064305626':
  Trust the certificate after unlocking screenlock

Change-Id: I120f9d1fac3742af4c1467c68b1fc34c2ffc54f3
 2016-05-24 14:24:13 +00:00
Victor Chang
8cc4630521 Merge "Trust the certificate after unlocking screenlock" into nyc-dev 
am: 32e17d0862

* commit '32e17d08629e745cb21ba381f752ec84d2ed591e':
  Trust the certificate after unlocking screenlock

Change-Id: Id0f6da39fc3af71a85ebde93f854d2752c7422b5
 2016-05-24 14:20:02 +00:00
Victor Chang
8a85828424 Merge "Trust the certificate after unlocking screenlock" into nyc-dev 
am: 32e17d0862

* commit '32e17d08629e745cb21ba381f752ec84d2ed591e':
  Trust the certificate after unlocking screenlock

Change-Id: Ib9e51ab5dac5d0f9a7e938a056cd99a0af4c22de
 2016-05-24 14:20:01 +00:00
Victor Chang
32e17d0862 Merge "Trust the certificate after unlocking screenlock" into nyc-dev 2016-05-24 14:03:29 +00:00
Mahaver Chopra
150dd9cc4f Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev 
am: e6e8c92134

* commit 'e6e8c92134b7a212058d7728007407eb74720625':
  Disallow OEM unlock when DISALLOW_FACTORY_RESET applies

Change-Id: I2389a5518a55fc3131a91fb5a5d8af376d79d936
 2016-05-24 12:31:57 +00:00
Mahaver Chopra
e6e8c92134 Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev 2016-05-24 12:23:20 +00:00
Mahaver Chopra
dcf3d7c185 Disallow OEM unlock when DISALLOW_FACTORY_RESET applies 
Bug: 28339424
Change-Id: I2ccba997fc6c9ccfab802c0f49a9e2115a314552
 2016-05-24 12:04:49 +00:00
Ricky Wai
c0e5070cf2 Use LockPatternUtils.resetKeyStore() to clear keystore 
Bug: 28878708
Change-Id: I6730b6947ea917772809bb045470bdf5e95d86ba
 2016-05-24 11:13:56 +01:00
Maurice Lam
534d856458 Merge "Update margins to match specs" into nyc-mr1-dev 
am: 3b15d6234d

* commit '3b15d6234dc9097869030c1e5e2b26a9b34d1f19':
  Update margins to match specs

Change-Id: Iceacbab85dd0697708ddfad1b95b9faccae11a2d
 2016-05-24 00:54:11 +00:00
Maurice Lam
3b15d6234d Merge "Update margins to match specs" into nyc-mr1-dev 2016-05-24 00:45:15 +00:00
Maurice Lam
b357e4a81a Update margins to match specs 
- Update settings to use GLIF versions for margins and styles
- Removed learn more link from AOSP Fingerprint intro screen because
  it won't have a link to show.

Bug: 28885476
Change-Id: I5d2fd730a1bca2c5da8626da066da3a3f03b4428
 2016-05-23 14:51:22 -07:00
Daniel Nishi
f16b8be7b4 Merge "Materialize the button bar in the Deletion Helper." into nyc-mr1-dev 
am: 64b25588b7

* commit '64b25588b7aa1f377ffb1585c1a9f07c1705b7f0':
  Materialize the button bar in the Deletion Helper.

Change-Id: Iece17635fc4c7a0ffd112381068b39a84bc3daeb
 2016-05-23 20:28:56 +00:00
Daniel Nishi
ba03d2ff21 Update the storage manager settings to match the mocks. 
Bug: 28560570
Change-Id: I0f218da1d23b687e38c52b5a927f7b84645958c7
 2016-05-23 13:27:30 -07:00
Daniel Nishi
64b25588b7 Merge "Materialize the button bar in the Deletion Helper." into nyc-mr1-dev 2016-05-23 20:23:47 +00:00
Victor Chang
45ca906e27 Trust the certificate after unlocking screenlock 
When trust button is clicked, if ConfirmCredential (CC) is shown,
and user successfully unlock CC, trust the cert immediately

Bug: 28752364
Change-Id: Ied4aeda59a668a9dd2bf079a385b1fecd8eabb9e
 2016-05-23 20:11:18 +01:00
Maurice Lam
d39ac69ef1 Merge "Add skip button to fingerprint settings" into nyc-mr1-dev 
am: c2a929f06a

* commit 'c2a929f06ae98346fa1133c50e90888d496bc076':
  Add skip button to fingerprint settings

Change-Id: I0f7e22626ec6652bda5d663943cbf2b5875415a3
 2016-05-23 18:11:52 +00:00
Maurice Lam
c2a929f06a Merge "Add skip button to fingerprint settings" into nyc-mr1-dev 2016-05-23 17:56:02 +00:00
Bill Yi
a3aa83da32 Merge "Import translations. DO NOT MERGE" into nyc-dev am: dad7b893b2 -s ours 
am: 5587701c86  -s ours

* commit '5587701c86be3a78b9b08e3841ca186cbf2acc64':

Change-Id: I5c2fb2801b85c48fb52ae804323bee66f90b78f7
 2016-05-23 15:50:40 +00:00
Bill Yi
f99299b24e Merge "Import translations. DO NOT MERGE" into nyc-dev am: dad7b893b2 -s ours 
am: 08f2eaf5ae  -s ours

* commit '08f2eaf5ae693190d471c4aa58cc1eb3dbebadbb':
  Import translations. DO NOT MERGE

Change-Id: Ia5a070a172e8cde556308b23e35cce42b0c973b5
 2016-05-23 15:45:24 +00:00
Bill Yi
cbed4aa0a5 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: aa8fa12600  -s ours

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

Change-Id: Id38b5f8008eb22608714420fdc78b1f632ee222d
 2016-05-23 15:42:23 +00:00
Bill Yi
08f2eaf5ae Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: dad7b893b2  -s ours

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

Change-Id: I68fb81f437949a3e412f9f0b54c7f99fa32f8f8d
 2016-05-23 15:42:21 +00:00
Bill Yi
5587701c86 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: dad7b893b2  -s ours

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

Change-Id: Id29af55504af4e8cae67098379244cb9ec2e2db9
 2016-05-23 15:42:21 +00:00
TreeHugger Robot
dad7b893b2 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-23 15:35:35 +00:00
TreeHugger Robot
aa8fa12600 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-23 15:34:20 +00:00
宋凯伦
cca2d70b85 Merge "Fix the momery leak in DrawOverlayDetails" am: 34646006ce am: 05c4c91a6c 
am: 9d16b2ddf3

* commit '9d16b2ddf3fb25e619cfd2ed9b643fa728a52e15':
  Fix the momery leak in DrawOverlayDetails

Change-Id: I2bf7b0a1a1bc98956aed0e537b4e1952dab0c435
 2016-05-23 14:28:50 +00:00
Jason Monk
9d16b2ddf3 Merge "Fix the momery leak in DrawOverlayDetails" am: 34646006ce 
am: 05c4c91a6c

* commit '05c4c91a6c6799527eae900973efea49875c97da':
  Fix the momery leak in DrawOverlayDetails

Change-Id: I9971a74e0afa36c275a70b171c101a3058c240eb
 2016-05-23 14:25:55 +00:00
宋凯伦
05c4c91a6c Merge "Fix the momery leak in DrawOverlayDetails" 
am: 34646006ce

* commit '34646006ce2eb98dea2324a12e707bb81c1423de':
  Fix the momery leak in DrawOverlayDetails

Change-Id: I0e4747602388e45fda4ef9ed42981d98ec5772de
 2016-05-23 14:23:08 +00:00
Jason Monk
34646006ce Merge "Fix the momery leak in DrawOverlayDetails" 2016-05-23 14:13:08 +00:00
宋凯伦
4feb4d9a8b Fix the momery leak in DrawOverlayDetails 
https://code.google.com/p/android/issues/detail?id=210852

we need to release the mOverlayBridge in onDestroy, or it will cause Memory Leak issue
Signed-off-by: 宋凯伦 <songkailun@xiaomi.com>

Change-Id: If0113ed72773c366596a2c915ec504c1c68fe3b7
 2016-05-23 14:12:34 +00:00
Android Build Merger (Role)
5fc3c7b089 Merge "Merge "Fixed whitelist stats so it\'s only logged on add." into nyc-dev am: b103f4497d am: 7ffd5a7bc5" into nyc-mr1-dev-plus-aosp 2016-05-23 13:57:21 +00:00
Felipe Leme
3fe0957d62 Merge "Fixed whitelist stats so it\'s only logged on add." into nyc-dev am: b103f4497d 
am: ddc0c42464

* commit 'ddc0c42464b31a1c602006089c3769d9956dcb6f':
  Fixed whitelist stats so it's only logged on add.

Change-Id: I0258e76b41420244589e40e967d218677828db06
 2016-05-23 13:57:07 +00:00
Felipe Leme
08d2f08144 Merge "Fixed whitelist stats so it\'s only logged on add." into nyc-dev am: b103f4497d 
am: 7ffd5a7bc5

* commit '7ffd5a7bc51607fdf304040031dd1d6364f72cb0':
  Fixed whitelist stats so it's only logged on add.

Change-Id: I3fac79fb0fca958dff6b07324b1c3ff57838937a
 2016-05-23 13:57:07 +00:00
Felipe Leme
7ffd5a7bc5 Merge "Fixed whitelist stats so it\'s only logged on add." into nyc-dev 
am: b103f4497d

* commit 'b103f4497d0137fb47ebb51d5d26901300071fce':
  Fixed whitelist stats so it's only logged on add.

Change-Id: I46dcd529ac09bcf6f152f034847cd11a8d4b24f1
 2016-05-23 13:54:17 +00:00
Felipe Leme
ddc0c42464 Merge "Fixed whitelist stats so it\'s only logged on add." into nyc-dev 
am: b103f4497d

* commit 'b103f4497d0137fb47ebb51d5d26901300071fce':
  Fixed whitelist stats so it's only logged on add.

Change-Id: I63e6346d0d3a68037ddafb2a6b725eb41f09dd8e
 2016-05-23 13:54:16 +00:00
Bill Yi
1bc8bb2a70 Import translations. DO NOT MERGE 
Change-Id: Icbe6d3dd29d739afc90790826bee8f0fc2af028e
Auto-generated-cl: translation import
 2016-05-23 06:48:26 -07:00
TreeHugger Robot
b103f4497d Merge "Fixed whitelist stats so it's only logged on add." into nyc-dev 2016-05-23 13:45:55 +00:00
Bill Yi
906224c4dd Import translations. DO NOT MERGE 
Change-Id: I18ff7e3d70d30e76e01214b31c1df2065209f30f
Auto-generated-cl: translation import
 2016-05-23 06:35:00 -07:00
Android Build Merger (Role)
87d713cf7c Merge "Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev am: b0054ec4e2 am: 4d43e9a764" into nyc-mr1-dev-plus-aosp 2016-05-23 12:04:53 +00:00
Victor Chang
918c5c5551 Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev am: b0054ec4e2 
am: 4d43e9a764

* commit '4d43e9a764d3c1d9d6e6c7fb6f36ff3b46bae5a8':
  Fix Continous loop in unifed screenlock when trying to Trust a CA cert

Change-Id: I73a10207712ba0c8ebf0ddbdb3a7b6680539e821
 2016-05-23 12:03:48 +00:00
Victor Chang
937b468fb2 Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev am: b0054ec4e2 
am: e8df0892d4

* commit 'e8df0892d427cd8eec0f43970e1241f8e42bc918':
  Fix Continous loop in unifed screenlock when trying to Trust a CA cert

Change-Id: Iac21f081af2d0cbad3c1174134854cdbcc204ec6
 2016-05-23 12:03:44 +00:00
Victor Chang
4d43e9a764 Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev 
am: b0054ec4e2

* commit 'b0054ec4e2275d8d0444b94c0560374630e077f6':
  Fix Continous loop in unifed screenlock when trying to Trust a CA cert

Change-Id: I01cd2b287d78484c1653476b75b6d300dec0c34d
 2016-05-23 11:59:19 +00:00
Victor Chang
e8df0892d4 Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev 
am: b0054ec4e2

* commit 'b0054ec4e2275d8d0444b94c0560374630e077f6':
  Fix Continous loop in unifed screenlock when trying to Trust a CA cert

Change-Id: If02ac2e8ddb0438e3b96491686fcd57a646d5a1f
 2016-05-23 11:58:58 +00:00