Commit Graph

24545 Commits

Author SHA1 Message Date
Hyejin Kim
00bc7567b8 Add IMS settings to Network setting reset am: 623852f6c7
am: c46bbd6373

* commit 'c46bbd637345e7dcfd637b1ba76896890e13bf5a':
  Add IMS settings to Network setting reset
2015-12-06 18:42:11 +00:00
Hyejin Kim
c46bbd6373 Add IMS settings to Network setting reset
am: 623852f6c7

* commit '623852f6c772b7685abade493b304da1f71b4c00':
  Add IMS settings to Network setting reset
2015-12-06 18:37:50 +00:00
Julia Reynolds
5dfbc9e5bb Merge "Allow users to set notification topic importance." 2015-12-04 20:38:53 +00:00
Julia Reynolds
9dbb20f638 Allow users to set notification topic importance.
In the absence of mocks, the silder is shown in the
'normal' position if the user hasn't yet
chosen an importance value.

Bug: 22854014
Change-Id: I51594959412775fe89b29af66ddcb13bafa67255
2015-12-04 15:29:12 -05:00
Tony Mantler
4ce7e044de Merge "Move strings to SettingsLib" 2015-12-04 19:38:30 +00:00
Tony Mantler
291b5c32db Move strings to SettingsLib
Change-Id: Idb37792d9ec969b9143b24a7cb86b21ba9d561b2
2015-12-04 11:24:14 -08:00
Nathan Harold
71e1026b48 Merge "Enhancement+Cleanup of RadioInfo Test Menu" 2015-12-04 19:20:25 +00:00
Jason Monk
d6a49e2360 Merge "Create configure Wi-Fi screen" 2015-12-04 18:17:25 +00:00
Nathan Harold
cea413a9bb Enhancement+Cleanup of RadioInfo Test Menu
-Re-format CellInfo to a Table
-Improve performance on several blocking calls
-Add IPv6 ping test
-Re-order layout to improve logical grouping
-Semantic changes/cosmetic improvements to a few strings
-Expand list of selectable network types to include recent RATs

Change-Id: I02d15987e7cb79fe0bbd13e5d1eb734e3531f11f
2015-12-04 10:06:56 -08:00
Jason Monk
0b4fdc49fb Create configure Wi-Fi screen
Add a gear on Settings menu, and move a bunch of stuff from
overflow and advanced screen to there.  Also move add network
to be the last item in the list rather than in overflow.

Also fix WifiP2p breakage.

Change-Id: I5c84c25e5ba9224f77dcd988b0b2850ae6e71168
2015-12-04 12:57:39 -05:00
Jason Monk
4527405eb8 Remove MAIN_SETTINGS metrics
Change-Id: I77aba7443ce28e13d6f9fe8a620f585f614ef0f3
2015-12-04 10:21:00 -05:00
Svetoslav Ganov
e1481ee90d Merge "[DO NOT MERGE] Modify system settings: incorrect UI state" am: c4321c7e6c -s ours am: 142193550e -s ours
am: 994779c61e  -s ours

* commit '994779c61ef1d6b87aa98ee48c61ecc8410d0295':
  [DO NOT MERGE] Modify system settings: incorrect UI state
2015-12-03 22:52:09 +00:00
Svetoslav Ganov
994779c61e Merge "[DO NOT MERGE] Modify system settings: incorrect UI state" am: c4321c7e6c -s ours
am: 142193550e  -s ours

* commit '142193550e6b9844631d4e34dda42e76424fed83':
  [DO NOT MERGE] Modify system settings: incorrect UI state
2015-12-03 22:48:09 +00:00
Svetoslav Ganov
142193550e Merge "[DO NOT MERGE] Modify system settings: incorrect UI state"
am: c4321c7e6c  -s ours

* commit 'c4321c7e6caa1a3699567f9c39d2bc33bbf39c6b':
  [DO NOT MERGE] Modify system settings: incorrect UI state
2015-12-03 22:45:05 +00:00
Svetoslav Ganov
c4321c7e6c Merge "[DO NOT MERGE] Modify system settings: incorrect UI state" 2015-12-03 22:38:54 +00:00
Svetoslav
28daa67fcb [DO NOT MERGE] 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: I2da4eec1c3574bd6aef9ab968c9deb148536cb0a
2015-12-03 14:36:36 -08:00
Jack Yu
4348604405 Added a new broadcast receiver to handle Brzail channel 50 area info
Moved the area info handler from CellBroadcastReceiver to
CellBroadcastAreaInfoReceiver.

bug: 25628456
Change-Id: I2c7c6bb83245fcb6d9cc7b5dce7496e906160bab
2015-12-03 11:53:26 -08:00
Fyodor Kupolov
0501728c03 Merge "Use the right userId when setting guest restrictions" 2015-12-03 18:16:34 +00:00
Jason Monk
91487434c0 Guard against no payment app
Bug: 25990521
Change-Id: I3307fb197d1a38ff759628bf72f6b7e4afcb8001
2015-12-03 11:08:10 -05:00
Fyodor Kupolov
37d018e54b Use the right userId when setting guest restrictions
Bug: 25977335
Change-Id: I5e58fc2d07d111d084dd33bc1fd5514b9bb6ff10
2015-12-02 18:33:43 -08:00
John Reck
fb2ca7c2e5 Merge "Update for rename" 2015-12-03 00:32:40 +00:00
John Reck
b2b44a4755 Update for rename
Change-Id: I78e468d904a167bc304b11e0f2539770d352f79a
2015-12-02 16:30:30 -08:00
Jason Monk
e44fce2cdd Merge "Work on settings launch speed" 2015-12-02 21:10:44 +00:00
Jason Monk
fd2c722418 Work on settings launch speed
Move some stuff to the background, avoid doing other things.

Change-Id: I145172efa16f81c2f377f07744c8f88145e2ed1d
2015-12-02 16:10:08 -05:00
Julia Reynolds
0fab3131fb Merge "Warn users about rule deletion when revoking DND access." 2015-12-02 20:27:48 +00:00
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