Geoff Mendal
9237cc9e6b
Import translations. DO NOT MERGE am: 2102350ea3 -s ours am: 75dd183bf7 -s ours
...
am: 74e9c3d348
2015-11-20 20:14:39 +00:00
Julia Reynolds
6f526fcaf3
Migrate package level notification settings to topic level.
...
Bug: 22854014
Change-Id: If0c20bec3b3f8b01b86d195d2e7ff7aa1e15882e
2015-11-20 15:09:29 -05:00
Julia Reynolds
67cb3c0b1b
Update char limits.
...
Bug: 25775535
Bug: 25784587
Bug: 25785525
Bug: 25784553
Bug: 25776499
Change-Id: Icfda560f32cfc50bc78ccd548de59606e439db17
2015-11-20 09:39:38 -05:00
Julia Reynolds
a88265ef8a
Merge "Fix crash."
2015-11-20 14:31:44 +00:00
Julia Reynolds
8431477588
Fix crash.
...
Bug: 25809075
Change-Id: I708a21d65943ba23aa40b4b0f3eb6cb3108e1cf4
2015-11-20 09:28:02 -05:00
Jason Monk
09ca30b16f
Fix strings
...
Bug: 25784283
Change-Id: I6ad4c92846b182a81967c4d5a1f83ae8a647a1fa
2015-11-20 08:30:43 -05:00
Andrei Stingaceanu
999014702c
Wire in device owner information into SecuritySettings
...
If the device owner information has been provisioned by device
policy client via the DevicePolicyManager then make the current
user info preference read only and add a summary to specify that
the preference has been disabled by the administrator.
Bug: 22547309
Change-Id: I14952abd2e022607b82ce4361cfa514549243045
2015-11-20 11:55:41 +00:00
Geoff Mendal
c61d62d909
Import translations. DO NOT MERGE am: 2102350ea3 -s ours am: 75dd183bf7 -s ours am: 74e9c3d348 -s ours am: 39be1461a8 -s ours am: bdbd6da522 -s ours
...
am: 058c71f15d
2015-11-20 04:47:34 +00:00
Geoff Mendal
058c71f15d
Import translations. DO NOT MERGE am: 2102350ea3 -s ours am: 75dd183bf7 -s ours am: 74e9c3d348 -s ours am: 39be1461a8 -s ours
...
am: bdbd6da522
2015-11-20 04:44:18 +00:00
Geoff Mendal
bdbd6da522
Import translations. DO NOT MERGE am: 2102350ea3 -s ours am: 75dd183bf7 -s ours am: 74e9c3d348 -s ours
...
am: 39be1461a8
2015-11-20 01:24:46 +00:00
Geoff Mendal
33d226a747
Import translations. DO NOT MERGE am: 2102350ea3 -s ours am: 75dd183bf7 -s ours
...
am: 74e9c3d348
2015-11-20 01:19:51 +00:00
Geoff Mendal
39be1461a8
Import translations. DO NOT MERGE am: 2102350ea3 -s ours am: 75dd183bf7 -s ours
...
am: 74e9c3d348
2015-11-20 01:19:50 +00:00
Geoff Mendal
74e9c3d348
Import translations. DO NOT MERGE am: 2102350ea3 -s ours
...
am: 75dd183bf7
2015-11-20 01:14:23 +00:00
Geoff Mendal
75dd183bf7
Import translations. DO NOT MERGE
...
am: 2102350ea3
2015-11-20 01:09:14 +00:00
Geoff Mendal
2102350ea3
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ic959d8e81d2c9ab397ec7f84d78900631b92346d
2015-11-20 01:02:07 +00:00
Jim Miller
f5a2a7edb9
Merge "Revert "Auto advance fingerprint enrollment when user taps on the sensor""
2015-11-19 22:05:08 +00:00
Jim Miller
c5e286570b
Revert "Auto advance fingerprint enrollment when user taps on the sensor"
...
This reverts commit b3253f1d75
2015-11-19 22:03:28 +00:00
Jeff Sharkey
a180abf6cf
Merge "Mark this coreApp as being encryptionAware."
2015-11-19 18:45:41 +00:00
Jeff Sharkey
3bd73edbae
Mark this coreApp as being encryptionAware.
...
Historically, apps marked with "coreApp" were prepared to run in a
limited boot environment, and were critical to booting the device, so
in the new file-based encryption world we're marking these apps with
both "forceDeviceEncrypted" and "encryptionAware" attributes.
Bug: 22358539
Change-Id: Idf9fb8d4b0cc1cd504c9ab7ed770d2cd86d3d506
2015-11-19 11:11:03 -07:00
Julia Reynolds
a19090a7df
Merge "Remove 'peekable' notification preference."
2015-11-19 13:41:01 +00:00
Maurice Lam
1e1034f89b
Merge "[Fingerprint] Define margins in fingerprint theme"
2015-11-19 02:50:34 +00:00
Maurice Lam
a06abd0a74
[Fingerprint] Define margins in fingerprint theme
...
Bug: 25755499
Change-Id: Ia03b63316516061484a47bcc2fb4f2c29cee28e4
2015-11-18 15:53:34 -08:00
Julia Reynolds
69d0b67ee0
Remove 'peekable' notification preference.
...
Bug: 22854014
Change-Id: I920185cd8c766436338d38a51663bd5480699f5d
2015-11-18 17:05:18 -05:00
Ben Kwa
1c212aa92c
Merge "Rename ACTION_BROWSE_DOCUMENT_ROOT -> ACTION_BROWSE"
2015-11-18 21:15:36 +00:00
Russell Brenner
23e7dd8796
resolve merge conflicts of 549379737d to master.
...
Change-Id: I8a6e83948a1915483567734fa99d903acf7e4754
2015-11-18 10:16:55 -08:00
Jason Monk
1f8bd6f479
Fix settings crashes on larger devices
...
Just remove this code until its updated for the new settings home.
Bug: 25750060
Change-Id: I8132598c4b76ef290d180af3d472686b41cb594c
2015-11-18 12:58:07 -05:00
Russell Brenner
26a2e695d0
[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
...
am: 4868199d28
2015-11-18 17:55:40 +00:00
Ben Kwa
0c851297b4
Rename ACTION_BROWSE_DOCUMENT_ROOT -> ACTION_BROWSE
...
BUG=23137963
Change-Id: I32e995b4421de4c90faa4e80a095c7df2f7aee25
2015-11-18 09:41:38 -08:00
Russell Brenner
ff8a68010e
resolve merge conflicts of 7285e2c2fc to master.
...
Change-Id: I56ebcc0dac917791b19ee308eed30bb51267a817
2015-11-18 09:13:31 -08:00
Tony Mantler
e5f836b010
Merge "Move AnimatedImageView and AuthenticatorHelper to SettingsLib"
2015-11-18 16:47:38 +00:00
Jason Monk
fb8e1f7a7b
Merge "Fix DataUsageSummary formatting"
2015-11-18 15:43:45 +00:00
Jason Monk
27e0f92774
Merge "Summary support for Settings Home"
2015-11-18 15:08:01 +00:00
Geoff Mendal
403638f157
Merge "Import translations. DO NOT MERGE"
2015-11-18 14:17:41 +00:00
Geoff Mendal
d0cf200d7e
Import translations. DO NOT MERGE
...
Change-Id: I537c355f9faa207c77665a2e7ac91ea5583ef813
Auto-generated-cl: translation import
2015-11-18 06:17:01 -08:00
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
