Udam Saini
02ef5603b3
Merge "Fixes stack overflow on some settings preferences" into nyc-dev
2016-02-11 00:36:13 +00:00
Udam Saini
6a8b99dabe
Fixes stack overflow on some settings preferences
...
bug:27130222
Change-Id: If273720591ca9a4d10143b36b63eb839e4fa0a4a
2016-02-10 16:35:15 -08:00
Maurice Lam
a95e7c3c09
Use SetupWizardPreferenceLayout
...
Update SetupChooseLockGeneric to use SetupWizardPreferenceLayout,
which is a layout designed to be used with Preference v14.
Change-Id: I31f372b5f70382a9f6502c790cb8981277a8d5e1
2016-02-11 00:25:07 +00:00
Makoto Onuki
a31c72511a
Use DPM.uninstallPackageWithActiveAdmins()
...
... so that uninstall won't fail even if the package has
other active admins.
It's pretty much an edge case, so we don't show the
deactivation confirmation in this case.
Bug 27107878
Change-Id: I7e8b0843ac6e39e3db3bfc643eed6940e8577417
2016-02-10 16:23:43 -08:00
Makoto Onuki
13db86430b
Device Admin activation screen: Show buttons vertically.
...
am: dd3e761aa1
2016-02-11 00:14:03 +00:00
Makoto Onuki
dd3e761aa1
Device Admin activation screen: Show buttons vertically.
...
Bug 25392386
Change-Id: Ie7e7ff107af3c307d99818b4c9a5e1b95fa329f2
2016-02-10 16:09:16 -08:00
Suprabh Shukla
c94f2fa6b3
Merge "Adding an easy uninstall for active device admin" into nyc-dev am: eee6c2c8b7
...
am: 8388a272a6
2016-02-10 23:28:00 +00:00
Suprabh Shukla
8388a272a6
Merge "Adding an easy uninstall for active device admin" into nyc-dev
...
am: eee6c2c8b7
2016-02-10 23:14:10 +00:00
Suprabh Shukla
eee6c2c8b7
Merge "Adding an easy uninstall for active device admin" into nyc-dev
2016-02-10 22:58:30 +00:00
Suprabh Shukla
02a06eff42
Adding an easy uninstall for active device admin
...
Currently the uninstall button is disabled for a package
with an active device admin. This change enables the button,
which when clicked gives the user an option to deactivate
all the DAs in the package and then uninstall the package.
Bug: b/22359208
cherry pick of I8b955305927751185a4c982dadb5b1b6b07efe5e
Change-Id: Ib2ab0e35b74fc8dba7168174b2bc8fd383fe94fe
2016-02-10 14:32:13 -08:00
Mihai Nita
7b1ce1e7e0
UX fixes for the language draggable cell am: 7f78a4b723
...
am: dc7d254f76
2016-02-10 21:54:23 +00:00
Mihai Nita
dc7d254f76
UX fixes for the language draggable cell
...
am: 7f78a4b723
2016-02-10 21:50:50 +00:00
Udam Saini
b6efc89a02
Merge "Fixes showing learn more screen from fingerprint intro page" into nyc-dev am: 4b796fa7d8
...
am: 3e64c83eef
2016-02-10 21:47:08 +00:00
mariagpuyol
10fa9e15c0
Modify emergency info subtitle am: 1c9b3d5b5f
...
am: 262e6f8519
2016-02-10 21:46:59 +00:00
Mihai Nita
7f78a4b723
UX fixes for the language draggable cell
...
This should bring things closer to the recommended UX guidelines.
It changes the way the checkbox / label play together,
and changes the "localization missing" warning icon to a string.
Also some cleanup of hard-coded styles and sizes.
Bug: 26758865
Bug: 26707846
Change-Id: I07a78a1e4a41122b91e895e363a217d3e9cacd40
2016-02-10 21:46:13 +00:00
Udam Saini
3e64c83eef
Merge "Fixes showing learn more screen from fingerprint intro page" into nyc-dev
...
am: 4b796fa7d8
2016-02-10 21:43:07 +00:00
mariagpuyol
262e6f8519
Modify emergency info subtitle
...
am: 1c9b3d5b5f
2016-02-10 21:42:58 +00:00
Udam Saini
4b796fa7d8
Merge "Fixes showing learn more screen from fingerprint intro page" into nyc-dev
2016-02-10 21:36:55 +00:00
Sudheer Shanka
28eab080ca
Disable clear credential option when disallowed by admin.
...
Bug: 27119114
Change-Id: I0f60880b125149cd1a9aa5f4e9a5340f49042367
2016-02-10 21:35:54 +00:00
mariagpuyol
1c9b3d5b5f
Modify emergency info subtitle
...
Change-Id: Iaa2ba23a1c0a74552e0f9b71d1e45711126a711c
2016-02-10 13:24:38 -08:00
Udam Saini
f21335c6f0
Fixes showing learn more screen from fingerprint intro page
...
bug:27063484
Change-Id: I2413ddff4953dc171aabbb0e9a6beb2f8d04552f
2016-02-10 12:04:50 -08:00
Anna Galusza
b44480912f
Merge "Change style of Preview screens (dark borders with "preview" on the bottom)." into nyc-dev am: 335a958b57
...
am: bfdee58b89
2016-02-10 18:14:19 +00:00
Jason Monk
22c9ed48d9
Merge "Fix activity weirdness by doing the right thing" into nyc-dev am: db26d19302
...
am: 24f6a0eebc
2016-02-10 18:14:08 +00:00
Udam Saini
b246c6141d
Merge "Reworks lock screen flows." into nyc-dev am: 779fdcca29
...
am: ab242afe1e
2016-02-10 18:13:58 +00:00
Anna Galusza
bfdee58b89
Merge "Change style of Preview screens (dark borders with "preview" on the bottom)." into nyc-dev
...
am: 335a958b57
2016-02-10 18:07:06 +00:00
Jason Monk
24f6a0eebc
Merge "Fix activity weirdness by doing the right thing" into nyc-dev
...
am: db26d19302
2016-02-10 18:06:56 +00:00
Udam Saini
ab242afe1e
Merge "Reworks lock screen flows." into nyc-dev
...
am: 779fdcca29
2016-02-10 18:06:47 +00:00
Anna Galusza
335a958b57
Merge "Change style of Preview screens (dark borders with "preview" on the bottom)." into nyc-dev
2016-02-10 17:59:08 +00:00
Jason Monk
db26d19302
Merge "Fix activity weirdness by doing the right thing" into nyc-dev
2016-02-10 17:57:28 +00:00
Jason Monk
30e9fc870f
Fix activity weirdness by doing the right thing
...
Bug: 27091837
Change-Id: I983bcae15871b184e670a6baa819263e0ad58973
2016-02-10 12:55:37 -05:00
Udam Saini
779fdcca29
Merge "Reworks lock screen flows." into nyc-dev
2016-02-10 17:54:58 +00:00
Geoff Mendal
30b464daaf
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 51d56dc14e -s ours
...
am: 94e5168daf
2016-02-10 16:48:47 +00:00
Geoff Mendal
94e5168daf
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 51d56dc14e
2016-02-10 16:46:05 +00:00
Geoff Mendal
51d56dc14e
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-02-10 16:43:32 +00:00
Geoff Mendal
f87d8c85c4
Import translations. DO NOT MERGE am: a27cd9d033 -s ours am: 029c196bf6 -s ours
...
am: 963ed1b38d
2016-02-10 15:50:08 +00:00
Geoff Mendal
e42e2fe251
Import translations. DO NOT MERGE
...
Change-Id: I0cab1d68ca64567f0755574a37c2f1e52c45abca
Auto-generated-cl: translation import
2016-02-10 07:48:36 -08:00
Geoff Mendal
963ed1b38d
Import translations. DO NOT MERGE am: a27cd9d033 -s ours
...
am: 029c196bf6
2016-02-10 15:47:06 +00:00
Geoff Mendal
029c196bf6
Import translations. DO NOT MERGE
...
am: a27cd9d033
2016-02-10 15:43:33 +00:00
Geoff Mendal
a27cd9d033
Import translations. DO NOT MERGE
...
Change-Id: I2c4a21fdb89a240803d39cc929c34ea89686ff4f
Auto-generated-cl: translation import
2016-02-10 07:23:28 -08:00
Geoff Mendal
f53a6c90f3
Import translations. DO NOT MERGE
...
Change-Id: I4879140c3fa74a518309d9f48d3b8ca29411d9f8
Auto-generated-cl: translation import
2016-02-10 06:33:10 -08:00
Jeremy Klein
5d7d3f0f9f
Merge "Remove PM query for silent provisioning BroadcastReceiver." into nyc-dev am: d119f50314
...
am: 99888fe540
2016-02-10 09:09:57 +00:00
Andre Eisenbach
8c32a90e9c
Add Developer menu entry to disable Bluetooth absolute volume am: 591c6c4f5a
...
am: 42aeccb95e
2016-02-10 09:09:47 +00:00
Jeremy Klein
99888fe540
Merge "Remove PM query for silent provisioning BroadcastReceiver." into nyc-dev
...
am: d119f50314
2016-02-10 02:41:12 +00:00
Jeremy Klein
d119f50314
Merge "Remove PM query for silent provisioning BroadcastReceiver." into nyc-dev
2016-02-10 02:40:05 +00:00
Andre Eisenbach
42aeccb95e
Add Developer menu entry to disable Bluetooth absolute volume
...
am: 591c6c4f5a
2016-02-10 02:13:20 +00:00
Andre Eisenbach
591c6c4f5a
Add Developer menu entry to disable Bluetooth absolute volume
...
NOTE: Original CL updated: Developer-related settings in
res/values/strings.xml are now in SettingsLib .
Bug: 27078729
Change-Id: I8a029baeb25b449446ae9bcc8cb220d5ec8e44a9
2016-02-10 01:54:55 +00:00
Andre Eisenbach
9205df540a
Merge "Add Developer menu entry to disable Bluetooth absolute volume" am: 6979c8bbe3 -s ours
...
am: 37561b0e3c
2016-02-10 00:08:51 +00:00
Jim Miller
ff6f9c1b92
Fix crash in Settings on devices without fingerprint. am: 017bdceeb4
...
am: 6f5c588e5b
2016-02-09 23:59:42 +00:00
Andre Eisenbach
37561b0e3c
Merge "Add Developer menu entry to disable Bluetooth absolute volume"
...
am: 6979c8bbe3
2016-02-09 23:55:04 +00:00
Jim Miller
6f5c588e5b
Fix crash in Settings on devices without fingerprint.
...
am: 017bdceeb4
2016-02-09 23:39:55 +00:00
