Shaowei Shen
1f41bae30f
Merge "[Sound panel] Use localized string for button text" into sc-v2-dev am: 2874b6442e
am: da06c920b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16236322
Change-Id: I39cf8181840d77c828183f3e11b8996ea5bb7551
2021-11-12 09:49:52 +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
29192dbc2d
[Settings] 1. Add configChange for WFC Activity to cover the changes of rotation and screen size am: 6cf16b0aa9
am: 2d5641f17b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16145006
Change-Id: Ia5c14ba3bde1a49b4f360bd2444253651e63d305
2021-11-12 08:56:12 +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
Jason Chiu
a9c97f4b60
Merge "Check the page searchability for both wifi and network provider page" into sc-v2-dev am: 822f98c1a4
am: 24a738d79f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16241518
Change-Id: Idbd2b242fa92a2f3c180066adb1d4f4ffade74d6
2021-11-12 03:26:41 +00: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
d8e3836c10
Merge "Revert "Update styling of NLS dialog""
2021-11-11 20:52:02 +00:00
TreeHugger Robot
8f8e00a7b7
Merge "[Provider Model] Fixed Internet Settings always showing "Loading"" into sc-v2-dev am: 47b212c85b
am: e26cf14609
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16220934
Change-Id: If309ebe2595d2a138ca45f8f4921144b83a00be4
2021-11-11 19:11:10 +00:00
Julia Reynolds
6d37fdc546
Revert "Update styling of NLS dialog"
...
This reverts commit 358fe8e508
.
Reason for revert: Android Auto has a test depending on the old layout of the dialog, and we need to revert until that test is updated
Change-Id: I47095be8c89d5bea27de835ea3fa700e3b90b49d
Bug: 205920324
Bug: 191331361
2021-11-11 18:55:35 +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
Adam Bookatz
45650159ce
Merge "Multiuser perfetto metric: Settings tracepoints"
2021-11-11 17:10:42 +00:00
SongFerng Wang
990b4c4662
Merge "Device do network scan after user rotates NetworkSelection page"
2021-11-11 11:51:24 +00:00
SongFerngWang
f54ead1f94
Device do network scan after user rotates NetworkSelection page
...
Add the networkSelectSettings fragment into new activity, and set
the activity's android:configChanges as
"orientation|keyboard|keyboardHidden|screenSize|screenLayout
|smallestScreenSize".
Bug: 204039043
Test: atest AutoSelectPreferenceControllerTest (pass)
atest OpenNetworkSelectPagePreferenceControllerTest (pass)
atest NetworkSelectSettingsTest (pass)
Change-Id: Ic933c2294401bc50e105ddcfd2a17886d0bbefc3
2021-11-11 18:16:23 +08: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
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