OSDN Git Service
Amit Mahajan [Tue, 15 Dec 2015 23:50:22 +0000 (23:50 +0000)]
Merge "Code cleanup including removing direct references to IMS classes."
Maurice Lam [Tue, 15 Dec 2015 22:20:47 +0000 (22:20 +0000)]
Merge "[ScreenLock] Fix result code handling"
Maurice Lam [Tue, 15 Dec 2015 02:03:54 +0000 (18:03 -0800)]
[ScreenLock] Fix result code handling
Modify the back stack and result code propagation in the screen lock
scenarios.
- EncryptionInterstitial now propagates the result of ChooseLock*
request instead of always returning RESULT_OK.
- ChooseLockGeneric now treats CHOOSE_LOCK_REQUEST and
ENABLE_ENCRYPTION_REQUEST the same (since encryption can be a proxy
for ChooseLock*). This means ChooseLockGeneric will now stay on
back stack when going back from ChooseLock*, just like the case
(indirectly) through EncryptionInterstitial.
Bug:
26177240
Change-Id: Id7f1256dcbff00d552a3e7db60c285f53f1e63e6
Jason Monk [Tue, 15 Dec 2015 18:02:53 +0000 (18:02 +0000)]
Merge "Move DropDownPreference to supportlib"
Jason Monk [Sat, 12 Dec 2015 01:14:43 +0000 (20:14 -0500)]
Move DropDownPreference to supportlib
Change-Id: Ife6799d1136302b805b5191f1a86276c538ca4bf
Alan Viverette [Tue, 15 Dec 2015 15:24:53 +0000 (15:24 +0000)]
Merge "Allow use of comma to separate search keywords, update keywords"
Alan Viverette [Tue, 15 Dec 2015 14:50:44 +0000 (09:50 -0500)]
Allow use of comma to separate search keywords, update keywords
Bug:
26149710
Change-Id: I2d8095bbb007c011d7b3e2fe077115c696f9e39c
Clara Bayarri [Thu, 22 Oct 2015 16:24:43 +0000 (17:24 +0100)]
Fire pending intent from Confirm Credentials flow
Add support in the Confirm Credentials flow to read an Intent extra
and fire it when authentication succeeds.
This is part of the Separate Work Challenge feature.
Change-Id: I52c203735fa9b53fd2f7df971824747eeb930f36
Jim Miller [Tue, 15 Dec 2015 04:08:30 +0000 (04:08 +0000)]
Merge "Fix blank animation in "find the sensor" flow for fingerprint."
Jim Miller [Tue, 15 Dec 2015 04:01:42 +0000 (20:01 -0800)]
Fix blank animation in "find the sensor" flow for fingerprint.
Fixes bug
26194530
Change-Id: I855b6f12a72c7489fae8fba249c55d4626b4a202
Paul Lawrence [Tue, 15 Dec 2015 02:46:39 +0000 (02:46 +0000)]
Merge "Fix no keyboard on N builds"
Paul Lawrence [Mon, 14 Dec 2015 22:42:48 +0000 (14:42 -0800)]
Fix no keyboard on N builds
Bug:
25942488
Bug:
26190615
Change-Id: Ifd588bf7db76f9ea5d6a90854f8e92f86f4c2910
Jim Miller [Fri, 20 Nov 2015 04:37:31 +0000 (20:37 -0800)]
Allow animation movie for "find the sensor" flow
This adds an optional overlay to specify a per-device
movie to illustrate enrolling a fingerprint. To enable,
create a new layout overlay for
fingerprint_enroll_find_sensor_graphic.xml using
FingerprintLocationAnimationVideoView
Fixes bug
22954305
Change-Id: I59294f71617ecf7a9bf09603fc0b068cc5aa8ff9
Jason Monk [Mon, 14 Dec 2015 21:39:45 +0000 (16:39 -0500)]
Fix CustomListPreference click handling
Bug:
26187611
Change-Id: I6293d5577b4f770e2dfe94bae53fa9da0822cefc
Amit Mahajan [Mon, 14 Dec 2015 21:23:29 +0000 (13:23 -0800)]
Code cleanup including removing direct references to IMS classes.
Bug:
25793157
Change-Id: I15f285a03ce65695ac260945993fbd189ba3b5d0
Jason Monk [Sun, 13 Dec 2015 21:19:05 +0000 (16:19 -0500)]
Add dnd conditional
Change-Id: I81eabf274bde05358c60bb63e1ed6d1bd447ce55
Jason Monk [Fri, 11 Dec 2015 21:48:31 +0000 (16:48 -0500)]
Add conditionals to Settings
Also add Airplane Mode and Hotspot conditionals (more to come soon)
Change-Id: I11f206db59f7c715f416fb5852b8f0fcb857a247
Gustav Sennton [Mon, 14 Dec 2015 14:33:55 +0000 (14:33 +0000)]
Merge "Add WebView provider setting to developer settings."
Kenny Guy [Mon, 14 Dec 2015 14:31:37 +0000 (14:31 +0000)]
Merge "Add support for showing the admin disabling settings."
Geoff Mendal [Sun, 13 Dec 2015 21:18:46 +0000 (13:18 -0800)]
Import translations. DO NOT MERGE am:
1cb1ad2c55 -s ours am:
ab3b13d0ed -s ours
am:
6419a4a6e2 -s ours
* commit '
6419a4a6e25dadb3cac04b041dd325510bd0a6d4':
Import translations. DO NOT MERGE
Geoff Mendal [Sun, 13 Dec 2015 21:18:13 +0000 (13:18 -0800)]
Revert "Import translations. DO NOT MERGE" am:
7bafd5ee2f -s ours am:
d2981b099e -s ours
am:
4f86f6274a -s ours
* commit '
4f86f6274aaa8966247000b6c5bf1fb01b6de4d9':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Sun, 13 Dec 2015 21:15:16 +0000 (13:15 -0800)]
Import translations. DO NOT MERGE am:
df57be8aef -s ours am:
bc84451452 -s ours
am:
819e07fbbe -s ours
* commit '
819e07fbbe3c1722d6e612d5c8c03e8ca7afbb33':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 12 Dec 2015 02:07:11 +0000 (18:07 -0800)]
Import translations. DO NOT MERGE am:
1cb1ad2c55 -s ours
am:
ab3b13d0ed -s ours
* commit '
ab3b13d0edce3b89bd5836f8a9446a427b6c6acc':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 12 Dec 2015 02:04:00 +0000 (18:04 -0800)]
Import translations. DO NOT MERGE
am:
1cb1ad2c55 -s ours
* commit '
1cb1ad2c55d1997dd5c31e5aed5062a4d395238f':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 12 Dec 2015 01:58:32 +0000 (17:58 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
26151591
Change-Id: Ie838ac1e234ebb27ad5be9fde95d25173a571e78
Geoff Mendal [Sat, 12 Dec 2015 01:47:41 +0000 (17:47 -0800)]
Revert "Import translations. DO NOT MERGE" am:
7bafd5ee2f -s ours
am:
d2981b099e -s ours
* commit '
d2981b099e15e9f39ed8c69d06860ae74ecb497c':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 12 Dec 2015 01:44:31 +0000 (17:44 -0800)]
Revert "Import translations. DO NOT MERGE"
am:
7bafd5ee2f -s ours
* commit '
7bafd5ee2f2c6fb3c3e3f456e855ab34c06f7c91':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 12 Dec 2015 01:42:00 +0000 (01:42 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
df57be8aef6dd1760e72d7f76490048eeb425a3e.
Change-Id: Ie47ab587c4ea43cdd6fb608b0c5dfe26e534ab93
Geoff Mendal [Sat, 12 Dec 2015 00:36:21 +0000 (16:36 -0800)]
Import translations. DO NOT MERGE am:
df57be8aef -s ours
am:
bc84451452 -s ours
* commit '
bc844514522870bd3e70bba85a11ea824ff59e5b':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 12 Dec 2015 00:30:09 +0000 (16:30 -0800)]
Import translations. DO NOT MERGE
am:
df57be8aef -s ours
* commit '
df57be8aef6dd1760e72d7f76490048eeb425a3e':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 12 Dec 2015 00:05:26 +0000 (16:05 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
26151591
Change-Id: If1d7f9358c3fa2e17826385ea967c09442f08285
Julia Reynolds [Fri, 11 Dec 2015 21:22:00 +0000 (21:22 +0000)]
Merge "Importance shift."
Vasu Nori [Fri, 11 Dec 2015 20:25:01 +0000 (20:25 +0000)]
Merge "When Airplane mode is changed due to Voice Intent, use the system provided ConnectionManager method to do that, instead of changing it directly using Settings.Global.putInt() - because that doesn't case ACTION_AIRPLANE_MODE_CHANGED intent to be broadcast. This breaks Google Search App (GSA) code that relies on the above broadcast to do a variety of things."
Vasu Nori [Fri, 11 Dec 2015 19:56:50 +0000 (11:56 -0800)]
When Airplane mode is changed due to Voice Intent, use the system
provided ConnectionManager method to do that, instead of changing
it directly using Settings.Global.putInt() - because that doesn't
case ACTION_AIRPLANE_MODE_CHANGED intent to be broadcast.
This breaks Google Search App (GSA) code that relies on the above
broadcast to do a variety of things.
Change-Id: I2aa61643ed23b373aa362a59af83427a4548c492
Sudheer Shanka [Mon, 23 Nov 2015 12:07:05 +0000 (12:07 +0000)]
Add support for showing the admin disabling settings.
For settings disabled by user restrictions show
the user a lock icon and allow them to click to
find more info.
Bug:
22543585
Change-Id: Ie8b02ac26f2b22db386a9044f3c6570098f6e14b
Julia Reynolds [Fri, 11 Dec 2015 19:25:41 +0000 (14:25 -0500)]
Importance shift.
Change-Id: If39ee2c4665aa27de4e32b73ecf2d5917f7ed4ca
Jun Mukai [Fri, 11 Dec 2015 18:23:39 +0000 (18:23 +0000)]
Merge "Rephrase the base text for accessibility large pointer icon."
Gustav Sennton [Fri, 30 Oct 2015 18:55:32 +0000 (18:55 +0000)]
Add WebView provider setting to developer settings.
For bug, see crbug.com/546185
Change-Id: Id812b767dc28084f42db9f21949497dc1ef08926
Felipe Leme [Thu, 10 Dec 2015 23:59:00 +0000 (23:59 +0000)]
Merge "Changed "Take Bug Report" action to call 'bugreportplus'."
Jun Mukai [Thu, 10 Dec 2015 23:40:18 +0000 (15:40 -0800)]
Rephrase the base text for accessibility large pointer icon.
L10N team requested that the text might not fit within the
CHAR_LIMIT=35 in some languages. Rather than increasing the limit,
I think it's better to simplify the original text so that
its translations are unlikely to break the limit of chars.
Bug:
26123263
Change-Id: If9b338d2f051c161a71e8b20c9526be2d10e0cc1
Udam Saini [Thu, 10 Dec 2015 22:35:50 +0000 (22:35 +0000)]
Merge "Allows the user to go back to Encryption Screen"
Alan Viverette [Thu, 10 Dec 2015 19:20:59 +0000 (19:20 +0000)]
Merge "Implement Settings UI for Screen zoom preference"
Alan Viverette [Thu, 10 Dec 2015 19:07:51 +0000 (14:07 -0500)]
Implement Settings UI for Screen zoom preference
Also cleans up unnecessary 0s and moves tint to the proper place in
relevant vector drawable XML files.
Preview layout is still WIP pending UX input, but I wanted to get this
CL in place so that we can test/demo the feature ASAP.
Bug:
22450672
Change-Id: Ic3f1500006c763df99fba2d1d16782b89d6fcae1
Udam Saini [Wed, 9 Dec 2015 01:28:19 +0000 (17:28 -0800)]
Allows the user to go back to Encryption Screen
bug:
22907221
Change-Id: I766407f4f130ac618da178e1b6c04029025db8f2
Jason Monk [Thu, 10 Dec 2015 16:43:09 +0000 (11:43 -0500)]
Make DropDownPreference handle summary better
Don't set it directly, instead use ListView %s functionality.
Bug:
26116475
Change-Id: I4bfac1bf795daf1fe060799bc961af45ccf91655
Amit Mahajan [Wed, 9 Dec 2015 23:44:26 +0000 (23:44 +0000)]
Merge "Validate the uri received in ApnEditor."
Jun Mukai [Wed, 9 Dec 2015 21:20:32 +0000 (21:20 +0000)]
Merge "Add a toggle switch for accessibility large pointer icons."
Robin Lee [Wed, 9 Dec 2015 15:20:24 +0000 (15:20 +0000)]
Merge "Refactor VPN settings refresh to reuse preferences"
Felipe Leme [Wed, 9 Dec 2015 00:01:20 +0000 (16:01 -0800)]
Changed "Take Bug Report" action to call 'bugreportplus'.
'bugreportplus' is more user-friendly (it shows a system notification
with the progress, allow user to cancel, etc...), at the cost of
consuming more resources. As such, the "Take Bug Report" UI will be
changed to offer the user a combo with these 2 options, but for now it's
always going to be 'bugreportplus'
BUG:
26034608
Change-Id: Idbb325fe7cd18e487197b2fb79cfc264e9859570
Dianne Hackborn [Tue, 8 Dec 2015 00:36:09 +0000 (16:36 -0800)]
Implement development UI for background check.
Allows you to toggle off full background access for
whatever apps you want.
Change-Id: I8542ecac1449ccd65dc18af3c0ca1fc18443f89c
Robin Lee [Mon, 16 Nov 2015 15:24:36 +0000 (15:24 +0000)]
Refactor VPN settings refresh to reuse preferences
The old way was garbage-heavy. To add to that some changes to the way
PreferenceScreens are redrawn was leading to some artifacts with items
fading in/out every tick.
Bug:
25588385
Change-Id: Idabf7546ab519bf196ad3b8582caa2ec6bf9e084
Zoltan Szatmary-Ban [Tue, 8 Dec 2015 10:24:07 +0000 (10:24 +0000)]
Merge "Add UI to Settings > Location for Managed Profile Location Control"
Hyejin Kim [Mon, 7 Dec 2015 23:48:09 +0000 (23:48 +0000)]
Add IMS settings to Network setting reset am:
623852f6c7 am:
c46bbd6373
am:
00bc7567b8
* commit '
00bc7567b81b05f55d3388817dabfdd1d7b83776':
Add IMS settings to Network setting reset
Jun Mukai [Mon, 23 Nov 2015 18:47:49 +0000 (10:47 -0800)]
Add a toggle switch for accessibility large pointer icons.
Bug:
25778857
Change-Id: I85f23253dda73b315aa8b1a612cb556f843d94db
Zoltan Szatmary-Ban [Thu, 26 Nov 2015 13:42:52 +0000 (13:42 +0000)]
Add UI to Settings > Location for Managed Profile Location Control
This CL adds Managed Profile Location Access control in the form of a switch
preference.
Bug:
22541939
Change-Id: I1a2140c54e7386cda83ef0305f0840e4f8f9a6d1
Geoff Mendal [Mon, 7 Dec 2015 14:42:50 +0000 (14:42 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
642d6f3fd1faafe08a9494b2f2572a4bd19a2b09.
Change-Id: Ia578ba87b1aded4269c9cae9ee2f3800fcd8efed
Geoff Mendal [Mon, 7 Dec 2015 14:18:19 +0000 (06:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: I979d2ea4083e926c09c5f9dcbf1973fc74626c76
Auto-generated-cl: translation import
Hyejin Kim [Sun, 6 Dec 2015 18:42:11 +0000 (18:42 +0000)]
Add IMS settings to Network setting reset am:
623852f6c7
am:
c46bbd6373
* commit '
c46bbd637345e7dcfd637b1ba76896890e13bf5a':
Add IMS settings to Network setting reset
Hyejin Kim [Sun, 6 Dec 2015 18:37:50 +0000 (18:37 +0000)]
Add IMS settings to Network setting reset
am:
623852f6c7
* commit '
623852f6c772b7685abade493b304da1f71b4c00':
Add IMS settings to Network setting reset
Julia Reynolds [Fri, 4 Dec 2015 20:38:53 +0000 (20:38 +0000)]
Merge "Allow users to set notification topic importance."
Julia Reynolds [Mon, 23 Nov 2015 13:58:49 +0000 (08:58 -0500)]
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
Tony Mantler [Fri, 4 Dec 2015 19:38:30 +0000 (19:38 +0000)]
Merge "Move strings to SettingsLib"
Tony Mantler [Fri, 4 Dec 2015 19:24:14 +0000 (11:24 -0800)]
Move strings to SettingsLib
Change-Id: Idb37792d9ec969b9143b24a7cb86b21ba9d561b2
Nathan Harold [Fri, 4 Dec 2015 19:20:25 +0000 (19:20 +0000)]
Merge "Enhancement+Cleanup of RadioInfo Test Menu"
Jason Monk [Fri, 4 Dec 2015 18:17:25 +0000 (18:17 +0000)]
Merge "Create configure Wi-Fi screen"
Nathan Harold [Mon, 23 Nov 2015 23:48:10 +0000 (15:48 -0800)]
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
Jason Monk [Fri, 4 Dec 2015 14:36:36 +0000 (09:36 -0500)]
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
Jason Monk [Fri, 4 Dec 2015 15:21:00 +0000 (10:21 -0500)]
Remove MAIN_SETTINGS metrics
Change-Id: I77aba7443ce28e13d6f9fe8a620f585f614ef0f3
Svetoslav Ganov [Thu, 3 Dec 2015 22:52:09 +0000 (22:52 +0000)]
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
Svetoslav Ganov [Thu, 3 Dec 2015 22:48:09 +0000 (22:48 +0000)]
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
Svetoslav Ganov [Thu, 3 Dec 2015 22:45:05 +0000 (22:45 +0000)]
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
Svetoslav Ganov [Thu, 3 Dec 2015 22:38:54 +0000 (22:38 +0000)]
Merge "[DO NOT MERGE] Modify system settings: incorrect UI state"
Svetoslav [Thu, 3 Dec 2015 22:36:30 +0000 (14:36 -0800)]
[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
Fyodor Kupolov [Thu, 3 Dec 2015 18:16:34 +0000 (18:16 +0000)]
Merge "Use the right userId when setting guest restrictions"
Jason Monk [Thu, 3 Dec 2015 16:08:10 +0000 (11:08 -0500)]
Guard against no payment app
Bug:
25990521
Change-Id: I3307fb197d1a38ff759628bf72f6b7e4afcb8001
Fyodor Kupolov [Thu, 3 Dec 2015 02:33:06 +0000 (18:33 -0800)]
Use the right userId when setting guest restrictions
Bug:
25977335
Change-Id: I5e58fc2d07d111d084dd33bc1fd5514b9bb6ff10
John Reck [Thu, 3 Dec 2015 00:32:40 +0000 (00:32 +0000)]
Merge "Update for rename"
John Reck [Thu, 3 Dec 2015 00:30:30 +0000 (16:30 -0800)]
Update for rename
Change-Id: I78e468d904a167bc304b11e0f2539770d352f79a
Jason Monk [Wed, 2 Dec 2015 21:10:44 +0000 (21:10 +0000)]
Merge "Work on settings launch speed"
Jason Monk [Wed, 2 Dec 2015 20:38:38 +0000 (15:38 -0500)]
Work on settings launch speed
Move some stuff to the background, avoid doing other things.
Change-Id: I145172efa16f81c2f377f07744c8f88145e2ed1d
Julia Reynolds [Wed, 2 Dec 2015 20:27:48 +0000 (20:27 +0000)]
Merge "Warn users about rule deletion when revoking DND access."
Julia Reynolds [Wed, 2 Dec 2015 13:35:49 +0000 (08:35 -0500)]
Warn users about rule deletion when revoking DND access.
Bug:
25472361
Change-Id: I5a850891733e213ac76aa67c8cb84dfa6f82b153
Julia Reynolds [Wed, 2 Dec 2015 19:25:18 +0000 (19:25 +0000)]
Merge "Hide cell broadcast settings link if needed."
Julia Reynolds [Wed, 2 Dec 2015 17:13:57 +0000 (17:13 +0000)]
Merge "Delete unused file."
Philip P. Moltmann [Wed, 2 Dec 2015 16:34:56 +0000 (16:34 +0000)]
Merge "Show status of print job instead of deprecated state reason."
Julia Reynolds [Wed, 2 Dec 2015 14:40:36 +0000 (09:40 -0500)]
Hide cell broadcast settings link if needed.
Bug:
25939664
Change-Id: Iccf7d17267aecadff0d18f9fb4f464f3597e4c3e
Julia Reynolds [Wed, 2 Dec 2015 16:10:14 +0000 (11:10 -0500)]
Delete unused file.
Change-Id: Ibc39915c44eba7efd4964b4a10c82739f2b3da3d
Svetoslav Ganov [Wed, 2 Dec 2015 04:26:00 +0000 (04:26 +0000)]
Merge "Add optional permission review for legacy apps - settings"
Svet Ganov [Wed, 2 Dec 2015 03:57:33 +0000 (19:57 -0800)]
Add optional permission review for legacy apps - settings
Change-Id: I80058d093abf5d131cf7befba2eec5239ff854eb
Lifu Tang [Wed, 2 Dec 2015 00:06:40 +0000 (00:06 +0000)]
Merge "Remembers previous location mode when location off"
Lifu Tang [Thu, 26 Nov 2015 05:44:17 +0000 (21:44 -0800)]
Remembers previous location mode when location off
Multipart CL. Must be submitted together with ag/821599
Bug:
25608291
Change-Id: Ibfa39ba9b844421cd86a5aa4266e4389534f16be
Hyejin Kim [Thu, 5 Nov 2015 03:35:39 +0000 (12:35 +0900)]
Add IMS settings to Network setting reset
Add the factory reset function to be used to reset IMS settings
BUG=
25300757
Change-Id: I78d2e919418b7a0b42f56af3442d7d98afe40d77
Philip P. Moltmann [Mon, 30 Nov 2015 21:21:11 +0000 (13:21 -0800)]
Show status of print job instead of deprecated state reason.
The state reason has been replaced by the more generic status.
Change-Id: I4fd525c77bd35f1f336fbeee7744f18b1444cf9a
Paul Lawrence [Tue, 1 Dec 2015 15:13:49 +0000 (15:13 +0000)]
Merge "Store cooldown state through rotation"
Jeff Sharkey [Mon, 30 Nov 2015 20:28:19 +0000 (13:28 -0700)]
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
Jason Monk [Mon, 30 Nov 2015 20:45:44 +0000 (20:45 +0000)]
Merge "Make sure the dashboard is up to date"
Jason Monk [Mon, 30 Nov 2015 20:37:31 +0000 (15:37 -0500)]
Make sure the dashboard is up to date
Bug:
25794089
Change-Id: I65eaa8e14b3c998ec122eaa9fc4dbbe3749c568c
Jason Monk [Mon, 30 Nov 2015 20:11:20 +0000 (20:11 +0000)]
Merge "Guard against monkey crash."
Jason Monk [Mon, 30 Nov 2015 19:50:40 +0000 (14:50 -0500)]
Guard against monkey crash.
Bug:
25813437
Change-Id: Id86c775b235ee303dc05c1cf70a407bf5472b17c
Julia Reynolds [Mon, 30 Nov 2015 19:30:42 +0000 (19:30 +0000)]
Merge "Fix print settings crash."