Zoey Chen
7081c9eeb1
Merge "[Settings] Should not show WFC UI in the SIM page if the SIM does not support WFC" into udc-dev am: 7a492b4098 am: 08eea0993e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22135681
Change-Id: Ia10a650efd73b6c2dc5bd2a4759b1102fc262f2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 23:04:01 +00:00
SongFerng Wang
af1a75d1e8
Merge "Modify the log at AutoSelectPreferenceController" into udc-dev am: d687c01745 am: 1ef40e5503
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22122899
Change-Id: I20b14361f36172d639e6aaded32137696edb7ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 23:03:49 +00:00
Zoey Chen
e63da6c418
Merge "[Settings] Do not set text if the fragment is not attached" into udc-dev am: ce77de4240 am: 4a3d0d7f8e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22142522
Change-Id: I7b697c270a8157015b0933760fdbbd7e025400c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-20 23:02:20 +00:00
Zoey Chen
7a492b4098
Merge "[Settings] Should not show WFC UI in the SIM page if the SIM does not support WFC" into udc-dev
2023-03-20 10:45:34 +00:00
SongFerng Wang
d687c01745
Merge "Modify the log at AutoSelectPreferenceController" into udc-dev
2023-03-20 10:43:33 +00:00
Zoey Chen
cb4e0bd018
[Settings] Should not show WFC UI in the SIM page if the SIM does not
...
support WFC
Bug: 270792637
Test: manual
Change-Id: Ic67bd2e766d66c91fc4b0fcf5a5355debd805ac6
2023-03-20 09:15:55 +00:00
SongFerngWang
c678caba4a
Modify the log at AutoSelectPreferenceController
...
Bug: 270652395
Test: build pass
Change-Id: I3b9611fd3704d0965ace12f2bb13c28ace60eadf
2023-03-20 14:48:16 +08:00
Zoey Chen
ce77de4240
Merge "[Settings] Do not set text if the fragment is not attached" into udc-dev
2023-03-20 06:43:23 +00:00
Jason Chang
fac5d59f1c
Merge "Fix the Fingerprint enrollment page's title text creates a truncate problem when it needs three lines on the R4 device" into udc-dev am: 9522a44bb6 am: 9b94df1d40
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21478828
Change-Id: Ib0f3de4392a5f7fbf64aa405699358a34b3976dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-18 15:16:55 +00:00
Jason Chang
9522a44bb6
Merge "Fix the Fingerprint enrollment page's title text creates a truncate problem when it needs three lines on the R4 device" into udc-dev
2023-03-18 14:10:58 +00:00
Jason Chang
848973d300
Fix the Fingerprint enrollment page's title text creates a truncate
...
problem when it needs three lines on the R4 device
Add padding between title and lottie animation, and adjust UDFPS
enroll view top margin.
Bug: 269437675
Test: manually test,
1.Go to Go to Settings > Security > Fingerprint Unlock >
Set up Fingerprint Unlock > How to set up your fingerprint >
Touch & hold the fingerprint sensor ,
then to start enroll fingerprint.
2. Always keep the finger in the same position,
then let the title become a three line description
“Change the position of your fingerprint slightly each time”.
3. Check the UI if it has been fixed.
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings
.biometrics.fingerprint.FingerprintEnrollEnrollingTest"
Change-Id: Ib330e9fbe01b959892f2f9007ce35f5ab107e42e
2023-03-18 03:40:45 +00:00
Zoey Chen
76bb350c73
[Settings] Do not set text if the fragment is not attached
...
Bug: 273415166
Test: loacl test
Change-Id: I5298727359191d8ce9c4526279faa4e8a3c1df43
2023-03-17 18:14:49 +00:00
SongFerng Wang
afdd74ef7a
Merge "Update OpenNetworkSelect UI at main thread" into udc-dev am: dbfc04cb2d am: 20d9a4e371
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121989
Change-Id: I5f5df3c27b268892e6be2dafc2043012086329f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 18:07:12 +00:00
SongFerng Wang
dbfc04cb2d
Merge "Update OpenNetworkSelect UI at main thread" into udc-dev
2023-03-17 17:43:07 +00:00
Darrell Shi
5f15e00e07
Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev am: 34db15a008 am: 2119a2dcf9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517324
Change-Id: I38545423c8784f826265ece8aef6a75662cb7549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 16:50:59 +00:00
Darrell Shi
2119a2dcf9
Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev am: 34db15a008
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517324
Change-Id: Ib3444fa954cdc2d6a4c179994f36963673b46492
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 16:13:40 +00:00
Darrell Shi
34db15a008
Merge "Prevent the screen reader box from unexpected scrolling in dream setting page." into tm-qpr-dev
2023-03-17 15:47:23 +00:00
Betty Chang
41813a1aef
Merge "[LE Audio] Set activity for result after scanning the QR code" into udc-dev am: bb2c12b990 am: 85d94c956a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22097102
Change-Id: I1e6c50d4e9413fb220653bdbf90b202c0cfac430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 12:31:19 +00:00
Betty Chang
bb2c12b990
Merge "[LE Audio] Set activity for result after scanning the QR code" into udc-dev
2023-03-17 11:19:50 +00:00
SongFerngWang
12066c72f9
Update OpenNetworkSelect UI at main thread
...
Bug: 270652395
Test: local test and atest AutoSelectPreferenceControllerTest
Change-Id: Idfc7a07106d552c35a94414bb14eac0fbdc3974f
2023-03-17 18:49:38 +08:00
Jason Hsu
2654d8c4a1
Merge "Update the exclamation icon can be announced by screen reader" into udc-dev am: fe9c359367 am: da1515c23c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22093886
Change-Id: I89d7caf5aa34c3634c19109f9d0d33345e513ee2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 08:27:18 +00:00
SongFerng Wang
c76a578729
Merge "Close the dialog activity when user click cancel or background" into udc-dev am: e959be60a9 am: d77aee952e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22133443
Change-Id: I57c2a58c69288c520f98a1fd3a004da260766f03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-17 08:26:24 +00:00
Jason Hsu
fe9c359367
Merge "Update the exclamation icon can be announced by screen reader" into udc-dev
2023-03-17 07:29:02 +00:00
SongFerng Wang
e959be60a9
Merge "Close the dialog activity when user click cancel or background" into udc-dev
2023-03-17 07:13:36 +00:00
changbetty
74dc069d16
[LE Audio] Set activity for result after scanning the QR code
...
Bug: 263554347
Bug: 265281156
Bug: 248409874
Test: manual test
Change-Id: Ia252f29ad9dfdc09266e91cc9ecaa32ed8c749c2
2023-03-17 06:02:08 +00:00
SongFerngWang
07114a6d00
Close the dialog activity when user click cancel or background
...
Bug: 241346100
Test: local test
Change-Id: Id9d931fc8b74ef566ffe3c6135aaf433cd9f770b
2023-03-17 12:37:29 +08:00
Kweku Adams
7c82ea06a2
Merge "Revert "Remove duplicate strings."" into udc-dev am: 9a087d6c19 am: eaba347a70
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22106646
Change-Id: I903e6289111448ffe71856b1830b914823ff1953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 20:45:56 +00:00
Julia Reynolds
f98a5d8fb6
Merge "Remove explicit number from string" into udc-dev am: fe310a86de am: 91ef0f1ee4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121609
Change-Id: Iec0ebc4d6e02029800c0009778e9e7f8cf3f2306
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 20:40:26 +00:00
Kweku Adams
9a087d6c19
Merge "Revert "Remove duplicate strings."" into udc-dev
2023-03-16 20:14:16 +00:00
Julia Reynolds
fe310a86de
Merge "Remove explicit number from string" into udc-dev
2023-03-16 18:52:25 +00:00
Matías Hernández
25514d5380
Merge "Refresh the app's "Conversations" list when there are none" into udc-dev am: 08893ed0b3 am: d0db72339d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22119305
Change-Id: I1240d0ea17e6fff1a9f15a3ec0bd215987c57214
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 17:00:57 +00:00
Julia Reynolds
8126e93ff2
Remove explicit number from string
...
So it can be translated properly
Test: View notification history screen
Fixes: 222128037
Change-Id: I2d11dd4e427c19ef0c003b1fa2b6882267e2026e
2023-03-16 12:27:37 -04:00
Matías Hernández
08893ed0b3
Merge "Refresh the app's "Conversations" list when there are none" into udc-dev
2023-03-16 15:57:11 +00:00
Matías Hernández
a5eea1c034
Refresh the app's "Conversations" list when there are none
...
Also hide the header in that case (simiarly to bubbles).
Test: atest (new) + manual
Fixes: 273748214
Change-Id: I4f758a0bf5bb8cfa91701185f1568b358d8903a0
2023-03-16 15:07:13 +01:00
Jason Hsu
35788cfdd2
Merge "Update strings for hearing device U features" into udc-dev am: 5c1652eab0 am: c7f1eb2232
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087473
Change-Id: I18fbcf3a3fe2f1428c4a39fd4ee3fabd0c7f89d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 10:18:22 +00:00
Jason Hsu
5c1652eab0
Merge "Update strings for hearing device U features" into udc-dev
2023-03-16 09:16:51 +00:00
jasonwshsu
7be7ef9ecc
Update the exclamation icon can be announced by screen reader
...
* In hearing deivce and flash notifications U features.
Bug: 268144365
Test: open screen reader to read the footer preference
Change-Id: Ifb0809c1e445aea4aeea9db9b4ec09cd6d0d4095
2023-03-16 16:08:46 +08:00
jasonwshsu
1b0a454344
Update strings for hearing device U features
...
Bug: 270086620
Test: flash the rom and check UI
Change-Id: Iafc1691d2a51fc1c8111059ff5b2953889b40012
2023-03-16 16:08:40 +08:00
Chaohui Wang
8b31ed172e
Merge "Move LogEvent action to Settings" into udc-dev am: ba39aa506b am: 4b86d5df4a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22067164
Change-Id: I40bbed089befb8e3abaa080aa792fb06770727c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-16 06:55:41 +00:00
Chaohui Wang
ba39aa506b
Merge "Move LogEvent action to Settings" into udc-dev
2023-03-16 06:34:14 +00:00
Dmitry Dementyev
118dbc4e47
Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991 am: 6faa24da9d am: c264e26eb2 am: ccfdc32542
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: Iddb91c4d9f6e17701c645c5c47af8d34cbb6f717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 23:15:31 +00:00
Dmitry Dementyev
c03f2fe49c
Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991 am: a3d15a91e1 am: 92babcaef5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: Ib6464d437f7b2ead5cd9b00f13431149979ff8b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 23:11:46 +00:00
Dmitry Dementyev
92babcaef5
Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991 am: a3d15a91e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: Id32c9274ed8290b709328924d698dbdf130b8d88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:55:00 +00:00
Dmitry Dementyev
c264e26eb2
Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991 am: 6faa24da9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: I78c604d15fbb47533e9b302a501c71f5e38a9f78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:52:45 +00:00
Diya Bera
ed1bb20ff1
Merge "Remove subtitle from biometric prompt in Settings (Passwords & Accounts)" into tm-qpr-dev am: f7359a5001
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22084586
Change-Id: I190752b9c2a65024c140b7dab92524097c183ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:52:07 +00:00
Lifu Tang
caa1b51ef2
Revert "Remove duplicate strings."
...
Revert submission 19748582-settings_yesno
Reason for revert: Common strings in English could be translated into different strings in other languages.
Reverted changes: /q/submissionid:19748582-settings_yesno
Bug: 272603842
Test: build and open Settings app
Test: atest SettingsRoboTests
Change-Id: Iaad301c5513478fb95e40987ea3ccb4f923d71fa
2023-03-15 22:39:24 +00:00
Diya Bera
f7359a5001
Merge "Remove subtitle from biometric prompt in Settings (Passwords & Accounts)" into tm-qpr-dev
2023-03-15 22:28:10 +00:00
Dmitry Dementyev
a3d15a91e1
Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: I33ee7b0b3fd191ed993a3537d598d102c2d6ffb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:18:42 +00:00
Dmitry Dementyev
9bec974991
Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: Ia0bfeee6be995a2df857147a0aadc17f41672d63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 21:34:39 +00:00
Dmitry Dementyev
7f73a168fe
Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: I4815a1e5e05bcee661a8ce037a2671086d16faee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 21:01:01 +00:00