Michael Mikhail
0d1b67b73e
Merge changes from topic "cherrypick-volume-gar-chain-" into udc-qpr-dev am: c156b6c427
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830401
Change-Id: Ied51926e720f598bceb21bae336d77d4313b6724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 13:52:36 +00:00
Michael Mikhail
c156b6c427
Merge changes from topic "cherrypick-volume-gar-chain-" into udc-qpr-dev
...
* changes:
Trigger talkback for notification volume change
Add content description to volume title in settings.
2023-06-30 12:56:45 +00:00
Treehugger Robot
55e6446579
Merge "Clean up Kotlin FeatureFactory.getFactory(context)"
2023-06-30 12:46:54 +00:00
Treehugger Robot
90325d87cb
Merge "[Settings] Fix inactive SIM show display name with subectiption id." into udc-qpr-dev am: 369a1097c8 am: 063ba027f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23844846
Change-Id: Idbedec3b88650b6a64c944bc6d62d2c1124dbb7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 08:15:39 +00:00
Treehugger Robot
063ba027f7
Merge "[Settings] Fix inactive SIM show display name with subectiption id." into udc-qpr-dev am: 369a1097c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23844846
Change-Id: Icbb09dc1917780104f35e797bffd5b2c51f6ec5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 07:34:05 +00:00
Treehugger Robot
369a1097c8
Merge "[Settings] Fix inactive SIM show display name with subectiption id." into udc-qpr-dev
2023-06-30 06:55:47 +00:00
tom hsu
0b3da89a91
[Settings] Fix inactive SIM show display name with subectiption id.
...
- Cached active SIM' display name with last 4 digits phone number to
avoid that this active SIM change to inactive SIM then show the
display name with subscription id.
Bug: 271567615
Test: Manual test passed
Test: atest passed
Change-Id: I119d60ab4e92b1f04fb42f96df10bc81aa378a7c
2023-06-30 05:51:40 +00:00
Zoey Chen
29a9e2c3c2
[Panlingual] Change the metric's string in Languages am: 6358f613cf am: 35920cd80f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23869863
Change-Id: I8f6f0e0c2553ffe213f9694983eab58c69358928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 05:45:24 +00:00
Zoey Chen
35920cd80f
[Panlingual] Change the metric's string in Languages am: 6358f613cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23869863
Change-Id: I1c657933cad5e0d7fc20d7ce323cf9045e8fdb65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 05:02:21 +00:00
Quang Anh Luong
36d71f8785
Check P2P channel before requesting network info
...
WifiP2pSettings requests network info from WifiP2pManager whenever it
gets onDeviceInfoAvailable, but sChannel may be null causing an
IllegalArgumentException. Check that sChannel is not null before
requesting network info.
Bug: 289004627
Test: atest WifiP2pSettingsTest
Change-Id: Ied8c3f8a894683d7b8e368e5c52343adb7d05e4b
2023-06-30 12:21:30 +09:00
Zoey Chen
6358f613cf
[Panlingual] Change the metric's string in Languages
...
Bug: 279915462
Test: manual
Change-Id: I8e59f9acb068640da64d2a29cc6074b388994554
2023-06-30 02:59:10 +00:00
Hao Dong
b911186928
Merge "Fix pattern rotation header text." into udc-d1-dev am: 04b1932b25
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23833033
Change-Id: Icf5479eba2dd94fa40c41cdea7ae4d86e9f58a25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 00:07:43 +00:00
Hao Dong
55ec9b88d6
Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev am: 72f2058d3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830605
Change-Id: I0411207e8f9a2c955c268b456b83f0b9c871dbb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-30 00:06:58 +00:00
Hao Dong
04b1932b25
Merge "Fix pattern rotation header text." into udc-d1-dev
2023-06-29 23:52:00 +00:00
Hao Dong
72f2058d3e
Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev
2023-06-29 23:51:50 +00:00
Treehugger Robot
65eb0a5ec9
Merge "After deleting guest user, switch back to previous instead of user0." into udc-qpr-dev am: e42dcd738d am: bb87b47d60
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830766
Change-Id: Iaebab8a58ef5e4be016910e846402667d660b366
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 17:59:29 +00:00
Treehugger Robot
bb87b47d60
Merge "After deleting guest user, switch back to previous instead of user0." into udc-qpr-dev am: e42dcd738d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830766
Change-Id: Ic1ec5e652cff3d5a594230038030ad2f32e3bb05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 17:15:58 +00:00
Treehugger Robot
e42dcd738d
Merge "After deleting guest user, switch back to previous instead of user0." into udc-qpr-dev
2023-06-29 16:42:19 +00:00
Chaohui Wang
8f0b2d15c6
Clean up Kotlin FeatureFactory.getFactory(context)
...
Replace with featureFactory.
Bug: 286764889
Test: m Settings
Change-Id: I30bd2e9b25e1681d7694939dd8ec84fcd6fd7c08
2023-06-29 23:10:37 +08:00
Ante Culo
a2041569e2
Merge "Fix Inline UWB toggle setting"
2023-06-29 15:03:20 +00:00
Joshua Mccloskey
cde233abf0
Merge "Moving FingerprintSettings to Kotlin"
2023-06-29 12:31:22 +00:00
Chaohui Wang
99457e53a8
Clean up assist gesture from Settings
...
This one is replaced by "Press & hold power button".
Bug: 287566056
Test: m Settings
Change-Id: Ic9fe8ab29a0b72f1a47f05b18da99ccf68a7f766
2023-06-29 18:17:10 +08:00
Chaohui Wang
a935e680b0
Merge "Refactor FeatureFactory"
2023-06-29 09:01:17 +00:00
Tetiana Meronyk
a15932274b
Merge "Remove "Allow guest to use phone" from devices without telephony." into udc-qpr-dev am: f059fb9a27 am: 434b34c79f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23781311
Change-Id: Ie611bc46b118990db4ea58ff1bc17c953b7c9a21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 08:43:49 +00:00
Tetiana Meronyk
434b34c79f
Merge "Remove "Allow guest to use phone" from devices without telephony." into udc-qpr-dev am: f059fb9a27
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23781311
Change-Id: I8ef824acc1e0d61f520ecf0fb6cdc0486200c73e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 08:02:19 +00:00
Tetiana Meronyk
f059fb9a27
Merge "Remove "Allow guest to use phone" from devices without telephony." into udc-qpr-dev
2023-06-29 07:31:06 +00:00
Jason Chang
c0f0b0ca1a
Fix the “screen lock option” and password restriction view are
...
in the wrong position on PIN/Password/Pattern in the landscape mode.
1. Move the description position under the GlifLayout header
2. Move the position "Screen lock options" button under the
GlifLayout header
Bug: 272676038
Bug: 285271342
Test: manully test with reproducible steps:
STEPS TO REPRODUCE:
1. Go through the setup flow
2. Continue steps until “set pin” page
3. The “screen lock option” is in the wrong position
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings
.password.SetupChooseLockPasswordTest"
Change-Id: I24464e6b7e93f20abbeb59426919ed7fec5c7cbb
2023-06-29 07:11:42 +00:00
Shawn Lin
1c112249f3
Merge "Fix lock pattern is truncated during SUW in folded state" into udc-qpr-dev am: f733b7b0ff am: de251cc896
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23737990
Change-Id: Id6bc8a4b0545fb21f339d1eccf1c131c375de82d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 05:04:44 +00:00
Shawn Lin
de251cc896
Merge "Fix lock pattern is truncated during SUW in folded state" into udc-qpr-dev am: f733b7b0ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23737990
Change-Id: I5bd4af0f4cb253420132411a955f548a9ada4446
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 04:24:53 +00:00
SongFerng Wang
1fd4ecb4c3
Merge "Revert "Update the wording for LE Audio"" into udc-qpr-dev am: 73c811b289 am: 4b970a47ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23844564
Change-Id: I67a908138990fe72d62082de21d7e6807cdbb503
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 04:00:12 +00:00
Allen Su
c871c5654d
[Panlingual]Log metrics for App's locale from the suggested
...
Bug: 258128535
Test: atest AppLocalePickerActivityTest
Change-Id: I007c0e76d8b88f08518ba2696d42bd1db194f5b7
Merged-In: I007c0e76d8b88f08518ba2696d42bd1db194f5b7
2023-06-29 03:44:11 +00:00
Allen Su
9bdeb34eaf
Merge "[Panlingual]Log metrics for App's locale from the suggested"
2023-06-29 03:42:12 +00:00
Shawn Lin
f733b7b0ff
Merge "Fix lock pattern is truncated during SUW in folded state" into udc-qpr-dev
2023-06-29 03:40:36 +00:00
Grace Cheng
e8a85a2765
Fix NPE in updateAddPreference
...
Update mAddFingerprintPreference to avoid NPE
Fixes: 286495189
Test: Rotate screen during first fingerprint enrollment, complete enrollment, and observe no crash
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f58714496ab5454ea10c6d638c094bb1d21306d8 )
Merged-In: Id7edde492168b467360c6c99b326721cd883bba8
Change-Id: Id7edde492168b467360c6c99b326721cd883bba8
2023-06-29 03:39:21 +00:00
SongFerng Wang
4b970a47ec
Merge "Revert "Update the wording for LE Audio"" into udc-qpr-dev am: 73c811b289
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23844564
Change-Id: I3890bf56ae360167ab88442c444a49d438edc8f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 03:15:08 +00:00
Chaohui Wang
16ad888fff
Merge "Fix cursor is empty in ApnEditor"
2023-06-29 03:01:34 +00:00
Chun-Ku Lin
20976c3a53
use L10n-friendly runtime number formatting based on locale
...
Arabic use Western or Eastern numbers depends on the regions.
Bug: 276479321
Test: atest AccessibilityButtonFooterPreferenceControllerTest
Test: manual
Change-Id: I855f4fd891893b094163b0d479bdf3e5155dffc1
2023-06-29 02:48:32 +00:00
SongFerng Wang
73c811b289
Merge "Revert "Update the wording for LE Audio"" into udc-qpr-dev
2023-06-29 02:37:44 +00:00
Matías Hernández
281c4b631c
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9 am: e20f52a05a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247
Change-Id: I2bcd0934af1e0e4d6679e04293f04bbebcadab4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:44:07 +00:00
Matías Hernández
e20f52a05a
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247
Change-Id: I8fc3a7b239ce0545b34eafc860df72a42cfd2e05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:39:16 +00:00
Grace Cheng
f73f073643
Merge "Fix NPE in updateAddPreference" into udc-dev am: 25b489e212
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23667755
Change-Id: I691796e372f65ffec44954a850d462f796c19f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:36:58 +00:00
Matías Hernández
412fc3e2c4
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: 143d105dc9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247
Change-Id: I71f428e90b132c4282827b698623ee1d43c0f7c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:35:53 +00:00
Matías Hernández
9feb898da7
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a am: aaddfd88e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247
Change-Id: I0f6901ca11f07090c15146dac2b0b39c67db8eb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 18:35:52 +00:00
Joshua McCloskey
9642d1e8cb
Moving FingerprintSettings to Kotlin
...
This change is the first of many, it will
1. Change java -> kotlin
2. Use the MVVM architecture
3. Be feature flagged
This change in particular is focused on transitions to and from various activities.
Enable feature via
adb shell setprop sys.fflag.override.settings_biometrics2_fingerprint true
Bug: 280862076
Test: atest FingerprintSettingsViewModelTest
Change-Id: I8eb5c30e6f2e92c256ae7c257a9d560439ba418f
2023-06-28 18:09:35 +00:00
Ante
fdfe10f1a7
Fix Inline UWB toggle setting
...
In settings when searching for "uwb" the inline toggle doesn't work,
this change fixes the issue. This change won't fix the issue of
correctly displaying the UWB state in case when the UWB adapter state
changed after the inline toggle was already loaded, that issue is
tracked in b/287644073.
Bug: 280643766
Test: Manually verified
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:34ea9149906ac41396afbf3d1e153f4ed60dc1ed )
Change-Id: Iddb89220921a9af0e1d97bb3d648ca8b0f42fc65
2023-06-28 17:48:55 +00:00
Grace Cheng
25b489e212
Merge "Fix NPE in updateAddPreference" into udc-dev
2023-06-28 17:41:13 +00:00
Matías Hernández
aaddfd88e9
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247
Change-Id: If35fbb5c16a642b56de29012ce43ecd7f068d5b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 17:14:55 +00:00
Matías Hernández
0d21526217
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev am: 4d34eb2c7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726247
Change-Id: I1e1dbbdf2b1834da763835c1bbcd263cdb27eb09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-28 17:10:34 +00:00
Matías Hernández
4d34eb2c7a
Merge "Settings: don't try to allow NLSes with too-long component names" into udc-dev
2023-06-28 16:42:13 +00:00
Joshua McCloskey
2f46489926
Moving FingerprintSettings to Kotlin
...
This change is the first of many, it will
1. Change java -> kotlin
2. Use the MVVM architecture
3. Be feature flagged
This change in particular is focused on transitions to and from various activities.
Enable feature via
adb shell setprop sys.fflag.override.settings_biometrics2_fingerprint true
Bug: 280862076
Test: atest FingerprintSettingsViewModelTest
Change-Id: I8eb5c30e6f2e92c256ae7c257a9d560439ba418f
Merged-In: I8eb5c30e6f2e92c256ae7c257a9d560439ba418f
2023-06-28 15:49:02 +00:00