vichang
56a24f9ac1
Merge "Move libcore.timezone to the i18n module - Final part" am: 268371c44e
am: 7485036f53
am: bc7f639e15
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1348663
Change-Id: I8d99d5ce1a84db343dac195a38c47041b7bf66f3
2020-07-02 11:03:47 +00:00
vichang
bc7f639e15
Merge "Move libcore.timezone to the i18n module - Final part" am: 268371c44e
am: 7485036f53
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1348663
Change-Id: I8e81b3d707bce016006bf0af1f75785ecd15648e
2020-07-02 10:50:06 +00:00
vichang
268371c44e
Merge "Move libcore.timezone to the i18n module - Final part"
2020-07-02 10:25:54 +00:00
Victor Chang
b07e53c1c8
Move libcore.timezone to the i18n module - Final part
...
Bug: 141747409
Test: atest CtsLibcoreTestCases CtsLibcoreTestCases
Change-Id: I48a1f383403a553639f525ef92996292fab84c5e
2020-06-30 14:35:09 +01:00
Stanley Wang
ca05c7fabd
Merge "Remove the prefix "Model:" from the summary of hardware." into rvc-d1-dev am: e86dd271da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12034261
Change-Id: I132e88d5b1cb22db5042c0e66b6bc61ab30efcba
2020-06-30 10:41:41 +00:00
Stanley Wang
db0687c447
Remove the prefix "Model:" from the summary of hardware.
...
Fixes: 159529327
Test: run robotest and observe the UI
Change-Id: I60f4a341b427e4b619a202a440f3f2554c562a27
2020-06-30 16:45:47 +08:00
Treehugger Robot
d1051792b1
Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1bc
am: fce601ea2a
am: 3947998755
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298027
Change-Id: Ia665650c897801e914d9c580e4f2f59e9fe2ec28
2020-06-29 15:01:17 +00:00
Treehugger Robot
3947998755
Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1bc
am: fce601ea2a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1298027
Change-Id: I5fc5d8b00e9b6e0c28389754cd4cf7eeb9bdc969
2020-06-29 14:39:26 +00:00
Treehugger Robot
b1cea4f1bc
Merge "Settings: Fix fallback summary for power_button_instantly_locks preference"
2020-06-29 14:14:47 +00:00
LuK1337
ad243904db
Settings: Fix fallback summary for power_button_instantly_locks preference
...
* Using summary_placeholder instead of summary_empty
leaves an ugly empty space.
Change-Id: I73a90f1b3203d6cb17e1875dc8163eb67140de89
2020-06-29 12:27:06 +02:00
TreeHugger Robot
adb65f0f4e
Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0
am: 35d0304067
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983923
Change-Id: I21d2303110af212bceed2855e671aec1e394f166
2020-06-24 13:01:18 +00:00
TreeHugger Robot
821d3a21f1
Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983923
Change-Id: I9ef98879c2581fbe8bf0c466a43ebe6602e3ed7f
2020-06-24 12:43:25 +00:00
TreeHugger Robot
35d0304067
Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983923
Change-Id: I91ffd5a10cf3b583d8a645951550a11e49891366
2020-06-24 12:43:23 +00:00
TreeHugger Robot
6f4aa6e5e0
Merge "Fix the Night Light page UI shrinking" into rvc-dev
2020-06-24 12:24:02 +00:00
Sunny Shao
8d74809e96
Fix the Night Light page UI shrinking
...
- This problem causes the TwilightLocationPreferenceController too late
to decide the preference display or not.
- Move the display criteria into the getAvailabilityStatus
Fixes: 159032276
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Test: manual review
Change-Id: I5850479e8a891f837c0e6772ad1096e702f95e34
2020-06-24 12:22:59 +00:00
TreeHugger Robot
0b04a19565
Merge "Fix failed test cases" into rvc-dev am: 1676454b3b
am: eadd54e1d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207
Change-Id: I40704bac526083ac5bf5c4fe8255f232e5b842f2
2020-06-24 06:08:49 +00:00
TreeHugger Robot
2309e1c188
Merge "Fix failed test cases" into rvc-dev am: 1676454b3b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207
Change-Id: I6d889efedeeea69aea2ca8cca5f2f0a9b4c61639
2020-06-24 05:52:51 +00:00
TreeHugger Robot
eadd54e1d9
Merge "Fix failed test cases" into rvc-dev am: 1676454b3b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207
Change-Id: I20545916f5ca886d67e10adf9c68a4656988f27d
2020-06-24 05:52:43 +00:00
TreeHugger Robot
1676454b3b
Merge "Fix failed test cases" into rvc-dev
2020-06-24 05:41:14 +00:00
TreeHugger Robot
1388e13655
Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab
am: 1431d7647a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205
Change-Id: Ida02e2c58f68842444371a30c777d7742b6522ad
2020-06-24 05:26:57 +00:00
TreeHugger Robot
1431d7647a
Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205
Change-Id: I71f3394e1c44c881a5bc346a59c39a1968d0d29d
2020-06-24 05:10:36 +00:00
TreeHugger Robot
3882212b26
Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205
Change-Id: I48656a2ca05350bec1d304a05fbb00ff99b137d7
2020-06-24 05:10:32 +00:00
Jason Chiu
98a8640de2
Fix failed test cases
...
Test: robotest
Fixes: 159688624
Change-Id: I28d53e38000d2dfb00bde900647eb38eda279c9a
2020-06-24 10:55:31 +08:00
Hugh Chen
336ff700a2
Fix com.android.settings.media test case fail
...
Bug: 159760643
Test: make -j42 RunSettingsRoboTests
Change-Id: I17246088ade1b5e17974ccf24a5e40b915146574
2020-06-24 10:54:43 +08:00
Stanley Wang
69eaf216eb
Merge "Fix the bug of not showing lock screen before entering Smart Lock page." into rvc-dev am: 7afb61e6dc
am: b1895fc072
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11949297
Change-Id: I06655ae21068d4f9bd0f9430e88be8b3a69eacf9
2020-06-22 10:50:39 +00:00
Stanley Wang
7c0f60f24e
Merge "Fix the bug of not showing lock screen before entering Smart Lock page." into rvc-dev am: 7afb61e6dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11949297
Change-Id: I2f29322ed4c14d9ed093777d330e9df7b364feb4
2020-06-22 10:38:20 +00:00
Stanley Wang
b1895fc072
Merge "Fix the bug of not showing lock screen before entering Smart Lock page." into rvc-dev am: 7afb61e6dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11949297
Change-Id: I7bda54792d81ace1bcdee9f018fb3e5f3db0fc1b
2020-06-22 10:38:04 +00:00
Stanley Wang
7afb61e6dc
Merge "Fix the bug of not showing lock screen before entering Smart Lock page." into rvc-dev
2020-06-22 10:25:58 +00:00
Stanley Wang
f1a0801c00
Fix the bug of not showing lock screen before entering Smart Lock page.
...
Controller can't find the target preference to handle the click event.
Store the preference keys to match the clicked item.
Fixes: 158716163
Test: run robotest and manually test the click behavior
Change-Id: Ie243206ceffef013c56c4ea29c14fe56da510fb6
2020-06-22 16:49:02 +08:00
TreeHugger Robot
009de48ded
Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251
am: 2b697fac94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423
Change-Id: I77d3bf02a641854f2388fd40704bc590437842e4
2020-06-22 03:54:55 +00:00
TreeHugger Robot
11018b11c1
Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423
Change-Id: I9b287ae61c3c1d1bad877859bb8b1ee80a9421fd
2020-06-22 03:44:29 +00:00
TreeHugger Robot
2b697fac94
Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423
Change-Id: I97fcaa6787a5f9a205e8027d3bfe9d52fa358b6a
2020-06-22 03:44:17 +00:00
TreeHugger Robot
fbabf8f251
Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev
2020-06-22 03:27:01 +00:00
tim peng
593d62d992
Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537
am: 9ff43d2fa3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663
Change-Id: Ibcab4ea712bcf00fa380c2f449713e6304e766b2
2020-06-20 10:48:25 +00:00
tim peng
fc3f730d98
Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663
Change-Id: Iadc1abf749b34eb94956dd9e21a910d56069d4d4
2020-06-20 10:25:18 +00:00
tim peng
9ff43d2fa3
Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663
Change-Id: Ida3ffa1110238057993e4ce345dce3cb3a8791d6
2020-06-20 10:25:04 +00:00
tim peng
02e311e537
Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev
2020-06-20 10:12:03 +00:00
Mill Chen
a99b8799ee
Make Telephony related PreferenceController un-sliceable
...
Since the structure of Telephony is changed, some of Telephony
related PreferenceController cannot be converted to slices
smoothly whether devices have mobile data or not. So we
decided to make them un-sliceable.
Bug: 155846002
Test: robotests, manual
1. Settings -> Settings search -> search for roaming
2. Check that roaming result has no toggle widget.
Change-Id: I7cba8f6a750d9780a59411942665f68dac61248c
2020-06-20 08:20:07 +00:00
TreeHugger Robot
58c4a5bf48
Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8
am: 731e6d8e5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541
Change-Id: Ia862cf87cf256805fb0b6ab27101cdfc41614778
2020-06-20 04:56:28 +00:00
TreeHugger Robot
914f8e7d07
Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541
Change-Id: I6607dc1cea3303faf895dbacbd5528f4600118e2
2020-06-20 04:43:49 +00:00
TreeHugger Robot
731e6d8e5f
Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541
Change-Id: I924680694eb54be8e4447e873aa195aa1f5c19c4
2020-06-20 04:43:49 +00:00
TreeHugger Robot
5b849d8ac8
Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev
2020-06-20 04:35:24 +00:00
Tim Peng
aeabfc3050
Add a separate line at the bottom of list area in output switcher
...
-Bottom divider is not showed when there are more than 7 devices exist in output switcher
-Check panel type in isDividerAllowedBelow()
-Hide the Slice bottom divider of Output switcher panel
-Show divider in panel layout only for output switcher panel
Bug: 159177275
Test: make -j42 RunSettingsRoboTests
Change-Id: I49396a0ee0543b494a2b3d714ec248ebab08e7ba
2020-06-20 03:44:43 +00:00
SongFerngWang
36796a1616
NetworkModePreference's list needs to allow values set from overlay.
...
Root cause: ag/10614943 removed the resources, so each of item
values is hard coded. This broke the overlay. This CL adds the
resource back so the overlay can work.
Bug: 159301925
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest (PASS)
Change-Id: Id5ad2fdd0a87586136e4a26d2e44cf5278df5d9d
2020-06-20 11:21:18 +08:00
Beth Thibodeau
c30c0c381c
[DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b
am: 43834d78ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: I2b9690779b8cf6f5e6b8ae6c6dc6f428fb55c3bf
2020-06-19 22:43:44 +00:00
Beth Thibodeau
a648d121b7
[DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: Ifed5f6e94045c09bcb5009827c24e668a11ac0a2
2020-06-19 22:40:39 +00:00
Beth Thibodeau
43834d78ff
[DO NOT MERGE] Add toggle for media resumption am: 13f3e8f04b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11826883
Change-Id: Ib4fffb001ffe58da7e0a9ed759dc75c475b3ae8a
2020-06-19 22:40:24 +00:00
Beth Thibodeau
0b152c29d0
Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev
2020-06-19 22:26:59 +00:00
markchien
77c297df4f
Remove unused resource from TetherServiceTest
...
TetherService is no longer query resource by itself after ag/11524847.
That CL miss to remove unused getResources code.
Now remove unused resource in this change.
Bug: 146918263
Test: atest TetherServiceTest
Change-Id: I3b0da2672246997aee16b11576ce5ae9bfe596dc
Merged-In: I3b0da2672246997aee16b11576ce5ae9bfe596dc
2020-06-19 23:23:02 +08:00
markchien
6d2c010891
Get entitlement configuration from intent extra
...
Tethering resource configuration is move from framwork to tethering
module. The resource would not be accessible from outside of tethering
module.
List the replacements of framework resources usage and intent extra:
1. R.string.config_mobile_hotspot_provision_response
--> android.net.extra.TETHER_PROVISIONING_RESPONSE.
2. R.string.config_mobile_hotspot_provision_app_no_ui
--> android.net.extra.TETHER_UI_PROVISIONING_APP_NAME
3. R.array.config_mobile_hotspot_provision_app
--> android.net.extra.TETHER_SILENT_PROVISIONING_ACTION
Besides, the current active subId would put in
android.net.extra.TETHER_SUBID
Note: They are not APIs because of API freeze. Now both tethering module
and Settings define these strings independently. Will replace hard code
string as tethering module-lib APIs in b/159085857.
Also move the entitlement response intent registeration from onCreated
to onStartCommand, this can avoid wrong intent registeration if subId
changed between onCreate and when the intent arrived.
Bug: 146918263
Test: atest TetherServiceTest
atest TetherProvisioningActivityTest
Change-Id: I3d06df01302a9c1f0893712d9250fe394dc66588
Merged-In: I3d06df01302a9c1f0893712d9250fe394dc66588
2020-06-19 23:21:17 +08:00