Julia Reynolds
151af91715
Merge "Apply DND to visual effects."
2015-11-18 14:10:41 +00:00
Sanket Padawe
26a9545180
Uncheck checkbox for contact sharing by default for non carkit devices. am: 98f11fd1a4 am: 28eca8e8c2 am: 773b8a3c44 am: 60461f3410
...
am: 5df69b5307
2015-11-18 02:03:26 +00:00
Tony Mantler
b280b0a892
Move AnimatedImageView and AuthenticatorHelper to SettingsLib
...
Change-Id: I51d5711b0e626b5e7f83af985d02090480085ac7
2015-11-17 15:13:29 -08:00
Julia Reynolds
5555d26b20
Apply DND to visual effects.
...
Bug: 25423508
Change-Id: I00ace3da8a7fea089f4d0fc3f6161452285abb8e
2015-11-17 17:21:31 -05:00
Russell Brenner
549379737d
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b am: 8e4f6fbc2e am: 5950ff1d69 am: 2b29501039 am: f0d538f08d
...
am: ebc5086d15
2015-11-17 20:40:50 +00:00
Russell Brenner
4868199d28
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1 am: 6967df6421 -s ours am: 439033dd93 am: 38e932dc81 am: 8199c3028c
...
am: bcf3b75f57
2015-11-17 20:40:38 +00:00
Russell Brenner
ebc5086d15
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b am: 8e4f6fbc2e am: 5950ff1d69 am: 2b29501039
...
am: f0d538f08d
2015-11-17 20:32:03 +00:00
Russell Brenner
bcf3b75f57
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1 am: 6967df6421 -s ours am: 439033dd93 am: 38e932dc81
...
am: 8199c3028c
2015-11-17 20:31:54 +00:00
Russell Brenner
f0d538f08d
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b am: 8e4f6fbc2e am: 5950ff1d69
...
am: 2b29501039
2015-11-17 20:23:22 +00:00
Russell Brenner
8199c3028c
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1 am: 6967df6421 -s ours am: 439033dd93
...
am: 38e932dc81
2015-11-17 20:23:06 +00:00
Russell Brenner
2b29501039
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b am: 8e4f6fbc2e
...
am: 5950ff1d69
2015-11-17 20:14:22 +00:00
Russell Brenner
38e932dc81
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1 am: 6967df6421 -s ours
...
am: 439033dd93
2015-11-17 20:14:10 +00:00
Russell Brenner
5950ff1d69
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b
...
am: 8e4f6fbc2e
2015-11-17 20:05:54 +00:00
Russell Brenner
439033dd93
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1
...
am: 6967df6421
2015-11-17 20:05:43 +00:00
Russell Brenner
8e4f6fbc2e
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed
...
am: afe5eada5b
2015-11-17 19:57:00 +00:00
Russell Brenner
6967df6421
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79
...
am: 97759fa8d1
2015-11-17 19:56:48 +00:00
Russell Brenner
afe5eada5b
Merge "Block developer settings during SUW" into lmp-mr1-dev
...
am: 56d630a3ed
2015-11-17 19:53:17 +00:00
Russell Brenner
97759fa8d1
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
...
am: 14bf226c79
2015-11-17 19:51:09 +00:00
Jason Monk
e634ff376e
Fix DataUsageSummary formatting
...
Change-Id: I8b983aad88ddcde88b433def6bc181b8febc2a65
2015-11-17 13:52:47 -05:00
Jason Monk
3069581512
Summary support for Settings Home
...
Also add summaries to a few of the major items.
Change-Id: I17924f14941fe095d819e142cdd21cf4b4e9ffd1
2015-11-17 13:51:45 -05:00
Jason Monk
8d249e839c
Merge "First pass at restyling dashboard"
2015-11-17 14:00:30 +00:00
Russell Brenner
7285e2c2fc
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de am: 2075d98be6 am: 7d44fe6fdb
...
am: 6a7ff3186b
2015-11-17 01:47:46 +00:00
Russell Brenner
6a7ff3186b
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de am: 2075d98be6
...
am: 7d44fe6fdb
2015-11-17 01:37:51 +00:00
Russell Brenner
7d44fe6fdb
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631de
...
am: 2075d98be6
2015-11-17 01:29:12 +00:00
Sanket Padawe
5df69b5307
Uncheck checkbox for contact sharing by default for non carkit devices. am: 98f11fd1a4 am: 28eca8e8c2 am: 773b8a3c44
...
am: 60461f3410
2015-11-17 01:28:09 +00:00
Russell Brenner
2075d98be6
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev
...
am: f0ff1631de
2015-11-17 01:22:41 +00:00
Sanket Padawe
60461f3410
Uncheck checkbox for contact sharing by default for non carkit devices. am: 98f11fd1a4 am: 28eca8e8c2
...
am: 773b8a3c44
2015-11-17 01:22:25 +00:00
Sanket Padawe
773b8a3c44
Uncheck checkbox for contact sharing by default for non carkit devices. am: 98f11fd1a4
...
am: 28eca8e8c2
2015-11-17 01:16:41 +00:00
Russell Brenner
f0ff1631de
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev
2015-11-17 01:14:11 +00:00
Russell Brenner
56d630a3ed
Merge "Block developer settings during SUW" into lmp-mr1-dev
2015-11-17 01:13:55 +00:00
Sanket Padawe
28eca8e8c2
Uncheck checkbox for contact sharing by default for non carkit devices.
...
am: 98f11fd1a4
2015-11-17 01:12:09 +00:00
Tony Mantler
bc07b1ed33
Merge "Move some methods to DeviceInfoUtils in SettingsLib"
2015-11-16 18:12:50 +00:00
Geoff Mendal
807be22c18
Import translations. DO NOT MERGE
...
Change-Id: I79b26fa212b0fcf2c2790304c6069fb28eda2613
Auto-generated-cl: translation import
2015-11-16 06:12:50 -08:00
Geoff Mendal
79c14e4d2d
Import translations. DO NOT MERGE
...
Change-Id: I1aa00c0cc4ab7e28cf53b214fdfd54cf274cf6f8
Auto-generated-cl: translation import
2015-11-14 06:47:32 -08:00
Russell Brenner
14bf226c79
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
...
Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.
Bug: 25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
2015-11-13 18:10:44 +00:00
Russell Brenner
de4fc8eb2a
Preserve FRP lock if wiped during SUW
...
Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.
[resolves merge conflicts with ag/808069]
Bug: 25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
2015-11-13 18:08:51 +00:00
Paul Lawrence
51815bec51
Add comments to convert to fbe strings
...
Bug: 25529490
Bug: 25526749
Change-Id: I66ce3977bf6b1054534932b4748811c3f7444292
2015-11-13 09:28:41 -08:00
Paul Lawrence
44df047c73
Merge "Make Convert To File Encryption work"
2015-11-13 17:25:09 +00:00
Robin Lee
8edd4c1f8d
Merge "VPN settings: grey out policy-restricted menus" am: ee4808d37b am: 905829393d
...
am: 3ed65b90d0
2015-11-13 14:14:09 +00:00
Robin Lee
3ed65b90d0
Merge "VPN settings: grey out policy-restricted menus" am: ee4808d37b
...
am: 905829393d
2015-11-13 14:11:32 +00:00
Robin Lee
905829393d
Merge "VPN settings: grey out policy-restricted menus"
...
am: ee4808d37b
2015-11-13 14:08:52 +00:00
Robin Lee
ee4808d37b
Merge "VPN settings: grey out policy-restricted menus"
2015-11-13 14:07:05 +00:00
Robin Lee
4198607ee2
VPN settings: grey out policy-restricted menus
...
setHasOptionsMenu seems unreliable at stopping onCreateOptoinsMenu from
being called.
Change-Id: Ie86da8e35dddb6e3a0e4678defc55bf5776f6c2f
2015-11-13 14:01:43 +00:00
Philip P. Moltmann
3bc72ec0e0
Merge "Finish adjusting the code of PrintServiceSettingsFrament to the changes made in the layout."
2015-11-13 00:21:09 +00:00
Sanket Padawe
1b4ab5f05f
Uncheck checkbox for contact sharing by default for non carkit devices. am: dbc47fb262 am: 0ad16831ee am: df5b8c5b65
...
am: f20ba4b797
2015-11-13 00:11:59 +00:00
Philip P. Moltmann
86846685a0
Finish adjusting the code of PrintServiceSettingsFrament to the changes made
...
in the layout.
Bug: 25645752
Change-Id: I54401075d4c604850287c7dd101cf4f4b4f21459
2015-11-12 16:11:27 -08:00
Sanket Padawe
f20ba4b797
Uncheck checkbox for contact sharing by default for non carkit devices. am: dbc47fb262 am: 0ad16831ee
...
am: df5b8c5b65
2015-11-13 00:07:06 +00:00
Sanket Padawe
df5b8c5b65
Uncheck checkbox for contact sharing by default for non carkit devices. am: dbc47fb262
...
am: 0ad16831ee
2015-11-13 00:02:30 +00:00
Sanket Padawe
e595ab1a01
Make phone number in Sim Settings read properly in Talk back mode.
...
Bug: 24308980
Change-Id: I384ec4ed8863cf6bdfa6e84ed2d88d9eda4ff42e
2015-11-12 15:59:54 -08:00
Sanket Padawe
0ad16831ee
Uncheck checkbox for contact sharing by default for non carkit devices.
...
am: dbc47fb262
2015-11-12 23:57:48 +00:00
