Julia Reynolds
148ace318d
Warn users about rule deletion when revoking DND access.
...
Bug: 25472361
Change-Id: I5a850891733e213ac76aa67c8cb84dfa6f82b153
2015-12-02 15:22:59 -05:00
Julia Reynolds
b6af7b8b39
Merge "Hide cell broadcast settings link if needed."
2015-12-02 19:25:18 +00:00
Julia Reynolds
1fa2d4d550
Merge "Delete unused file."
2015-12-02 17:13:57 +00:00
Philip P. Moltmann
ada7ac0c9b
Merge "Show status of print job instead of deprecated state reason."
2015-12-02 16:34:56 +00:00
Julia Reynolds
3b7936fb43
Hide cell broadcast settings link if needed.
...
Bug: 25939664
Change-Id: Iccf7d17267aecadff0d18f9fb4f464f3597e4c3e
2015-12-02 11:11:30 -05:00
Julia Reynolds
6c47ea7217
Delete unused file.
...
Change-Id: Ibc39915c44eba7efd4964b4a10c82739f2b3da3d
2015-12-02 11:11:30 -05:00
Svetoslav Ganov
a405e7b79b
Merge "Add optional permission review for legacy apps - settings"
2015-12-02 04:26:00 +00:00
Svet Ganov
c7f02876cd
Add optional permission review for legacy apps - settings
...
Change-Id: I80058d093abf5d131cf7befba2eec5239ff854eb
2015-12-01 19:57:36 -08:00
Lifu Tang
02cde0a24f
Merge "Remembers previous location mode when location off"
2015-12-02 00:06:40 +00:00
Lifu Tang
ee0db4c35b
Remembers previous location mode when location off
...
Multipart CL. Must be submitted together with ag/821599
Bug: 25608291
Change-Id: Ibfa39ba9b844421cd86a5aa4266e4389534f16be
2015-12-01 15:53:27 -08:00
Hyejin Kim
623852f6c7
Add IMS settings to Network setting reset
...
Add the factory reset function to be used to reset IMS settings
BUG=25300757
Change-Id: I78d2e919418b7a0b42f56af3442d7d98afe40d77
2015-12-01 10:59:25 -08:00
Philip P. Moltmann
f793d63282
Show status of print job instead of deprecated state reason.
...
The state reason has been replaced by the more generic status.
Change-Id: I4fd525c77bd35f1f336fbeee7744f18b1444cf9a
2015-12-01 08:54:35 -08:00
Paul Lawrence
302d5e709b
Merge "Store cooldown state through rotation"
2015-12-01 15:13:49 +00:00
Jeff Sharkey
9e9f7d1116
Add fallback encryption-aware home screen.
...
When the home screen selected by the user isn't encryption aware, we
still need to put something on the ActivityStack. For now, let's use
an empty activity that knows how to dismiss itself when the
credential-encrypted storage is unlocked; that's enough for the
system to re-resolve the home intent and find the real home screen.
Also follow method refactoring.
Bug: 22358539
Change-Id: Iebc4ad8d2dd62ada079cab03d5765f7631fd4beb
2015-11-30 17:00:17 -07:00
Jason Monk
aace27d3db
Merge "Make sure the dashboard is up to date"
2015-11-30 20:45:44 +00:00
Jason Monk
8c4ca41d25
Make sure the dashboard is up to date
...
Bug: 25794089
Change-Id: I65eaa8e14b3c998ec122eaa9fc4dbbe3749c568c
2015-11-30 15:43:34 -05:00
Jason Monk
b7df4fa0d3
Merge "Guard against monkey crash."
2015-11-30 20:11:20 +00:00
Jason Monk
73df1a9894
Guard against monkey crash.
...
Bug: 25813437
Change-Id: Id86c775b235ee303dc05c1cf70a407bf5472b17c
2015-11-30 14:50:40 -05:00
Julia Reynolds
25a46dbd5c
Merge "Fix print settings crash."
2015-11-30 19:30:42 +00:00
Julia Reynolds
0c1085e191
Fix print settings crash.
...
Bug: 25889661
Change-Id: I691b913ce0adc06c29c21ad12d979a0d0e3ad8e7
2015-11-30 13:32:30 -05:00
Julia Reynolds
51a41d436e
Merge "Split Sound & notification settings."
2015-11-30 18:00:44 +00:00
Jason Monk
d3de027649
Merge "Add some more summaries for Settings Home"
2015-11-30 16:23:43 +00:00
Julia Reynolds
8c0a423865
Split Sound & notification settings.
...
Bug: 25860852
Change-Id: If88daf6fd50b5abf86fb86f3590361f0118172a1
2015-11-30 11:21:41 -05:00
Jason Monk
5bc79b9b94
Merge "Fix various crashes"
2015-11-30 15:57:47 +00:00
Jason Monk
9d80eeabe7
Add some more summaries for Settings Home
...
Change-Id: Iaca8db6bdce87e667832b5b670e4eb027580b668
2015-11-30 10:57:33 -05:00
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
-s ours
* commit '9237cc9e6b6f2deda63328323f9bdb47b89bd62f':
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
-s ours
* commit '74e9c3d34840c6a33afd7cef4b8fb0e1b73c9a93':
Import translations. DO NOT MERGE
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
-s ours
* commit '058c71f15d6d3d340f68f14296526373815efd9b':
Import translations. DO NOT MERGE
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
-s ours
* commit 'bdbd6da522691b4cd7517e12e725676f2ee08983':
Import translations. DO NOT MERGE
2015-11-20 04:44:18 +00:00