Becca Hughes
8912f693f7
Merge "DO NOT MERGE Hide provider from this list if autofill provider" into udc-dev am: c74ccee659
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22792839
Change-Id: I74552f7341035452c3baacbb9debc3349051b72f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 17:09:35 +00:00
Becca Hughes
c6a74847e4
DO NOT MERGE Hide provider from this list if autofill provider am: 99f1d5448d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22792839
Change-Id: I79a8f47acb16ac995333c7c40a0309c83e67404c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 17:09:06 +00:00
Becca Hughes
f1ad544cbe
Merge "DO NOT MERGE Listen for updates to autofill/credman provider" into udc-dev am: 4fc5b0e7b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22764836
Change-Id: I5dd7579e3fb61a1d3e51801dc98ef249f2d1835b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 17:07:28 +00:00
Becca Hughes
a620612b9f
DO NOT MERGE Listen for updates to autofill/credman provider am: 688b023d09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22764836
Change-Id: I0e113f37760847067042e41dd1a3e48d398c0270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 17:06:41 +00:00
Becca Hughes
c74ccee659
Merge "DO NOT MERGE Hide provider from this list if autofill provider" into udc-dev
2023-04-27 16:35:18 +00:00
Becca Hughes
4fc5b0e7b3
Merge "DO NOT MERGE Listen for updates to autofill/credman provider" into udc-dev
2023-04-27 16:35:07 +00:00
Piotr Wilczyński
eef23f441c
Revert "Back up the smooth display setting"
...
Revert submission 22741921-cherrypick-bug-211737588-lp9s6r5vn3
Reason for revert: b/279215664
Reverted changes: /q/submissionid:22741921-cherrypick-bug-211737588-lp9s6r5vn3
Change-Id: I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b
Merged-In: I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b
2023-04-27 16:13:03 +00:00
Bill Yi
9b25911c3c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: a04b6df040
-s ours am: 9bb60a200e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801140
Change-Id: If5480716680eb2a785cff991e320999dd0671e8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:07:51 +00:00
Bill Yi
49103dfc2e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efc9e1994c
-s ours am: 9abc703e40
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801140
Change-Id: I370319fcbc37e1a632a2e8a6d20083ece4b69566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:07:43 +00:00
Bill Yi
155b5266fc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 171e66e000
-s ours am: 4caa1ee4c3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801124
Change-Id: If51f800f04ad40049ee3508ff02d9ded8cf7f7b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:07:37 +00:00
Bill Yi
0ebc9d790d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c416adc1df
-s ours am: d4ba4def6a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801124
Change-Id: Ie6058d58565c8b9f65cc7cb5a61b1367141dd17b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:07:30 +00:00
Bill Yi
a70fa93e6b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 499308fa2c
-s ours am: dcd5353e67
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801123
Change-Id: Ib6beab44e6862b85e5a5ebb28f9573b894a69dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:07:19 +00:00
Bill Yi
340b85bb5b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a05355cc0a
-s ours am: 22ac363063
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801123
Change-Id: Idb3db0d1797033ce2854741532be1f0eb32823fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:06:56 +00:00
Treehugger Robot
46bd7feab6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766
-s ours am: 0cb641a695
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019
Change-Id: I1943d52ba4d0aa955897e823a3860ef619d98915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:05:02 +00:00
Treehugger Robot
0b8d81c18c
Merge changes from topic "tc_change_23042206_55" into tm-qpr-dev-plus-aosp am: 953f6167e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019
Change-Id: I6372af8e100d0ab6d7709cc180c13efce4ff40fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:04:44 +00:00
Zoey Chen
cfaa13442c
[Settings] UI part: Add metrics for language
...
Bug: 279915462
Test: atest
Change-Id: Ie13c57b2b398beb48dfe0ac289ec336483575445
2023-04-27 15:55:45 +00:00
Chaohui Wang
68d638707b
Fix Data Saver page crashed when rotate
...
This is because before fix mLoadAppRunnable is async run. And the
getContext() within it will return null when the Fragment in some not
ready lifecycle.
Use viewLifecycleOwner.lifecycleScope.launch to ensure the async
function will only be run when the view is ready, and automatically
canceled when out of scope.
Since this requires Kotlin Coroutine so migrate DataSaverSummary to
Kotlin, other functionality are keep no change.
Fix: 279863347
Test: Manual
Change-Id: I2e97a071c103e63b3306b801fc38f4704e3be0d2
2023-04-27 20:08:19 +08:00
TreeHugger Robot
ffb6adb9e6
Merge "Change drop down strings to "View by ..."" into udc-dev am: d3897afda6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905739
Change-Id: Ia3b6ce10e3db8a9a04c43251e96468fbb6dbde05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:28:41 +00:00
Treehugger Robot
118a51ad6d
Merge "[Regional Preferences]] Update the string of header" into udc-dev am: d12716bb12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905740
Change-Id: I6a566a5438d02e0600465072e971b2c0ea4a28ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:27:47 +00:00
Menghan Li
cd4c0f15a8
Merge "Fix "Open <a11y service> " starts from end for RTL language" into udc-dev am: 0e32500259
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891105
Change-Id: I85ac1c91d02661c77259fdb54d1e8c23a79971dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:24:35 +00:00
TreeHugger Robot
d3897afda6
Merge "Change drop down strings to "View by ..."" into udc-dev
2023-04-27 11:12:45 +00:00
Treehugger Robot
d12716bb12
Merge "[Regional Preferences]] Update the string of header" into udc-dev
2023-04-27 11:02:53 +00:00
Menghan Li
0e32500259
Merge "Fix "Open <a11y service> " starts from end for RTL language" into udc-dev
2023-04-27 10:57:17 +00:00
TreeHugger Robot
d56c097761
Merge "Update battery saver footer string" into udc-dev am: f566e6de2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901659
Change-Id: I4ecd02f3c208395b88ab55d0adb58de1381d7f0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 10:42:42 +00:00
TreeHugger Robot
f566e6de2f
Merge "Update battery saver footer string" into udc-dev
2023-04-27 10:29:25 +00:00
Edgar Wang
4cf60b02b2
Fix test cases failed in WinscopeTraceTest
...
Fixes: 276682211
Test: autotest
Change-Id: Id31d5c4e2e1dd61c4af24e042f4aaddee3d33439
2023-04-27 10:22:29 +00:00
Treehugger Robot
a6f0662924
Merge "[Settings] Update code owner" am: 709b27384b
am: c40b06b687
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2527125
Change-Id: I5390a0b64018dbeb74a79f81b94ff7a47712106a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 10:21:35 +00:00
Zoey Chen
05d70bb710
Merge "Fix AppEntry.extraInfo ClassCastException" into udc-dev am: bee241bd5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891101
Change-Id: I1a2de67059623153f925386f410075aedae934bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 10:21:01 +00:00
Zoey Chen
c9994c0a54
[Regional Preferences]] Update the string of header
...
Bug: 279549042
Test: local test
Change-Id: I4983618c91f0e5ea83c4095491be7bb4433f6d2b
2023-04-27 09:44:17 +00:00
Treehugger Robot
c40b06b687
Merge "[Settings] Update code owner" am: 709b27384b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2527125
Change-Id: Ib0806c0bf18797da3e44dbe4800283430120b49a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 09:42:22 +00:00
Zoey Chen
bee241bd5a
Merge "Fix AppEntry.extraInfo ClassCastException" into udc-dev
2023-04-27 09:35:24 +00:00
Zaiyue Xue
8888e5eea7
Change drop down strings to "View by ..."
...
https://screenshot.googleplex.com/8J4KQW9FKB9yjsL.png
Bug: 279654750
Fix: 279654750
Test: manual
Change-Id: Ia66db0910b318b1e819960d08294a4303497b3e7
2023-04-27 17:33:04 +08:00
Treehugger Robot
709b27384b
Merge "[Settings] Update code owner"
2023-04-27 09:12:59 +00:00
Edgar Wang
f8278dcd99
Merge "Remove restricted icon in SettingsMainSwitchBar" into udc-dev am: e0049f0ae8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22569798
Change-Id: I71f04286cb8a0659e9d938f22f2b3707cc9d9ade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 09:10:35 +00:00
menghanli
fa5f8d3b0a
Fix "Open <a11y service> " starts from end for RTL language
...
Root cause: TextView space uses "wrap_content" to not match the parent width
Solution: Use "match_parent" instead
Bug: 279646115
Test: anual test for RTL and LTR language
Change-Id: If4091958e5ab4323c881732a7b38814dc93db4a1
2023-04-27 17:09:31 +08:00
Edgar Wang
e0049f0ae8
Merge "Remove restricted icon in SettingsMainSwitchBar" into udc-dev
2023-04-27 08:27:42 +00:00
Weng Su
8c50edd1e7
Fixed speed selection lost when changing password in Wi-Fi hotspot settings
...
- Use current SoftApConfiguration to build new SoftApConfiguration to keep unchanged properties
Bug: 279717060
Test: manual test
atest -c WifiTetherSettingsTest
Change-Id: I3ee7960b13b339445cc79c3d440f5c56c78c015f
2023-04-27 14:55:52 +08:00
Wesley Wang
1aaad53e09
Update battery saver footer string
...
Bug: 279825606
Test: make SettingsRoboTests
Change-Id: I8fb05d9db8037ab6b3c8be57b2891c8f022f1440
2023-04-27 13:36:45 +08:00
Treehugger Robot
97c42d8736
Merge "Fix AppEntry.extraInfo ClassCastException" am: 327867e56b
am: 83f2d27e35
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2564510
Change-Id: I21f648353029042ec50608218415eb2dd95c41e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 05:04:41 +00:00
Treehugger Robot
83f2d27e35
Merge "Fix AppEntry.extraInfo ClassCastException" am: 327867e56b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2564510
Change-Id: I1ad0bc2266bb528fccf3e3e83f4fd06ca47bb3c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 04:25:07 +00:00
Zoey Chen
fa5ea719de
Fix AppEntry.extraInfo ClassCastException
...
AppEntry's extraInfo is an Object class, force cast it to Boolean may
cause ClassCastException.
Bug: 279639370
Bug: 279333773
Test: local test
Change-Id: Ie135d9a49fdac6623f6b29a13ddf83896a911712
Merged-In: Iccbe9b669011c5061f1c8b3998632f05fbd8a02f
2023-04-27 03:48:38 +00:00
Treehugger Robot
327867e56b
Merge "Fix AppEntry.extraInfo ClassCastException"
2023-04-27 03:43:58 +00:00
Grace Cheng
340a0870d7
Merge "Fix flicker of “touch to unlock anytime” toggle" into udc-dev am: 2b44fc26d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898825
Change-Id: I09645651a8da18508f7155dc0d0a075f44da8bef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 02:37:49 +00:00
Grace Cheng
2b44fc26d1
Merge "Fix flicker of “touch to unlock anytime” toggle" into udc-dev
2023-04-27 01:57:39 +00:00
Julia Reynolds
265281dee1
Merge "Fix channel panel UI on 3 button nav devices" into udc-dev am: 6c7a1524d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22889321
Change-Id: I9c2f6c39a13bfa8275e22d97aaa534a088cc2d81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 01:35:48 +00:00
Julia Reynolds
6c7a1524d3
Merge "Fix channel panel UI on 3 button nav devices" into udc-dev
2023-04-27 00:52:15 +00:00
Grace Cheng
54d1cfdae0
Fix flicker of “touch to unlock anytime” toggle
...
Fixes flicker of toggle by setting not visible when launching confirm
pin/pattern/password or enrollment prior to displaying
FingerprintSettings. Also cleans up FingerprintSettings and
security_settings_fingerprint.xml to better separate SFPS and non-SFPS
logic and rename methods for clarity
Test: (manual) navigate to sfps fp settings and observe toggle doesn’t flicker
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintSettingsRequireScreenOnToAuthPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintSettingsUnlockCategoryControllerTest
Fixes: 263843645
Change-Id: Ide3a666fc31b926ac14645dc22d090f77d81f901
2023-04-27 00:29:09 +00:00
Becca Hughes
688b023d09
DO NOT MERGE Listen for updates to autofill/credman provider
...
The provider for both of these are in Settings
and this will refresh the CredMan section of
the page if either of these change.
Test: make
Bug: 278919696
Change-Id: Ia82c3533540e52aaa26a68e0a27f0e496728b87f
2023-04-26 22:34:07 +00:00
Menghan Li
20b3bb1c17
Merge "Fix the gradient drawable orientation is not mirrored for RTL alignment" into udc-dev am: 1f4ec6257f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869958
Change-Id: Id25283b14118bcc075158c6dd53e255f9b449c3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-26 22:04:51 +00:00
Menghan Li
1f4ec6257f
Merge "Fix the gradient drawable orientation is not mirrored for RTL alignment" into udc-dev
2023-04-26 21:27:47 +00:00