Commit Graph

98253 Commits

Author SHA1 Message Date
TreeHugger Robot
7da3b7c22d [automerger skipped] Merge "Support Settings deep links highlighting the menu entries" into sc-v2-dev am: 22ff8c7832 -s ours am: 0b3b56bcd4 -s ours
am skip reason: Merged-In I2249d4779d69bc0934b9c57900b903638ad6700b with SHA-1 7b64761bd2 is already in history

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

Change-Id: I78564c58c10827ff70f03c7813bf07d13bb228ef
2021-11-11 06:33:33 +00:00
TreeHugger Robot
0b3b56bcd4 [automerger skipped] Merge "Support Settings deep links highlighting the menu entries" into sc-v2-dev am: 22ff8c7832 -s ours
am skip reason: Merged-In I2249d4779d69bc0934b9c57900b903638ad6700b with SHA-1 7b64761bd2 is already in history

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

Change-Id: I2b8fde77acefc3f6de21f326b0dda764b5d80dd0
2021-11-11 06:16:01 +00:00
Jason Chiu
a1c0d96548 [automerger skipped] Merge "Support Settings deep links highlighting the menu entries" into sc-v2-dev-plus-aosp am: 6cf6f846cb -s ours
am skip reason: Merged-In I2249d4779d69bc0934b9c57900b903638ad6700b with SHA-1 646a31e80a is already in history

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

Change-Id: I8626c32342f7e7ed30e6a567800444867c566f66
2021-11-11 06:09:52 +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
Jason Chiu
6cf6f846cb Merge "Support Settings deep links highlighting the menu entries" into sc-v2-dev-plus-aosp 2021-11-11 05:57:33 +00:00
Andrii Kulian
68cb4deac5 Merge "Sticky placeholder and adjacent finish rule in Settings" into sc-v2-dev am: 0ac5228e54 am: aa8cf9bcfd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16176771

Change-Id: I5a4b1f2fe3736d6f1a9a5fcb1ca6b1a576296c81
2021-11-11 04:11:01 +00:00
Andrii Kulian
aa8cf9bcfd Merge "Sticky placeholder and adjacent finish rule in Settings" into sc-v2-dev am: 0ac5228e54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16176771

Change-Id: I7e1f194c31af59696990102e5ac75ddec07f6441
2021-11-11 03:58:39 +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
Jason Chiu
7b64761bd2 Support Settings deep links highlighting the menu entries
Bug: 203492419
Test: visual
Change-Id: I2249d4779d69bc0934b9c57900b903638ad6700b
Merged-In: I2249d4779d69bc0934b9c57900b903638ad6700b
2021-11-11 02:29:54 +00:00
Julia Reynolds
c320ef338e Merge "Properly show conversation settings" 2021-11-10 21:13:45 +00:00
Julia Reynolds
a1c0dc75cd Properly show conversation settings
... when the backing shortcut is missing, so users can change
notification settings when the shortcut hasn't yet been recreated by the
app when setting up a new device

Test: Robotests (confirmed that the 2 controllers that used
mConversationInfo already tested for null), manual
Fixes: 203991823

Change-Id: I477c6b0aef0d978767788cbfc1bfadea4d36cda8
2021-11-10 14:16:42 -05:00
YUKAI HUNG
a7412b33b2 Merge "Fix incorrect usage for the logging method to cause no data in WW" into sc-v2-dev am: 6e12a31e5f am: a1d72c11c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16221114

Change-Id: I4c9d5265d8abd4a73a19df2afc5c718d8827ddab
2021-11-10 10:10:05 +00:00
YUKAI HUNG
a1d72c11c5 Merge "Fix incorrect usage for the logging method to cause no data in WW" into sc-v2-dev am: 6e12a31e5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16221114

Change-Id: I2d78a4287aa740f1e583c8f570d52c2dc8d90bf7
2021-11-10 09:50:59 +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
Arc Wang
34a77d6d08 Merge "[Large sceen] Don't go Settings 2-pane deep link flow if not task root" into sc-v2-dev am: 7c86d3d7a7 am: 51a7c73af7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16221116

Change-Id: I9a2e226a798671350451663731a021a297b7e7a7
2021-11-10 09:19:23 +00:00
Arc Wang
1d7be75414 Merge "[Large screen] Shows MobileNetworkActivity in 2-pane" into sc-v2-dev am: 084cfd4142 am: 8458e95650
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16221122

Change-Id: I9e1914215147fb700bd4d850fd5ce1a0a6433711
2021-11-10 09:19:13 +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
51a7c73af7 Merge "[Large sceen] Don't go Settings 2-pane deep link flow if not task root" into sc-v2-dev am: 7c86d3d7a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16221116

Change-Id: I75147641e475df2c98135c956a4bb6ef3ee12d69
2021-11-10 09:06:45 +00:00
Arc Wang
8458e95650 Merge "[Large screen] Shows MobileNetworkActivity in 2-pane" into sc-v2-dev am: 084cfd4142
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16221122

Change-Id: I6b2bc1859de60b495e84fcfab10474d5791a6290
2021-11-10 09:06:34 +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
TreeHugger Robot
67cb160ae6 Merge "Support Settings deep links highlighting the menu entries" 2021-11-10 07:56:11 +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
d48f36edf1 Merge "Let activity of "add language" fit settingsactivity style." into sc-v2-dev am: 50726121b4 am: d0c1f6eb92
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16220935

Change-Id: I9cf743de036d037daff9f1901d4d08b2d99ff5f8
2021-11-10 07:30:56 +00:00
Tom Hsu
d0c1f6eb92 Merge "Let activity of "add language" fit settingsactivity style." into sc-v2-dev am: 50726121b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16220935

Change-Id: Ie39a2fc21627305052910669cdacbd16ff329ece
2021-11-10 07:18:12 +00: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
Jason Chiu
646a31e80a Support Settings deep links highlighting the menu entries
Fix: 203492419
Test: visual
Change-Id: I2249d4779d69bc0934b9c57900b903638ad6700b
2021-11-10 06:58:21 +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
1961f6ac3e Merge "Fix "battery saver" not in the top seaching result for indexing" into sc-v2-dev am: 5afb04e1b8 am: 0f6c95d4fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16220939

Change-Id: If0c770aabefcc0644045ec272a32a1bfae022182
2021-11-10 02:37:04 +00:00
TreeHugger Robot
0f6c95d4fd Merge "Fix "battery saver" not in the top seaching result for indexing" into sc-v2-dev am: 5afb04e1b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16220939

Change-Id: I38c253e43ca1165916550503b13276bcf23b672a
2021-11-10 02:18:39 +00: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
Julia Reynolds
6c43335181 Merge "Add ability to force rebuild list" 2021-11-09 16:34:10 +00:00
Julia Reynolds
30055e3565 Merge "Update styling of NLS dialog" 2021-11-09 16:30:11 +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
907cbb2129 Merge "Fix incorrect usage for the logging method to cause no data in WW" into sc-v2-dev am: 6f6149c7ba am: 22b763486d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16220930

Change-Id: I47be5b62b5a7b407698ba4815415e1abd5a9bd4e
2021-11-09 15:44:26 +00:00
TreeHugger Robot
22b763486d Merge "Fix incorrect usage for the logging method to cause no data in WW" into sc-v2-dev am: 6f6149c7ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16220930

Change-Id: Iefc9f1b9719bd1cc57bf79d7d8d873a4f4dbc995
2021-11-09 15:22:38 +00: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
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
331335820d [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: e535c2b67c -s ours am: fa15a91ad9 -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: Ib57e5e22bbaf423a97053785ac436b0f120df191
2021-11-09 09:58:12 +00:00
Hugh Chen
0feacef68a [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: eeef648740 -s ours am: 8da12696bc -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: If1ec1e4537af893f843b105c92bdd15168bf35fb
2021-11-09 09:58:11 +00:00
TreeHugger Robot
31fa65eb1a [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: f4486b6d39 -s ours am: dc46129f1d -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: Ib94d2bf7ca4fb8f35be5b9a224d7417aeac4b114
2021-11-09 09:58:01 +00:00
Hugh Chen
7957c21d76 [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: 3fc933fc3e -s ours am: a2b02e7f93 -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: Id3237015e1dec50d60b400ce0b69333f72e8957a
2021-11-09 09:58:00 +00:00
TreeHugger Robot
82ba7b6662 [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: 82ddadaca5 -s ours am: b3e697ce9e -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: Id808c2030c3740c238571b112a561cfe185accd3
2021-11-09 09:57:50 +00:00
Hugh Chen
b61c2ec9e5 [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: d0b5804f61 -s ours am: beea5c7290 -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: I99e34a7e28ed801ca6f232c80e54e78f49436d42
2021-11-09 09:57:49 +00:00
TreeHugger Robot
28edba36dc [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: 4ece52b415 -s ours am: 9039d6dc85 -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: I26c695079fc2d09dae2085fb7f564dd5b5ed6ca0
2021-11-09 09:57:39 +00:00
Hugh Chen
6a7402e095 [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: 99b4f6964a -s ours am: 3aaa818d0e -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: Icb44245d1b8feab607afa8223ba1891da00e3340
2021-11-09 09:57:38 +00:00
TreeHugger Robot
285da24488 [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: 7a2bb50ebb -s ours am: e1bc76a7ec -s ours am: b24289cc4c -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: I65c1445490830b0567ee035434ec6ecce250e9cd
2021-11-09 09:57:27 +00:00