Bill Yi
c2cdc020d3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b9dbf91cc7
-s ours am: 73bedcdd7d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231353
Change-Id: Ic5eed8d41e7b9311f91bcf841f01e379e4904f29
2021-11-15 17:16:23 +00:00
Bill Yi
ef0a786bd7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b9dbf91cc7
-s ours am: 73bedcdd7d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231353
Change-Id: I3935762e457e5d6c71030127e6703232f8520282
2021-11-15 17:16:11 +00:00
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
TreeHugger Robot
b7cb455366
[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: Idd94029e31ce22b03f792016670a89110adf3981
2021-11-15 17:15:37 +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
Bill Yi
73bedcdd7d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b9dbf91cc7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231353
Change-Id: I2e8f62e50556e57371cddbcb7be02f75e0630cda
2021-11-15 17:15:08 +00:00
Bill Yi
16e6040e59
[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: I75567b65694e64a0a3c663d2b7a59e63f63e0746
2021-11-15 17:15:02 +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
Bill Yi
c90da69e31
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b9dbf91cc7
-s ours am: 1448652f01
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231353
Change-Id: Ic2ab37161bcce41e34f730ed05671c4b35de486c
2021-11-15 17:14:20 +00:00
Bill Yi
1448652f01
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b9dbf91cc7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231353
Change-Id: I1555278e4eeaa52f305cdfd290fffcc99f4bb0f7
2021-11-15 17:14:05 +00:00
Bill Yi
9ea26dc0ee
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e4d7648c9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16231338
Change-Id: I27c35770fda7546cb966694a31461c94ee34231a
2021-11-15 17:14:05 +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
Ronish Kalia
0b30679a2c
Merge changes from topic "qr-code-and"
...
* changes:
Add tests for QRCodeScannerPreferenceController
Add a new setting for QR Code Scanner button on lockscreen
2021-11-15 16:35:45 +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
Lifu Tang
07c41906ea
Merge "Remove tabs from recent location access page"
2021-11-15 07:57:35 +00:00
Jeremy Goldman
601800f69b
Merge "Deprecation of legacy VPN types no longer depends on the Provider Model Flag" into sc-v2-dev am: 2d529a4f5c
am: e2dce3ffab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16221118
Change-Id: I5fb7964a6c359175d5c5930e785f4020769030aa
2021-11-15 06:19:04 +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
sandeepjs
40ffe69a3e
eSIM deprecated API test Refactoring
...
Test: build
Bug: 159354974
Change-Id: Iedeb90f186ab9f82894e2fecef86d339c8989542
2021-11-15 05:44:54 +00:00
SongFerng Wang
3c9580d573
Revert "Device do network scan after user rotates NetworkSelection page"
...
This reverts commit f54ead1f94
.
Reason for revert: using another way. ag/16259258
Change-Id: I4ae695237cb3417cb3d08fcbb3354dc649681aab
2021-11-15 04:50:25 +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
TreeHugger Robot
5cee04e16e
Merge "Set SYNC_PARENT_SOUNDS settings directly"
2021-11-14 18:13:20 +00:00
Kevin Han
4b59b75c59
Merge "Unhibernate an app when a user exempts it"
2021-11-12 21:09:07 +00:00
Lifu Tang
df1b7c6979
Remove tabs from recent location access page
...
Bug: 185382276
Test: manual - screenshot/Az2obQLjdy7vVv9
Change-Id: Ic2f3004d57108e136c622290e8d78bf284a09258
2021-11-12 12:43:43 -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
TreeHugger Robot
59f749e112
Merge "Revert "Revert "Update styling of NLS dialog"""
2021-11-12 14:01:31 +00:00
Julia Reynolds
617a562660
Revert "Revert "Update styling of NLS dialog""
...
This reverts commit 6d37fdc546
.
Reason for revert: The Android Auto test has been disabled
Change-Id: Iddbe3098d79fbe33c16c2a9c06c8df4a22b49afb
Bug: 205920324
Fixes: 191331361
2021-11-12 11:46:37 +00:00
Jeremy Goldman
2f4d3e5309
Merge "Deprecation of legacy VPN types no longer depends on the Provider Model Flag"
2021-11-12 10:27:49 +00:00
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
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
Jeremy Goldman
ab1b2be739
Deprecation of legacy VPN types no longer depends on the Provider Model
...
Flag
Bug: 204522922
Test: atest -c SettingsUnitTests
Change-Id: If14354f4c1b5cb1ef74fc8b94b028006ac1a99b3
2021-11-12 11:13:15 +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
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