Commit Graph

85190 Commits

Author SHA1 Message Date
Zoey Chen
439bc7f9dd [Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.2
Test: atest CarrierWifiTogglePreferenceControllerTest
Bug: 197066557
Change-Id: I2f1d22fb77c4e56ed10e11dfe11e8b9e880f16ff
2021-11-17 10:37:41 +00:00
Zoey Chen
5515e9bde5 [Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI
Test: atest NetworkProviderCallsSmsFragmentTest, SubscriptionsPreferenceControllerTest
Bug: 197066557
Change-Id: I55e0fa2ca7317cd8c9d1bce7c229b8344f43cc92
2021-11-17 10:37:20 +00:00
Shaowei Shen
2874b6442e Merge "[Sound panel] Use localized string for button text" into sc-v2-dev 2021-11-12 09:14:19 +00:00
Zoey Chen
6cf16b0aa9 [Settings] 1. Add configChange for WFC Activity to cover the changes of rotation and screen size
2. register split rule for MobileNetworkActivity

Bug: 204508876
Test: manual
Change-Id: Iff3dae41293e79b274d2928cb51efea46fb45dd4
2021-11-12 15:22:43 +08:00
Jason Chiu
822f98c1a4 Merge "Check the page searchability for both wifi and network provider page" into sc-v2-dev 2021-11-12 03:00:40 +00:00
Jason Chiu
5b7230d355 Check the page searchability for both wifi and network provider page
Fix: 205976868
Test: manual, robotest build pass
Change-Id: Ic056852cb2524a6724dcf4a67b535fd927478338
2021-11-12 03:00:17 +00:00
TreeHugger Robot
47b212c85b Merge "[Provider Model] Fixed Internet Settings always showing "Loading"" into sc-v2-dev 2021-11-11 18:31:29 +00:00
shaoweishen
dbc08a2178 [Sound panel] Use localized string for button text
use localized string "Settings" as button text in Sound panel.
revert text change in ag/15926634

Bug: 204326209
Test: Verified on device
Change-Id: Ibe99369d3c9f9f2131a33b7831f93a5d1554db3f
2021-11-11 08:24:04 +00:00
TreeHugger Robot
22ff8c7832 Merge "Support Settings deep links highlighting the menu entries" into sc-v2-dev 2021-11-11 05:59:29 +00:00
Andrii Kulian
0ac5228e54 Merge "Sticky placeholder and adjacent finish rule in Settings" into sc-v2-dev 2021-11-11 03:44:38 +00:00
YUKAI HUNG
6e12a31e5f Merge "Fix incorrect usage for the logging method to cause no data in WW" into sc-v2-dev 2021-11-10 09:34:55 +00:00
Jason Chiu
a3ad3d1abb Support Settings deep links highlighting the menu entries
Fix: 203492419
Test: visual
Change-Id: I2249d4779d69bc0934b9c57900b903638ad6700b
Merged-In: I2249d4779d69bc0934b9c57900b903638ad6700b
2021-11-10 09:09:26 +00:00
Arc Wang
7c86d3d7a7 Merge "[Large sceen] Don't go Settings 2-pane deep link flow if not task root" into sc-v2-dev 2021-11-10 08:52:07 +00:00
Arc Wang
0f5e75e098 [Large sceen] Don't go Settings 2-pane deep link flow if not task root
When a full screen or a non-Settings-app ActivityA starts ActivityB of
a SettingsActivity, splitInfos will be empty and it unexpectedly goes
Settings 2-pane deep link flow.

This change checks if an Activity is not task root, don't go Settings
2-pane deep link flow.

Bug: 205497007
Test: manual
      SUW -> Vision settings
      Check if it goes Settings 2-pane deep link flow.
Change-Id: I0822fbe71fdde47ce7c070986371a4dfea84992c
2021-11-10 08:50:10 +00:00
Arc Wang
084cfd4142 Merge "[Large screen] Shows MobileNetworkActivity in 2-pane" into sc-v2-dev 2021-11-10 08:46:00 +00:00
ykhung
101dc6878a Fix incorrect usage for the logging method to cause no data in WW
Fix incorrect usage for the logging method to cause the schedule type
and percentage data is not logged  into the WW, since
MetricsFeatureProvider doesn't support log Pair.of() data into the
WestWorld or Clearcut directly, it is used for EventLogWriter only

Bug: 202906853
Test: make SettingsRoboTests
Change-Id: I9f1d157c77df9bd74f441105318790a2505a9c01
2021-11-10 15:39:30 +08:00
Tom Hsu
50726121b4 Merge "Let activity of "add language" fit settingsactivity style." into sc-v2-dev 2021-11-10 07:06:59 +00:00
Arc Wang
80887b6be3 [Large screen] Shows MobileNetworkActivity in 2-pane
MobileNetworkActivity has launchMode singleTask, it makes
the Activity shows in full screen instead of 2-pane.

This change register SplitPairRule for the Activity to show
in 2-pane. However, there are other objects which starts
MobileNetworkActivity, it still needs later CL to refine
and register SplitPairRule for other objects which starts
MobileNetworkActivity.

Bug: 204039043
Test: manual
      Settings -> Network & Internet -> SIMs
Change-Id: Ia15c17c88efd46c5bb2b41aa21848293b9ff5610
2021-11-10 14:39:47 +08:00
Andrii Kulian
8061973e3d Sticky placeholder and adjacent finish rule in Settings
Bug: 204829538
Test: Open Settings in landscape in two panes, rotate to portrait to stack, rotate back to split
Change-Id: I5790962051d0b01902f3b50e958848eff7cf7334
2021-11-09 22:32:58 -08:00
TreeHugger Robot
5afb04e1b8 Merge "Fix "battery saver" not in the top seaching result for indexing" into sc-v2-dev 2021-11-10 02:09:27 +00:00
ykhung
64e49a9393 Fix "battery saver" not in the top seaching result for indexing
Bug: 204964119
Test: make SettingsRoboTests
Change-Id: Ifbbf979abe9e96e7af66ec20173e996793d2703e
2021-11-10 00:11:09 +08:00
TreeHugger Robot
6f6149c7ba Merge "Fix incorrect usage for the logging method to cause no data in WW" into sc-v2-dev 2021-11-09 15:00:47 +00:00
Weng Su
0d8a53fa0c [Provider Model] Fixed Internet Settings always showing "Loading"
- The Internet Settings will restart itself if it's launching in lock
screen

- The "Loading" might not be hidden if the activity restarts itself

- Move the postDelayed runnable from onViewCreated() to onStart() to
avoid loss

Bug: 204041345
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I516f1105c74b6c8853a72e71c20d2197495cc0d6
2021-11-09 13:22:19 +00:00
tom hsu
0c0daf7034 Let activity of "add language" fit settingsactivity style.
Bug: 202104027
Test: Maunal test. see b/202104027#5
Change-Id: I1f087885912179bb501ae72d0eb50bb8280dcbc0
2021-11-09 21:22:09 +08:00
ykhung
48c3533cd0 Fix incorrect usage for the logging method to cause no data in WW
Fix incorrect usage for the logging method to cause the schedule type
and percentage data is not logged  into the WW, since
MetricsFeatureProvider doesn't support log Pair.of() data into the
WestWorld or Clearcut directly, it is used for EventLogWriter only

Bug: 202906853
Test: make SettingsRoboTests
Change-Id: I0ca87ca96647f025adbd23f9f93a3cbd5f7d8579
2021-11-09 21:01:40 +08:00
TreeHugger Robot
e535c2b67c [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: 1bb96ff4ce -s ours am: 152ba179f4 -s ours am: 551e444c47 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003

Change-Id: I6a0682ddb06eadafd346fd49fc2fe15c9eadd998
2021-11-09 09:26:26 +00:00
Hugh Chen
eeef648740 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: 53c90efd25 -s ours am: 835a9f0718 -s ours am: c1c7d536a2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003

Change-Id: I33b6116cafab180a8e75c872b9abcfbd5f3f708a
2021-11-09 09:26:25 +00:00
TreeHugger Robot
f4486b6d39 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: f14d3ca0d8 -s ours am: 8257674c53 -s ours am: 156f041f7c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003

Change-Id: I82e96548df086c709b1c3dce80091c3fe3aaad09
2021-11-09 09:26:17 +00:00
Hugh Chen
3fc933fc3e [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: c403c2bd93 -s ours am: b7c8a85e8d -s ours am: 3d50e716e2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003

Change-Id: I30fc370da1527da6e7d3e25d25d6ce3b135c6ad6
2021-11-09 09:26:15 +00:00
TreeHugger Robot
551e444c47 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: 1bb96ff4ce -s ours am: 152ba179f4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003

Change-Id: If5abd41926afc2cb82860ed4c567be70d3d96daf
2021-11-09 08:54:44 +00:00
Hugh Chen
c1c7d536a2 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: 53c90efd25 -s ours am: 835a9f0718 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003

Change-Id: Id88b11715e1625ae8c38e7eac92c056eac141c08
2021-11-09 08:54:43 +00:00
TreeHugger Robot
156f041f7c [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: f14d3ca0d8 -s ours am: 8257674c53 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003

Change-Id: I42b58743673ceecff96a422c58d536387ad1cca8
2021-11-09 08:54:36 +00:00
Hugh Chen
3d50e716e2 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: c403c2bd93 -s ours am: b7c8a85e8d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003

Change-Id: I08e15ccfc07e9546788988f4abc5403ccbb288ed
2021-11-09 08:54:30 +00:00
TreeHugger Robot
827efa0900 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-dev am: effa446a15 am: e831e29cfc -s ours am: 0de4048d64 -s ours am: 276b278225 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145002

Change-Id: Id7a56f8f1a2980e2ad24f97e84da0d754b1bd208
2021-11-09 08:43:00 +00:00
Hugh Chen
dee7e16265 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 528d40e4d1 am: 56b95bd8c0 -s ours am: 09258363f5 -s ours am: 7a5b3bcd86 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145002

Change-Id: I5fc240d60e6a5c54a085e8072e51eed483caa987
2021-11-09 08:43:00 +00:00
TreeHugger Robot
955e153815 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours am: 0e8d3e3c35 -s ours am: 7134e1ac35 -s ours am: 62e555932c -s ours am: 9c1eb61f8e -s ours am: f87658eb94 -s ours am: b950aece42 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145004

Change-Id: I2c2f1d23c3ac0ba9ed7239a5f0f20f0d2ac3c819
2021-11-09 08:42:48 +00:00
TreeHugger Robot
152ba179f4 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: 1bb96ff4ce -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003

Change-Id: I374713caa6f72a15632eff3b43727c7ce6204cad
2021-11-09 08:30:52 +00:00
Hugh Chen
835a9f0718 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: 53c90efd25 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003

Change-Id: I88b4ae3de30e76c8f3ca361d38d8f7a82cf54f39
2021-11-09 08:30:51 +00:00
TreeHugger Robot
8257674c53 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours am: f14d3ca0d8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003

Change-Id: Ifa40a720b8b194b5f09acaba0993f9ebafe21a8c
2021-11-09 08:29:43 +00:00
Hugh Chen
b7c8a85e8d [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours am: c403c2bd93 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003

Change-Id: I14979352bbfa62f9ee0d74e5cc648cc3bc269d05
2021-11-09 08:29:41 +00:00
TreeHugger Robot
276b278225 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-dev am: effa446a15 am: e831e29cfc -s ours am: 0de4048d64 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145002

Change-Id: I3f5f83caa34fb675b12e9a993fcfc672a144d8de
2021-11-09 08:21:44 +00:00
Hugh Chen
7a5b3bcd86 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 528d40e4d1 am: 56b95bd8c0 -s ours am: 09258363f5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145002

Change-Id: Ic54e0498f0566fabbf6f43b8395dd44e140c4a5f
2021-11-09 08:21:43 +00:00
TreeHugger Robot
b950aece42 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours am: 0e8d3e3c35 -s ours am: 7134e1ac35 -s ours am: 62e555932c -s ours am: 9c1eb61f8e -s ours am: f87658eb94 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145004

Change-Id: If240da482776a5f75693a6e27e068563fbb54344
2021-11-09 08:21:33 +00:00
TreeHugger Robot
1bb96ff4ce [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003

Change-Id: Ic253c7431c1c57677820d23d30a0ac3e1841f8f8
2021-11-09 08:10:40 +00:00
Hugh Chen
53c90efd25 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003

Change-Id: I7707b5c24a10c468362fd8a1a3d5a412e7c3c090
2021-11-09 08:10:38 +00:00
TreeHugger Robot
f14d3ca0d8 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into qt-dev am: 7aa03c4821 am: c96d9867c5 -s ours am: c5447d70d3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003

Change-Id: Id8a548cc6bc3f9ca394b68d4db4e1377a139ed56
2021-11-09 08:08:15 +00:00
Hugh Chen
c403c2bd93 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d4e0ed2284 am: d1ee2f41e8 -s ours am: 42d4ef99a5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145003

Change-Id: Ibcd3c269718ac5224e299f55c5e8331907c12078
2021-11-09 08:08:14 +00:00
TreeHugger Robot
0de4048d64 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into rvc-dev am: effa446a15 am: e831e29cfc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145002

Change-Id: I150fd7e98450289f26c94716232a343290143721
2021-11-09 07:59:30 +00:00
Hugh Chen
09258363f5 [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 528d40e4d1 am: 56b95bd8c0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145002

Change-Id: I0bc5589c9157ee6fa8eb56c8daf310c0c7d89ba8
2021-11-09 07:59:28 +00:00
TreeHugger Robot
f87658eb94 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into pi-dev am: 5006367685 -s ours am: 0e8d3e3c35 -s ours am: 7134e1ac35 -s ours am: 62e555932c -s ours am: 9c1eb61f8e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145004

Change-Id: Ib2705b029108440fe528a89fd4c95ab7e50ed23a
2021-11-09 07:58:55 +00:00