TreeHugger Robot
6d9a1b8daa
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: db01149e40
-s ours am: 30f96b0763
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231483
Change-Id: Ic91167be820cbcebd249448c6509c9d58419dc3f
2021-11-15 17:16:05 +00:00
TreeHugger Robot
30f96b0763
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: db01149e40
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231483
Change-Id: I3a812f29f75c27dc319fccea48251719fbae9877
2021-11-15 17:15:55 +00:00
Bill Yi
e749989be0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c6dddd1f0
-s ours am: a83466e2ad
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231359
Change-Id: Ie98d232543ce409f2eb8f158fc7f51ce0820a28a
2021-11-15 17:15:32 +00:00
Bill Yi
a83466e2ad
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c6dddd1f0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231359
Change-Id: I10cf8ab0d3445f6c38b07f15e8d66a9e6d410cb7
2021-11-15 17:15:19 +00:00
TreeHugger Robot
f370e49613
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: bd557d2ddb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231360
Change-Id: I12023a27020b032ef09331011d257df7e3845130
2021-11-15 17:15:00 +00:00
TreeHugger Robot
8996d315ce
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 68eaace6c4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231598
Change-Id: I1907c38df5d05038a5bf7123e7d6dbb0e1650a5d
2021-11-15 17:14:00 +00:00
TreeHugger Robot
bd557d2ddb
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-11-15 17:00:33 +00:00
TreeHugger Robot
db01149e40
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-11-15 17:00:27 +00:00
TreeHugger Robot
68eaace6c4
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-11-15 16:59:20 +00:00
Jeremy Goldman
e2dce3ffab
Merge "Deprecation of legacy VPN types no longer depends on the Provider Model Flag" into sc-v2-dev am: 2d529a4f5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16221118
Change-Id: Ib2a07498176d2f156d1f82f956b8af754c376ea8
2021-11-15 06:07:27 +00:00
Jeremy Goldman
2d529a4f5c
Merge "Deprecation of legacy VPN types no longer depends on the Provider Model Flag" into sc-v2-dev
2021-11-15 05:53:13 +00:00
Shaowei Shen
da06c920b9
Merge "[Sound panel] Use localized string for button text" into sc-v2-dev am: 2874b6442e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16236322
Change-Id: I7b413717713090f236d5dcddd8978927dc4da02b
2021-11-12 09:32:16 +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
2d5641f17b
[Settings] 1. Add configChange for WFC Activity to cover the changes of rotation and screen size am: 6cf16b0aa9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145006
Change-Id: Idea7f177ee4897c20bd7faf773a34e79976f2376
2021-11-12 08:43:51 +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
Jeremy Goldman
c525183a40
Deprecation of legacy VPN types no longer depends on the Provider Model
...
Flag
Bug: 204522922
Test: atest -c SettingsUnitTests
Change-Id: If43978a7536e269e2b1130a260fcedb7af6bc363
2021-11-12 11:25:27 +08:00
Jason Chiu
24a738d79f
Merge "Check the page searchability for both wifi and network provider page" into sc-v2-dev am: 822f98c1a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16241518
Change-Id: I78b5f4b779df83f5d36eaf8eec641c070af84a6d
2021-11-12 03:15:26 +00: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
e26cf14609
Merge "[Provider Model] Fixed Internet Settings always showing "Loading"" into sc-v2-dev am: 47b212c85b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16220934
Change-Id: I0ce173377bc2be615248fa906359550d605c7a35
2021-11-11 18:46:58 +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
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
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
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
Bill Yi
508121be68
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic43492be8ef04f6731f310f02c4edaded94645cb
2021-11-10 18:55:17 +00:00
Bill Yi
c91c41405c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6ac727134512d558c3d0856b1aadfa1e998bfcf9
2021-11-10 18:51:11 +00:00
Bill Yi
c00b4ad5d0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0cbdcbd0dcd7399d07f08e6f19ecebf59e231232
2021-11-10 18:39:13 +00:00
Bill Yi
1c6dddd1f0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6a07f66a40b073e21a143722639117320ac113b5
2021-11-10 18:37:33 +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
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
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
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
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
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
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
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