Jason Monk
8b886c4649
Fix various crashes
...
Bug: 25894771
Bug: 25905442
Bug: 25747730
Change-Id: I9680d08514589288eadbe2a50a9ef5e03220a0c1
2015-11-30 10:54:56 -05:00
Geoff Mendal
b6cda97235
Import translations. DO NOT MERGE
...
Change-Id: I48b2c13458992c476fabc9a38f652472efc79490
Auto-generated-cl: translation import
2015-11-30 06:19:53 -08:00
Andrei Stingaceanu
1258c4f434
Merge "Wire in device owner information into SecuritySettings"
2015-11-26 11:01:03 +00:00
Philip P. Moltmann
99f0bd4aa6
Change onResume -> onStart in the print settings to update even paused activities.
...
Change-Id: Ie28de2cd3ba02c3f19d11c61b3dbbce5d33ddb5a
2015-11-25 16:13:01 -08:00
Geoff Mendal
0976f3481c
Merge "Import translations. DO NOT MERGE"
2015-11-25 14:21:27 +00:00
Geoff Mendal
7098cbccd9
Import translations. DO NOT MERGE
...
Change-Id: I4b7f86727dfac3ed48e8577f7aa08db7adf525f9
Auto-generated-cl: translation import
2015-11-25 06:14:34 -08:00
Julia Reynolds
4cc3819857
Fix filter indicies.
...
Bug: 25837105
Change-Id: Ic857f4efdb3d25e38be7b8113cc2256127954e48
2015-11-25 08:58:44 -05:00
Sunny Goyal
2672cb0fa2
Merge "Adding the activity icon in wallpaper list"
2015-11-25 03:43:23 +00:00
Makoto Onuki
4cfe39f539
Use explicit APIs to get device owner information
...
Bug 24676413
Change-Id: Id346c2f01658173c9671edcfd34bc33f1b25faa4
2015-11-24 14:55:26 -08:00
Sunny Goyal
bfcf2a9044
Adding the activity icon in wallpaper list
...
Change-Id: Id31e6dfdfd2f214e6686d21f2aeeb68762de5893
2015-11-24 14:11:30 -08:00
Paul Lawrence
278410435a
Store cooldown state through rotation
...
Bug:24361606
Change-Id: Ifc732ce7d157aaa9a21aaedb9e64bca9ae4a56c4
2015-11-24 12:42:09 -08:00
Svetoslav Ganov
03e1bee786
Merge "Modify system settings: incorrect UI state"
2015-11-24 19:32:51 +00:00
Svetoslav
356fb2d10d
Modify system settings: incorrect UI state
...
The privilege for an app to write to the system settings is protected
by an app-op signature permission. App-op permissions are special: if
the app-op is deny/allow we deny/allow write access; if the app-op is
default holding the permission determies write access. The settings
code assumes that CHANGE_NETWORK_STATE is an app op permission
(system|appop) while it is a normal permission which any app gets by
declaring it used in the manifest.
The side effect is that the state of the toggle in the UI for write
system settings will initially be in the wrong state if the app uses
both WRITE_SETTINGS and CHANGE_NETWORK_STATE. However, the code in
the public API an app uses to check write settings access would return
the opposite since it checks the WRITE_SETTINGS permission and its
app op. Hence, if an app requires write settings to start the user
will see in the settings UI it has access but the app will not have
access, so the app would prompt the user to allow write settings.
The non-obvious fix is for the user to toggle the setting off and on
to get the app op in the right state and be able to launch the app.
bug:25843134
Change-Id: I3d726a66c7f9857bc7dbd5946fdbb8f340c6eb4d
2015-11-24 11:31:17 -08:00
Geoff Mendal
590151c2dc
Import translations. DO NOT MERGE
...
Change-Id: I294567a73de50ffdaa7d06af081036752a31c0ad
Auto-generated-cl: translation import
2015-11-23 06:27:17 -08:00
Julia Reynolds
33d590449f
Merge "Migrate package level notification settings to topic level."
2015-11-20 20:31:18 +00:00
Geoff Mendal
df0a005d79
Import translations. DO NOT MERGE am: 2102350ea3 -s ours am: 75dd183bf7 -s ours am: 74e9c3d348 -s ours
...
am: 9237cc9e6b
2015-11-20 20:20:05 +00:00
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
