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
Jack Yu
2a2e0275cc
NFC support in work profile
...
Configure NFC payment settings based on userId.
Bug: 202367033
Test: mauanl tests
Change-Id: I97e275f374d34618b64188d5de185ec6c527e0fd
2021-11-15 19:03:34 +08: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
SongFerngWang
13aadad7fa
Device do network scan after user rotates NetworkSelection page
...
To avoid to do oncreate when device is rotated or the screenSize
changed. Adding the activity's android:configChanges as
"orientation|keyboard|keyboardHidden|screenSize|screenLayout
|smallestScreenSize". (Based on SettingsHomepageActivity's settings
and the smallestScreenSize is for screensize changed on
different display.)
Bug: 204039043
Test: atest AutoSelectPreferenceControllerTest (pass)
atest OpenNetworkSelectPagePreferenceControllerTest (pass)
atest NetworkSelectSettingsTest (pass)
Change-Id: I6aa009fc52a85024a29bf48a3e7d1aadcab067d8
2021-11-15 12:46:34 +08:00
Weng Su
eb70b243f7
Fix the CtsVerifier issue
...
- The "android.settings.WIFI_SETTINGS" intent-filter needs to be the
first element of the intent-filter in the activity for profile intent
filters
- Redirect the "android.settings.WIFI_SETTINGS" action to Internet
Settings via FRAGMENT_CLASS meta-data
- Add PRIMARY_PROFILE_CONTROLLED meta-data to WifiSettings2Activity
- Remove unnecessary WifiSettings2Activity from Settings.java
Bug: 205258444
Test: manual test
- Long press the Internet Tile in QS for WIFI_SETTINGS action testing
- Use adb command to test the shortcut action
adb shell am start com.android.settings/.Settings\\\$WifiSettings2Activity
Change-Id: I9ac397828edf1083efcf790eb41b3e978ed6bdca
2021-11-12 15:06:05 +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
Xin Li
bf45599d43
Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918
...
Bug: 205056467
Merged-In: I9ac05f5da437030e1b5db082ddaf7959f82acccd
Change-Id: Iaf8ebc4877a8276672354b45db0dd502c0f71bd3
2021-11-11 16:54:23 +00:00
SongFerngWang
d42ff2a86b
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
Merged-In: Ic933c2294401bc50e105ddcfd2a17886d0bbefc3
2021-11-11 18:16:40 +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
Sunny Shao
d7f302fb4e
Fix suw display size flicker problem
...
- Swipe the preview area will invoke the OnGlobalLayoutListener.
- Sometime it cause a flicker when scroll view scrolling up and
preivew area swiping.
- It is no need to scroll up if the height of scroll view does not change.
Fixes: 205918748
Test: manual test
Change-Id: I8ed5454d32f0cf2a7bc3bac45c7aa054ce929c4b
2021-11-11 15:20:06 +08:00
Jason Chiu
3af73364ba
Support highlighting the menu entry for Search results
...
1. Add a receiver to monitor the search state
2. Shoe/hide the menu highlight in the listener
3. Highlight the menu entry in SearchResultTrampoline
4. Enable/disable the receiver in SettingsInitialize
Bug: 205781792
Test: manual, robotest
Change-Id: Ia04901f504172f4f0c7b4b2ea7eda5f3713f676d
2021-11-11 14:33:26 +08: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
Mill Chen
e6554d23a5
Revert "Revert "Update animation for fingerprint edu page""
...
This reverts commit ba0a012b57
.
Fix: 204719520
Test: Settings should not crash when entering fingerprint edu page
Change-Id: If79fc50bbd6b198e7fccc52fce66c27cf3761d6d
2021-11-11 11:18:41 +08: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
b9dbf91cc7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I70122c3010dc24d428cba88efb50b95275ee635a
2021-11-10 18:47:20 +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
Bill Yi
1246b8bc86
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b546c8aa3e
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231358
Change-Id: I612ad1b35d17933063a2d083bccf762b222a8273
2021-11-10 18:36:05 +00:00
Bill Yi
b546c8aa3e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6739a3e0bbf088d750f5b1e52e5dd0f82bcf2be4
2021-11-10 18:35:55 +00:00
jasonwshsu
9fcd1f9c1e
Provide ability to link to Color Inversion page via Intent
...
Bug: 202480583
Test: manual test
Change-Id: Ie497a9a391272d857cab87aacbb1184e3fd845b3
2021-11-11 02:23:34 +08:00
Etienne Ruffieux
e004eaa51b
Make BluetoothCodecConfig and BluetoothCodecStatus public
...
Tag: #feature
Bug: 200202780
Test: make RunSettingsRoboTests
Change-Id: I2a81216de050b143cee5c537d899a699d5012330
2021-11-10 10:12:51 +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