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
Bill Yi
797928a672
Import translations. DO NOT MERGE
...
Change-Id: I1781c1d2edab8e31a79e9bced54f6749dcd9c59d
Auto-generated-cl: translation import
2016-05-23 05:48:27 -07:00
Victor Chang
262b817ee5
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
...
am: 87d713cf7c
2016-05-23 12:11:11 +00:00
Victor Chang
3e28393c06
Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev am: b0054ec4e2 am: e8df0892d4
...
am: 937b468fb2
2016-05-23 12:09:38 +00: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
Victor Chang
4d43e9a764
Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev
...
am: b0054ec4e2
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
2016-05-23 11:58:58 +00:00
Victor Chang
b0054ec4e2
Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev
2016-05-23 11:51:54 +00:00
Baligh Uddin
5cc864c555
Import translations. DO NOT MERGE am: ffe930ec76 -s ours am: 21b7e430e0 -s ours
...
am: 6e9d64ba33
2016-05-22 23:26:03 +00:00
Baligh Uddin
9c26b8a9f2
Import translations. DO NOT MERGE am: ffe930ec76 -s ours am: e973bb7182 -s ours
...
am: 6744d9977e
2016-05-22 23:26:02 +00:00
Baligh Uddin
6e9d64ba33
Import translations. DO NOT MERGE am: ffe930ec76 -s ours
...
am: 21b7e430e0
2016-05-22 23:23:11 +00:00
Baligh Uddin
6744d9977e
Import translations. DO NOT MERGE am: ffe930ec76 -s ours
...
am: e973bb7182
2016-05-22 23:22:48 +00:00
Baligh Uddin
e973bb7182
Import translations. DO NOT MERGE
...
am: ffe930ec76
2016-05-22 23:20:36 +00:00
Baligh Uddin
21b7e430e0
Import translations. DO NOT MERGE
...
am: ffe930ec76
2016-05-22 23:20:05 +00:00
Baligh Uddin
ffe930ec76
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 28857042
Change-Id: I2ef0467d8a959436073642564afcb8fd25d3d09e
2016-05-21 13:10:17 -07:00
Maurice Lam
c1f787d032
Add skip button to fingerprint settings
...
The landscape layout was missing the fingerprint button
Bug: 28810925
Change-Id: Ic47242abdac61985f86cc4837f1c25801ee1248c
2016-05-20 19:03:25 -07:00
Daniel Nishi
5af567eca7
Materialize the button bar in the Deletion Helper.
...
Older Android style buttons were used for the bottom button bar.
By changing them to use the buttonBarBottomStyle, they are updated
to flat buttons. The bottom button bar for settings preference
fragments now more closely tracks the Material Design spec as seen
here in [0].
The other Settings views which use the button bar buttons are the
Redaction settings and WiFi network picker in some contexts. These
should be unaffected as they are based on the SettingsActivity,
rather than the SettingsFragment, and inflate a different view.
[0] https://material-design.storage.googleapis.com/publish/material_v_8/material_ext_publish/0B7WCemMG6e0VaDdZWXpLXzNicjg/components_buttons_usage6.png
Bug: 28845586
Change-Id: I9ea55aa2fe1e76f8f952880675501cbb0f76719d
2016-05-20 16:34:59 -07:00
Felipe Leme
b8c2af0185
Merge "Defined help page for Data Saver." into nyc-dev am: f8265a8f1e am: ec218b75ac
...
am: 0316e470d1
2016-05-20 22:11:13 +00:00
Felipe Leme
6af9e6a8b4
Merge "Defined help page for Data Saver." into nyc-dev am: f8265a8f1e am: d21e63fe4b
...
am: 1d6d3723ba
2016-05-20 22:11:01 +00:00
Felipe Leme
0316e470d1
Merge "Defined help page for Data Saver." into nyc-dev am: f8265a8f1e
...
am: ec218b75ac
2016-05-20 22:09:27 +00:00
Felipe Leme
1d6d3723ba
Merge "Defined help page for Data Saver." into nyc-dev am: f8265a8f1e
...
am: d21e63fe4b
2016-05-20 22:08:22 +00:00
Felipe Leme
d21e63fe4b
Merge "Defined help page for Data Saver." into nyc-dev
...
am: f8265a8f1e
2016-05-20 22:06:06 +00:00
Adrian Roos
78091bf8ca
Remove option to configure emergency app
...
Bug: 28873644
Change-Id: Iddf4e781af8cb3ca3b62d1141c58402933bd8ec8
2016-05-20 14:36:24 -07:00
Felipe Leme
ec218b75ac
Merge "Defined help page for Data Saver." into nyc-dev
...
am: f8265a8f1e
2016-05-20 21:33:30 +00:00
Felipe Leme
f8265a8f1e
Merge "Defined help page for Data Saver." into nyc-dev
2016-05-20 21:27:57 +00:00
Felipe Leme
746b384700
Fixed whitelist stats so it's only logged on add.
...
BUG: 28166693
Change-Id: If1f91167c21054e78a966670c20c174c3f73d2a5
2016-05-20 14:13:22 -07:00
Daniel Nishi
1320de307c
Fix a crash where the deletion helper crashes when app sizes load.
...
This was caused by a change I made to the extraInfo on the app.
The extra info used to be a long which was the last usage time.
I changed it to a UsageStatsState and missed this usage of it.
The attempted cast to long caused a crash.
Bug: 28885317
Change-Id: Ie0d6bcea5d0afccd2762acd19d628c742c7e3db9
2016-05-20 14:11:27 -07:00
Jason Monk
f19dddb288
Merge "Merge "Protect against monkey crash" into nyc-dev am: d3ce331b94 am: 00e73e75d5" into nyc-mr1-dev-plus-aosp
...
am: 0f8347312f
2016-05-20 18:32:34 +00:00
Jason Monk
d814e2886d
Merge "Protect against monkey crash" into nyc-dev am: d3ce331b94 am: cb0e0f9e30
...
am: 0d9fe2a14b
2016-05-20 18:32:33 +00:00
Android Build Merger (Role)
0f8347312f
Merge "Merge "Protect against monkey crash" into nyc-dev am: d3ce331b94 am: 00e73e75d5" into nyc-mr1-dev-plus-aosp
2016-05-20 18:28:32 +00:00
Jason Monk
39573c7cf2
Merge "Protect against monkey crash" into nyc-dev am: d3ce331b94
...
am: 00e73e75d5
2016-05-20 18:28:19 +00:00
Jason Monk
0d9fe2a14b
Merge "Protect against monkey crash" into nyc-dev am: d3ce331b94
...
am: cb0e0f9e30
2016-05-20 18:28:18 +00:00
Jason Monk
cb0e0f9e30
Merge "Protect against monkey crash" into nyc-dev
...
am: d3ce331b94
2016-05-20 18:24:36 +00:00
Jason Monk
00e73e75d5
Merge "Protect against monkey crash" into nyc-dev
...
am: d3ce331b94
2016-05-20 18:24:35 +00:00
Jason Monk
d3ce331b94
Merge "Protect against monkey crash" into nyc-dev
2016-05-20 18:21:08 +00:00
Jason Monk
fd41b42487
Protect against monkey crash
...
When rebuild comes in after context is no longer valid
Change-Id: Ib64e93372bff4c6b0e1232ac257f3df0e9d0be0a
Fixes: 28875397
2016-05-20 14:15:10 -04:00
Victor Chang
5e0a46bff6
Fix Continous loop in unifed screenlock when trying to Trust a CA cert
...
Cause: with unified screenlock, ConfirmDeviceCredentialActivity didn't
forward result with FLAG_ACTIVITY_FORWARD_RESULT
Also, fixed that ConfirmDeviceCredentialActivity didn't allow fingerprint
authenication in unified screenlock after keystore unlocked.
In ChooseLockSettingsHelper, add one new util function to allow
extra option to set returnCredentials to false while external to true.
Set StrongAuth to "not required" when it has been successfully unlocked.
Test:
1. PO Unified Screenlock/Work Challenge x fingerprint -> ok to trust cert
(Also, no credential is returned in intent)
2. WorkMode off -> Reboot -> turn on Work mode
-> no fingerprint option, PIN unlock successful to turn work mode on
Bug: 28752364
Change-Id: I6dc8865e8f005545f8577d7731afb4495647062b
2016-05-20 19:10:33 +01:00
Victor Chang
4a38f28c19
Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev am: 99a88eca78 am: 2c04e72414
...
am: e8653d4dd2
2016-05-20 17:48:35 +00:00
Victor Chang
9b94f36138
Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev am: 99a88eca78 am: 4e47a17a62
...
am: a92877f63c
2016-05-20 17:48:34 +00:00
Victor Chang
e8653d4dd2
Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev am: 99a88eca78
...
am: 2c04e72414
2016-05-20 17:41:22 +00:00
Victor Chang
a92877f63c
Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev am: 99a88eca78
...
am: 4e47a17a62
2016-05-20 17:39:57 +00:00
Victor Chang
4e47a17a62
Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev
...
am: 99a88eca78
2016-05-20 17:34:08 +00:00
Victor Chang
2c04e72414
Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev
...
am: 99a88eca78
2016-05-20 17:30:38 +00:00
Victor Chang
99a88eca78
Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev
2016-05-20 17:19:42 +00:00
Victor Chang
00859bd548
Temp fix for NPE when race condition happens in TrustedCredentialsSettings
...
Bug: 28762124
Change-Id: I21e46c2008e106db1c43573171e0d852cbe0a68a
2016-05-20 17:19:29 +00:00
Felipe Leme
cf2c0b1b97
Defined help page for Data Saver.
...
BUG: 28865521
Change-Id: I07930232312df2775ecee5beacee6921f7245847
2016-05-20 09:08:28 -07:00
