TreeHugger Robot
bf4586f728
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: db01149e40
-s ours am: b7cb455366
-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: Ia0b219abb8f55896f002301f9823a2350602837d
2021-11-15 17:33:43 +00:00
Bill Yi
7a7da305c0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c6dddd1f0
-s ours am: 16e6040e59
-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: I8904ae5e0a218385cace3ca73c98412eca20aa35
2021-11-15 17:32:51 +00:00
Bill Yi
0cf8d470fe
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b9dbf91cc7
-s ours am: 73bedcdd7d
-s ours am: ef0a786bd7
-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: I0017c6a800c1c593aacff762c3c74c95df466f3a
2021-11-15 17:16:30 +00:00
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
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
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
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
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