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
Sanket Padawe
98f11fd1a4
Uncheck checkbox for contact sharing by default for non carkit devices.
...
+ In BT pairing dialog, uncheck checkbox for contact sharing by default
for devices not recognized as carkits at pair time.
Bug: 23607427
Change-Id: I7f1d40d86e713e248d3c225459be4895c4f75d76
(cherry picked from commit dbc47fb262
2015-11-12 23:54:06 +00:00
Sanket Padawe
dbc47fb262
Uncheck checkbox for contact sharing by default for non carkit devices.
...
+ In BT pairing dialog, uncheck checkbox for contact sharing by default
for devices not recognized as carkits at pair time.
Bug: 23607427
Change-Id: I7f1d40d86e713e248d3c225459be4895c4f75d76
2015-11-12 14:55:51 -08:00
Jason Monk
52a302e81b
Support changes in support prefs for DeviceDefault themes
...
Change-Id: Id9c333aed202cca8a8845e6f58af1c252e7e111a
2015-11-12 10:09:10 -05:00
Paul Lawrence
0e1a46cf6c
Make Convert To File Encryption work
...
Actually call to recovery from ConvertToFBE
Adding credential check
Gray out Convert option when converted
Change-Id: Ic98929ff49733d182b529012e58870156f40679a
2015-11-11 15:03:42 -08:00
Jason Monk
7c7eb70dc3
First pass at restyling dashboard
...
Still needs summaries, but the things are in the right place-ish.
Change-Id: I1cbc23da9f56589836b5ebd7e202114e8f323adc
2015-11-11 16:46:15 -05:00
Tony Mantler
4559b5d62f
Move some methods to DeviceInfoUtils in SettingsLib
...
Change-Id: I3d51e4d0d376d03dfe5f9f667d4586f17c07f3e1
2015-11-11 11:24:56 -08:00
Geoff Mendal
85b2d55d36
Import translations. DO NOT MERGE
...
Change-Id: I0cbf2c2c2d0d5415ebcf29044d2fe510cc6cdb43
Auto-generated-cl: translation import
2015-11-11 06:18:16 -08:00
Jason Monk
4309b9552c
Merge "Fix account problems"
2015-11-10 21:20:43 +00:00
Jason Monk
0e23b41144
Fix account problems
...
Set the id to the right value for now to fix the switches.
Make sure we call the super on the PreferenceFragment to set up
the RecyclerView properly.
Bug: 25621599
Change-Id: I7cc1f68a612d04ca1f8d068c272cdc8f85003938
2015-11-10 16:18:45 -05:00
Jason Monk
72575d5be8
Merge "Various small crash fixes and guards"
2015-11-10 20:49:50 +00:00
Jason Monk
2fe90293a1
Various small crash fixes and guards
...
Bug: 25501551
Bug: 25583654
Bug: 25510495
Bug: 23575961
Change-Id: Id0e7f6aacdf763bf95b49d281aa8755afcd2e5ef
2015-11-10 15:43:54 -05:00
Russell Brenner
4836ab6df4
Block developer settings during SUW
...
Block access to development settings by tapping on the build number
in "About phone". Once SUW has completed, taps will be allowed.
Bug: 25290269
Change-Id: I9b2787712237f28fba446abab15a9e1c075d0419
2015-11-10 12:15:48 -08:00
Jason Monk
bc0fd853c3
Merge "Context isn't good enough, actually check for null"
2015-11-10 20:10:26 +00:00
Jason Monk
e764165369
Context isn't good enough, actually check for null
...
Bug: 25606212
Change-Id: Ic765d5a37fa19ecd22bb47694514e6ee0bdb84a5
2015-11-10 15:09:34 -05:00
Jason Monk
bcefeb699d
Merge "Use context instead of activity"
2015-11-10 19:55:49 +00:00
Jason Monk
886978f411
Use context instead of activity
...
Bug: 25606212
Change-Id: I5d7eca547562ab968c5f7a4b91119ee7b1c3bce5
2015-11-10 14:54:18 -05:00
Tony Mantler
25fd4eaf1e
Merge "Move RecentLocationApps to SettingsLib"
2015-11-10 17:48:46 +00:00
Felipe Leme
27fb6c21ee
Merge "Set key when Explore preference is created, otherwise tapping it will cause a NPE. BUG: 25597961"
2015-11-10 00:28:40 +00:00
Felipe Leme
dc4dbbdb49
Set key when Explore preference is created, otherwise tapping it will cause a NPE.
...
BUG: 25597961
Change-Id: I1e2fc8caa961e1054472b46cbeb6aad407a1f91a
2015-11-09 15:52:32 -08:00
Jason Monk
7d6aa790fd
Null check queryIntentServices am: a4c9492b50 am: e27cada8c4 am: e198f7b84f
...
am: 7ee05202ab
2015-11-09 22:45:02 +00:00
Jason Monk
7ee05202ab
Null check queryIntentServices am: a4c9492b50 am: e27cada8c4
...
am: e198f7b84f
2015-11-09 22:40:33 +00:00
Jason Monk
e198f7b84f
Null check queryIntentServices am: a4c9492b50
...
am: e27cada8c4
2015-11-09 22:36:21 +00:00
Jason Monk
e27cada8c4
Null check queryIntentServices
...
am: a4c9492b50
2015-11-09 22:31:51 +00:00
Jason Monk
a4c9492b50
Null check queryIntentServices
...
Bug: 25575738
Change-Id: I006a0e2f47863ac0f5d8ae28c88614481d13e8d3
2015-11-09 16:56:46 -05:00
Philip P. Moltmann
68d6e32b65
Merge "Remove warning message when enabling a serive and enable new services"
2015-11-09 18:38:22 +00:00
Tony Mantler
f313a75e26
Move RecentLocationApps to SettingsLib
...
Change-Id: I696126299e31da3d031778e58e43d298336ccb5f
2015-11-09 10:27:44 -08:00
