Daniel Nishi
1370f7ed20
Change Downloads to show individual files in the Deletion Helper.
...
The first implementation simply had every file in the Downloads folder
be under a single checkbox. This iteration makes Downloads an
expandable dropdown preference listing every single file individually
for selection to be deleted.
Bug: 28621781
Change-Id: I5169caf718cee4c0fa7f0248bc4c443984766005
2016-05-24 14:26:38 -07:00
Andrew Sapperstein
38972c3809
Merge "Refactor Settings theme colors." into nyc-mr1-dev
...
am: 076731b825
2016-05-24 21:25:50 +00:00
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
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
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
2016-05-24 14:24:13 +00:00
Victor Chang
8cc4630521
Merge "Trust the certificate after unlocking screenlock" into nyc-dev
...
am: 32e17d0862
2016-05-24 14:20:02 +00:00
Victor Chang
8a85828424
Merge "Trust the certificate after unlocking screenlock" into nyc-dev
...
am: 32e17d0862
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
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
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
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
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
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
2016-05-23 15:45:24 +00:00
Bill Yi
cbed4aa0a5
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: aa8fa12600
2016-05-23 15:42:23 +00:00
Bill Yi
08f2eaf5ae
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: dad7b893b2
2016-05-23 15:42:21 +00:00
Bill Yi
5587701c86
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: dad7b893b2
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
2016-05-23 14:28:50 +00:00
Jason Monk
9d16b2ddf3
Merge "Fix the momery leak in DrawOverlayDetails" am: 34646006ce
...
am: 05c4c91a6c
2016-05-23 14:25:55 +00:00
宋凯伦
05c4c91a6c
Merge "Fix the momery leak in DrawOverlayDetails"
...
am: 34646006ce
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
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
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
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
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
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
2016-05-23 12:03:44 +00:00
