OSDN Git Service
Dieter Hsu [Fri, 30 Mar 2018 07:56:01 +0000 (07:56 +0000)]
Support AOD in the Universal Settings API
am:
beb89c3545
Change-Id: Ia651c8ffa20b47671d1eb772bfc09d4a4137bb5d
Dieter Hsu [Wed, 21 Mar 2018 10:47:43 +0000 (18:47 +0800)]
Support AOD in the Universal Settings API
Bug:
67997452
Test: make -j RunSettingsRoboTests
Change-Id: I609ac74f70bf040bd9033f421b4bb7c02bf33440
Julia Reynolds [Fri, 30 Mar 2018 04:11:03 +0000 (04:11 +0000)]
Merge "Update channel DND setting" into pi-dev
am:
e06a4abb5c
Change-Id: If31bb46ded7c9130dcd2d9df988d2163e054e0fe
TreeHugger Robot [Fri, 30 Mar 2018 04:03:28 +0000 (04:03 +0000)]
Merge "Update channel DND setting" into pi-dev
Fan Zhang [Fri, 30 Mar 2018 03:28:11 +0000 (03:28 +0000)]
Merge "Remove wrapper for EUICCManager" into pi-dev
am:
2cb0425ded
Change-Id: Ic816024f725d4c32a7b82ae7fbaa2afeaa8b25ef
Fan Zhang [Fri, 30 Mar 2018 03:27:25 +0000 (03:27 +0000)]
Merge "Register most app info related controllers in xml" into pi-dev
am:
4ae4cd5c8d
Change-Id: Ic4dedd363a3dd1ec8ad244d38f9831a0373f7cb2
TreeHugger Robot [Fri, 30 Mar 2018 03:21:37 +0000 (03:21 +0000)]
Merge "Remove wrapper for EUICCManager" into pi-dev
TreeHugger Robot [Fri, 30 Mar 2018 03:17:45 +0000 (03:17 +0000)]
Merge "Register most app info related controllers in xml" into pi-dev
LexHuang [Fri, 30 Mar 2018 02:45:39 +0000 (02:45 +0000)]
Support Screen Rotate in the Universal Settings API
am:
78df73f00a
Change-Id: I0e657faf410974170aa6a282c01135e60c60b62e
LexHuang [Fri, 23 Mar 2018 09:51:54 +0000 (17:51 +0800)]
Support Screen Rotate in the Universal Settings API
Change extend from AbstractPreferenceController to TogglePreferenceControllear
Bug:
67997439
Test: make RunSettingsRoboTests
Change-Id: I86e59d00384fb131f2f2b92186e8536324db2e1b
Doris Ling [Fri, 30 Mar 2018 02:07:07 +0000 (02:07 +0000)]
Merge "Increase touch target for suggestion close button." into pi-dev
am:
d483041078
Change-Id: I89697a7b998f29b79d6dc6288d60fcead5908e72
TreeHugger Robot [Fri, 30 Mar 2018 01:55:54 +0000 (01:55 +0000)]
Merge "Increase touch target for suggestion close button." into pi-dev
Fan Zhang [Thu, 29 Mar 2018 22:45:49 +0000 (15:45 -0700)]
Register most app info related controllers in xml
Bug:
77216595
Test: robotests
Change-Id: I79afa38820b7518d8b3112148802797ebcf6d184
Fan Zhang [Fri, 30 Mar 2018 00:54:21 +0000 (00:54 +0000)]
Merge changes I0fde4f80,Iea1cff48 into pi-dev
am:
0ae4204f54
Change-Id: I9f27d240ff5f4d2dcf0dbde6733730da294e9f4e
Fan Zhang [Fri, 30 Mar 2018 00:52:04 +0000 (17:52 -0700)]
Remove wrapper for EUICCManager
Bug:
76167422
Test: robotests
Change-Id: I2a6687ffab780493fca7b2146cf73cbc7f634081
Fan Zhang [Thu, 29 Mar 2018 23:58:03 +0000 (23:58 +0000)]
Merge "Revert "Support AOD in the Universal Settings API"" into pi-dev
am:
9af6688a92
Change-Id: Ide6383302dd399a3c6eb1e1011fd88315bda948d
Doris Ling [Thu, 29 Mar 2018 21:55:33 +0000 (14:55 -0700)]
Increase touch target for suggestion close button.
- wrap the close button icon view in a bigger layout to increase the
overall touch area.
Fixes:
74220173
Test: manual
Change-Id: I45beadf3cfcc6ed1a8a16e6dcb9b8452e1edd78e
Doris Ling [Thu, 29 Mar 2018 23:52:26 +0000 (23:52 +0000)]
Merge "Fix visibility issue with fingerprint icon." into pi-dev
am:
108c5452b5
Change-Id: I2ef0e88b9599b2749e43dc1808d1e4c718c98adc
TreeHugger Robot [Thu, 29 Mar 2018 23:49:22 +0000 (23:49 +0000)]
Merge changes I0fde4f80,Iea1cff48 into pi-dev
* changes:
Update TimezoneInfoPrefController to register in xml
Make FontSizePreferenceController slice compatible.
Julia Reynolds [Thu, 29 Mar 2018 23:48:17 +0000 (23:48 +0000)]
Merge "Fix 'show badge' for pre O apps" into pi-dev
am:
d31c655a12
Change-Id: Icb08d133cc25653f8429b79d59529f1cce8e93b3
Jerry Zhang [Thu, 29 Mar 2018 23:24:56 +0000 (23:24 +0000)]
Merge "Explicity receive sticky usb intent" into pi-dev
am:
ee283563c8
Change-Id: Idcf6eff8617cd3b088e8d58eee9c68e3bb2333de
TreeHugger Robot [Thu, 29 Mar 2018 23:10:45 +0000 (23:10 +0000)]
Merge "Revert "Support AOD in the Universal Settings API"" into pi-dev
TreeHugger Robot [Thu, 29 Mar 2018 23:07:24 +0000 (23:07 +0000)]
Merge "Fix visibility issue with fingerprint icon." into pi-dev
TreeHugger Robot [Thu, 29 Mar 2018 23:06:26 +0000 (23:06 +0000)]
Merge "Fix 'show badge' for pre O apps" into pi-dev
TreeHugger Robot [Thu, 29 Mar 2018 21:51:55 +0000 (21:51 +0000)]
Merge "Explicity receive sticky usb intent" into pi-dev
Fan Zhang [Thu, 29 Mar 2018 21:29:54 +0000 (14:29 -0700)]
Update TimezoneInfoPrefController to register in xml
Test: robotest
Bug:
77216595
Change-Id: I0fde4f8058a8be156dddb620a756254cd85f6a9f
Julia Reynolds [Thu, 29 Mar 2018 15:16:36 +0000 (11:16 -0400)]
Update channel DND setting
... to reflect DND changes elsewhere in the system. Update the summary
and make the setting always available.
Test: make -j RunSettingsRoboTests
Change-Id: Ia51c349d863e1470e8a043293fa60f22632fa2df
Fixes:
76137346
Julia Reynolds [Thu, 29 Mar 2018 19:54:16 +0000 (15:54 -0400)]
Fix 'show badge' for pre O apps
Test: make -j RunSettingsRoboTests
Change-Id: I20f6b38986afde0ca781329ffc24326601650a1f
Fixes:
69437269
Eran Messeri [Thu, 29 Mar 2018 20:21:20 +0000 (20:21 +0000)]
Merge "Require unlocked work profile to change notification settings" into pi-dev
am:
5506097efd
Change-Id: I94b47ece9dccba04fcda28f7f02e86d19c0de1e1
Fan Zhang [Thu, 29 Mar 2018 20:20:08 +0000 (20:20 +0000)]
Revert "Support AOD in the Universal Settings API"
This reverts commit
537c2cfc2c21ffee691b11864a26bd84f043916a.
Fixes:
77278897
Change-Id: I7a5ff34bf79b87f6a7be50c2e8f421bfc4a22195
Eran Messeri [Thu, 29 Mar 2018 20:17:18 +0000 (20:17 +0000)]
Merge "Require unlocked work profile to change notification settings" into pi-dev
Victor Chang [Thu, 29 Mar 2018 20:15:08 +0000 (20:15 +0000)]
Merge "Fix ZonePickerSettingsTest due to string change" into pi-dev
am:
75f438cc37
Change-Id: Idaa83888a00597d581506bf7bc2aec7fdce2ff05
Doris Ling [Thu, 29 Mar 2018 20:14:04 +0000 (20:14 +0000)]
Merge "Report unavailable data usage." into pi-dev
am:
a673f714c4
Change-Id: I473eac43583caaa94093fabdfb6b588de290e36c
Doris Ling [Thu, 29 Mar 2018 20:08:09 +0000 (13:08 -0700)]
Fix visibility issue with fingerprint icon.
- set icon tint color to control normal. The icon fill color is white,
and without the tint color set, it is invisible on a white background.
Change-Id: I9cda0e9105701230256620bd4ea904c96d7bc166
Fixes:
77151365
Test: visual
TreeHugger Robot [Thu, 29 Mar 2018 20:01:26 +0000 (20:01 +0000)]
Merge "Fix ZonePickerSettingsTest due to string change" into pi-dev
TreeHugger Robot [Thu, 29 Mar 2018 19:57:44 +0000 (19:57 +0000)]
Merge "Report unavailable data usage." into pi-dev
Jerry Zhang [Wed, 28 Mar 2018 23:50:46 +0000 (16:50 -0700)]
Explicity receive sticky usb intent
Sticky intents are both returned by onReceive
and broadcast to the receiver. In some cases
though, the receiver could be unregistered
so quickly that it has no time to receive
it. When this happens the screen is not
refreshed, so explicity handle the intent
to ensure a refresh.
Fixes:
74255559
Test: screen refreshed property in multi-window
Change-Id: I2480dc35e28f98561ffed4b557f4bdaf83a73e9c
Fan Zhang [Thu, 29 Mar 2018 19:07:02 +0000 (12:07 -0700)]
Make FontSizePreferenceController slice compatible.
Bug:
67997826
Test: robotests
Change-Id: Iea1cff48f39e1433abea285309376876e8356c07
Fan Zhang [Thu, 29 Mar 2018 18:12:46 +0000 (18:12 +0000)]
Merge "Add some debug logging" into pi-dev
am:
f3789adffd
Change-Id: Iee699c9c5861e40fafb04a6b6edf6f68daedcd0c
Victor Chang [Thu, 29 Mar 2018 17:57:22 +0000 (18:57 +0100)]
Fix ZonePickerSettingsTest due to string change
The change with id I1fb3e2abf80da3cb53cfbc3363bbe46e40a6ac22 broke the
test
Bug:
76209571
Test: atest SettingsUITests:ZonePickerSettingsTest
Change-Id: I6676e8669e1f396c9588e3096b62cc6aedcc38a9
TreeHugger Robot [Thu, 29 Mar 2018 17:59:40 +0000 (17:59 +0000)]
Merge "Add some debug logging" into pi-dev
Daniel Nishi [Thu, 29 Mar 2018 17:55:11 +0000 (17:55 +0000)]
Merge "Don't allow a zero-length device name to work." into pi-dev
am:
6ff8bbeb4a
Change-Id: Ic9e67a1a03b5ae2ac79326770c779e969849146e
Doris Ling [Thu, 29 Mar 2018 00:14:23 +0000 (17:14 -0700)]
Report unavailable data usage.
- when showing the data usage graph, if the first data point is equal to
the first available data, insert a 0 usage point on the first day of
available data, so that it will show a flat line for the days that do
not have available data instead of showing a non-zero slope.
Change-Id: Ibf305e292a65ab3310ea12efbb575e3a7e1b6012
Fixes:
76155147
Test: make RunSettingsRoboTests
Jeff Sharkey [Thu, 29 Mar 2018 17:45:08 +0000 (17:45 +0000)]
Merge "Better public volumes handling on secondary users." into pi-dev
am:
bfc661ea3e
Change-Id: I6bca0f8eb74f30251a4d06bd462b4590ee030d92
Daniel Nishi [Thu, 29 Mar 2018 17:33:27 +0000 (17:33 +0000)]
Merge "Don't allow a zero-length device name to work." into pi-dev
Fan Zhang [Thu, 29 Mar 2018 17:22:29 +0000 (17:22 +0000)]
Merge "Check time-spent-in-app intent must come from system app." into pi-dev
am:
8e88874e47
Change-Id: I4d4eb4d06d032e31d3e6dd1a0b2d3f0a866afb09
Jeff Sharkey [Thu, 29 Mar 2018 17:13:42 +0000 (17:13 +0000)]
Merge "Better public volumes handling on secondary users." into pi-dev
TreeHugger Robot [Thu, 29 Mar 2018 16:55:30 +0000 (16:55 +0000)]
Merge "Check time-spent-in-app intent must come from system app." into pi-dev
yuemingw [Thu, 29 Mar 2018 16:53:38 +0000 (16:53 +0000)]
Merge "Disallow_airplane_mode should not disable mobile network." into pi-dev
am:
cc65760354
Change-Id: I13c39e2857bc58f6062a5d74ad3c4e672200a029
TreeHugger Robot [Thu, 29 Mar 2018 16:45:43 +0000 (16:45 +0000)]
Merge "Disallow_airplane_mode should not disable mobile network." into pi-dev
Beverly [Thu, 29 Mar 2018 16:09:50 +0000 (16:09 +0000)]
Merge "Settings should use Oxford comma" into pi-dev
am:
51646b5f07
Change-Id: I94ac135a10015933a2dc7e2d5d0b7d8f72b6b865
TreeHugger Robot [Thu, 29 Mar 2018 15:41:21 +0000 (15:41 +0000)]
Merge "Settings should use Oxford comma" into pi-dev
Eran Messeri [Tue, 27 Mar 2018 18:13:47 +0000 (19:13 +0100)]
Require unlocked work profile to change notification settings
Require that the work profile be started and unlocked before the user
can change the notification settings for the work profile.
That prevents leaking of notifications from the work profile, which
could happen when the user set the work profile notifications to show
even if the profile was unlocked (an example scenario is a family member
of the user using the device while the work profile is locked).
Test: Manually with TestDPC
Bug:
75252682
Change-Id: I300d001b7439c0a1d0130d7dbc9ec4c2430be227
yuemingw [Tue, 27 Mar 2018 15:56:24 +0000 (16:56 +0100)]
Disallow_airplane_mode should not disable mobile network.
Found mobile_network_settings preference is dependent on toggle_airplane
preference so once Disallow_airplane_mode is turned on, toggle_airplane
preference will be set disabled, and mobile_network_settings preference
is also set disabled because of the dependence. Can fix this bug moving
the dependance and let MobileNetworkPreferenceController listen to
Settings.Global.AIRPLANE_MODE_ON.
Bug:
76468718
Test: manually but TestDpc
Change-Id: I137938766557d7bc5ae0795bc3359a6bfbae17e3
Beverly [Wed, 28 Mar 2018 20:53:52 +0000 (16:53 -0400)]
Settings should use Oxford comma
Test: manual
Change-Id: Ie4edd64d423ce96ce097e91f9f5a31bb4339774c
Fixes:
77230158
Rubin Xu [Thu, 29 Mar 2018 08:49:24 +0000 (08:49 +0000)]
Merge "Confirm parent user's credential when setting lock for profile" into pi-dev
am:
b0a35de10b
Change-Id: I8df143549c8e4bb0e79350c8ee3d993a039f112f
Rubin Xu [Thu, 29 Mar 2018 08:35:46 +0000 (08:35 +0000)]
Merge "Confirm parent user's credential when setting lock for profile" into pi-dev
Jane Chiang [Thu, 29 Mar 2018 03:24:18 +0000 (03:24 +0000)]
Merge "Reduce size of 'GB' and '%' in storage settings." into pi-dev
am:
01933aa02c
Change-Id: Icee729e83d50e6447b1872fd4340b7f113fb7ec4
Jane Chiang [Thu, 29 Mar 2018 03:20:35 +0000 (03:20 +0000)]
Merge "Reduce size of 'GB' and '%' in storage settings." into pi-dev
Jane Chiang [Fri, 23 Mar 2018 06:27:28 +0000 (14:27 +0800)]
Reduce size of 'GB' and '%' in storage settings.
Test: Manual
Fixes:
62548317
Change-Id: I5ff8ff8c463c2718e48bf04731924922bc0ecc9c
Fan Zhang [Thu, 29 Mar 2018 03:04:11 +0000 (03:04 +0000)]
Merge changes I236b1124,Iad16b06e into pi-dev
am:
6a89e511d1
Change-Id: I82ae2d375b99bd9c1ae58b2919ed87f02ed18adf
Andrew Chiang [Thu, 29 Mar 2018 03:02:49 +0000 (03:02 +0000)]
Merge "Update toggle text for Data Saver" into pi-dev
am:
f3ea58a7df
Change-Id: I5119ec416a7c531eaf73fdf5e9c160f17e42b202
TreeHugger Robot [Thu, 29 Mar 2018 02:48:21 +0000 (02:48 +0000)]
Merge changes I236b1124,Iad16b06e into pi-dev
* changes:
Add conformance test for preference controller constructor
Remove duplicate framework classes/robotest compile stub
Andrew Chiang [Thu, 29 Mar 2018 02:44:04 +0000 (02:44 +0000)]
Merge "Update toggle text for Data Saver" into pi-dev
Fan Zhang [Thu, 29 Mar 2018 02:05:34 +0000 (02:05 +0000)]
Merge "Fix a NPE when getting ZenMode in RingerMutedCondition." into pi-dev
am:
6b36c2e402
Change-Id: Ifad1dbe1fad852fa72ea005c2478cf77c651f79d
Scott Nien [Thu, 29 Mar 2018 01:50:53 +0000 (01:50 +0000)]
Merge "Apply entity header effect to storage summary screen" into pi-dev
am:
27ba675ddd
Change-Id: Ic1b2b4cff34ecb5468420dac9d100e0226914609
TreeHugger Robot [Thu, 29 Mar 2018 01:23:41 +0000 (01:23 +0000)]
Merge "Fix a NPE when getting ZenMode in RingerMutedCondition." into pi-dev
Fan Zhang [Thu, 29 Mar 2018 01:02:40 +0000 (18:02 -0700)]
Check time-spent-in-app intent must come from system app.
Change-Id: Ie73aacdaf919b336d99a296328c2fbb4f75036b0
Fixes:
74580195
Test: robotests
Scott Nien [Thu, 29 Mar 2018 01:07:46 +0000 (01:07 +0000)]
Merge "Apply entity header effect to storage summary screen" into pi-dev
Fan Zhang [Thu, 29 Mar 2018 00:29:26 +0000 (17:29 -0700)]
Add conformance test for preference controller constructor
BasePreferenceController's constructor must be in a certain format in
order to work with search and slice. This test enforces that.
Change-Id: I236b11248b09ce71f052c449d39e994c84981a06
Fixes:
77216595
Test: robotests
Fan Zhang [Wed, 28 Mar 2018 23:07:55 +0000 (16:07 -0700)]
Remove duplicate framework classes/robotest compile stub
Bug:
76167422
Test: robotests
Change-Id: Iad16b06e54bd7290fd363c3abebdb8c66434c0e2
Dieter Hsu [Thu, 29 Mar 2018 00:42:11 +0000 (00:42 +0000)]
Merge "Support AOD in the Universal Settings API" into pi-dev
am:
3025bc7c18
Change-Id: I90309ffd96e9668a286a3019691748e319ed6d4f
Dieter Hsu [Thu, 29 Mar 2018 00:13:56 +0000 (00:13 +0000)]
Merge "Support AOD in the Universal Settings API" into pi-dev
Philip P. Moltmann [Wed, 28 Mar 2018 23:59:30 +0000 (23:59 +0000)]
Merge "A18y: Don't double announce 'searching for printers.'" into pi-dev
am:
f9cfc7c75a
Change-Id: I8198b511255e9e78e7c378adc62886aa4f31fac8
Fan Zhang [Wed, 28 Mar 2018 23:26:59 +0000 (23:26 +0000)]
Merge "Remove duplicate classes from test/robotests" into pi-dev
am:
8b63a03278
Change-Id: I2e82659b4341d3bec2ae0020216f73284c30f7f7
Fan Zhang [Wed, 28 Mar 2018 23:26:21 +0000 (16:26 -0700)]
Fix a NPE when getting ZenMode in RingerMutedCondition.
Change-Id: If9a8b6f4a2d5e9b45402240d8e1401cef7dd001c
Fixes:
77217038
Test: robotest
Doris Ling [Wed, 28 Mar 2018 23:21:31 +0000 (23:21 +0000)]
Merge "Move IMS registration state to SIM status screen" into pi-dev
am:
6fa3b89033
Change-Id: Ib4a76ca53a04cf9a9f6ab62312bbf3c9b685528c
TreeHugger Robot [Wed, 28 Mar 2018 23:02:04 +0000 (23:02 +0000)]
Merge "A18y: Don't double announce 'searching for printers.'" into pi-dev
Daniel Nishi [Mon, 12 Mar 2018 23:44:27 +0000 (16:44 -0700)]
Don't allow a zero-length device name to work.
Technically, if a device has a zero-length device name, the bug will
resurface. The EditText validator doesn't trigger on opening -- only
when the text is edited. A zero-length device name is flagged as being
invalid, but that fails if the text box starts empty.
By pre-filling it with the previous device name, we can ensure that, as
long as a zero-length device name is never set, it can never be set.
Change-Id: I0d28aaae09f99b7d697b753835ba39c0c06644a1
Fixes:
73127912
Test: Robotest
(cherry picked from commit
b2165509445c0c63b1813132d8b92b119bd44d57)
Victor Chang [Wed, 28 Mar 2018 22:53:29 +0000 (22:53 +0000)]
Merge "Fix incorrect GMT offset in display" into pi-dev
am:
caf72cf3ff
Change-Id: Id8ccf9caa54e655f810d77baf19c7d6df55a9087
TreeHugger Robot [Wed, 28 Mar 2018 22:40:45 +0000 (22:40 +0000)]
Merge "Remove duplicate classes from test/robotests" into pi-dev
Fan Zhang [Tue, 27 Mar 2018 21:14:13 +0000 (14:14 -0700)]
Add some debug logging
- Increase logging in SettingsActivity's onCreate and launch fragment
flow.
- Log class name when enable/disable tiles
Bug:
75030092
Test: logcat
Change-Id: Ieb00228562a79c12aba2198021ece505bc371b58
Daniel Nishi [Wed, 28 Mar 2018 22:31:17 +0000 (15:31 -0700)]
Better public volumes handling on secondary users.
Public volumes are only mounted for a single user at a time, so only
show notifications and launch Intents for the relevant user.
Test: RunSettingsRobotest
Bug:
73642796
Change-Id: Ic386ec03598ab8968b75320be7844b6ac7f1387b
TreeHugger Robot [Wed, 28 Mar 2018 22:24:30 +0000 (22:24 +0000)]
Merge "Move IMS registration state to SIM status screen" into pi-dev
Kousuke Kitahara [Wed, 28 Mar 2018 21:13:08 +0000 (21:13 +0000)]
[automerger skipped] Merge "DO NOT MERGE Move IMS registration state to SIM status screen" am:
e8b70d7422 -s ours
am:
7d906895e8 -s ours
Change-Id: Ia1ae6679a2e3c5c2372bee1280ef8577efa3ef84
TreeHugger Robot [Wed, 28 Mar 2018 21:05:15 +0000 (21:05 +0000)]
Merge "Fix incorrect GMT offset in display" into pi-dev
Kousuke Kitahara [Wed, 28 Mar 2018 20:49:50 +0000 (20:49 +0000)]
[automerger skipped] Merge "DO NOT MERGE Move IMS registration state to SIM status screen"
am:
e8b70d7422 -s ours
Change-Id: I16c7823773e1a1ca070bfc5189be080996f0d38e
Jan Nordqvist [Wed, 28 Mar 2018 20:40:15 +0000 (20:40 +0000)]
Merge "Entity header: When screen scrolls, there should be shadow under the header." into pi-dev
am:
00a2dcb8f9
Change-Id: I1d577b8432cde8b696a84a1aaa284576013612d7
Philip P. Moltmann [Wed, 28 Mar 2018 18:03:30 +0000 (11:03 -0700)]
A18y: Don't double announce 'searching for printers.'
Change-Id: I0c0f904aae8345e725a34d38ecf1eb45c3c11670
Fixes:
67323891
Test: Navigated to screen with talkback
TreeHugger Robot [Wed, 28 Mar 2018 20:12:46 +0000 (20:12 +0000)]
Merge "Entity header: When screen scrolls, there should be shadow under the header." into pi-dev
Fan Zhang [Wed, 28 Mar 2018 20:07:23 +0000 (20:07 +0000)]
Merge "Revert "Ignore broken test to unblock TreeHugger"" into pi-dev
am:
8482455df7
Change-Id: I10b2fc33b345607358ad81c98784eb15fcd2c2e5
Doris Ling [Tue, 27 Mar 2018 22:22:42 +0000 (15:22 -0700)]
Move IMS registration state to SIM status screen
Manually merge change I3aff03ebdc9dc165db66c5007a2fa987ab8cd822 due
to merge conflicts.
To show IMS registration state for each SIM, move the preference of
IMS registration state from Status screen to SIM Status screen.
Fixes:
66063299
Test: manual - Checked that the IMS registration state is displayed on
the SIM Status screen.
Test: make RunSettingsRoboTests
Change-Id: Ic0713c357085d94b59605c1b924e7b56a362e256
Makoto Onuki [Wed, 28 Mar 2018 20:00:45 +0000 (20:00 +0000)]
Merge "Fix battery saver setting default state" into pi-dev
am:
856017f915
Change-Id: I32f20eac01ddeed16ed95c3b8b9323067b8d0608
Treehugger Robot [Wed, 28 Mar 2018 19:51:28 +0000 (19:51 +0000)]
Merge "DO NOT MERGE Move IMS registration state to SIM status screen"
TreeHugger Robot [Wed, 28 Mar 2018 19:41:24 +0000 (19:41 +0000)]
Merge "Revert "Ignore broken test to unblock TreeHugger"" into pi-dev
TreeHugger Robot [Wed, 28 Mar 2018 19:31:51 +0000 (19:31 +0000)]
Merge "Fix battery saver setting default state" into pi-dev
Lei Yu [Wed, 28 Mar 2018 19:22:12 +0000 (19:22 +0000)]
Merge "Get anomaly info from StringArrayList" into pi-dev
am:
512cb18c2e
Change-Id: If0f76de185b489e5c7ac4ae4d6dfb930ef35e03f
TreeHugger Robot [Wed, 28 Mar 2018 18:58:00 +0000 (18:58 +0000)]
Merge "Get anomaly info from StringArrayList" into pi-dev
Victor Chang [Wed, 28 Mar 2018 18:50:06 +0000 (19:50 +0100)]
Fix incorrect GMT offset in display
- android.icu.impl.TimeZoneAdapter doesn't fully implement
java.util.TimeZone, e.g. does not override getOffset(long date).
TimeZoneAdapter isn't a public API in ICU/Android. It shouldn't be
used in the first place
Bug:
77223510
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Change-Id: Ic0d7794326948796dcc5cc0b268ef634a74803c4
Jan Nordqvist [Fri, 23 Mar 2018 22:45:17 +0000 (15:45 -0700)]
Entity header: When screen scrolls, there should be shadow under the header.
Bug:
70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I5c1d9f463a57d48e258d67602fc4d1fbbdfaad60
OSDN Git Service
