PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,834 Commits 1 Branch 0 Tags
0ff921e245f11a2b0719b53e1a575ef76b726fcd
Commit Graph

28482 Commits

Author SHA1 Message Date
Julia Reynolds
0ff921e245 Merge "Add missing conversation field" into udc-dev am: 2494fd0187 am: f448aec29d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22118257

Change-Id: I2832cdad7f91b61abca77691f2fbaa183b47c153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:22:32 +00:00
Julia Reynolds
f448aec29d Merge "Add missing conversation field" into udc-dev am: 2494fd0187 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22118257

Change-Id: I3fdd62e92426653320aa8c492130d9be41f604b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 15:09:18 +00:00
Julia Reynolds
2494fd0187 Merge "Add missing conversation field" into udc-dev 2023-03-20 14:28:41 +00:00
Julia Reynolds
5164149efc Add missing conversation field 
NotificationChannel#EDIT_CONVERSATION should show
both 'demote conversation' and 'promote conversation'
fields.

Test: View Partial and Full Settings for promoted and
demoted channels
Fixes: 273508155

Change-Id: I4a17a73d695d7c79837fc647b79968f535fa4393
 2023-03-20 13:04:11 +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
a261a9f5f1 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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21478828

Change-Id: I08bb7f3662c82e52ed36f73b3cff6288fd093295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 14:45:31 +00:00
Jason Chang
9b94df1d40 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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21478828

Change-Id: Ia34c19988e286741df8aee146e15e9df1e2c2ecc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 14:44:39 +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
Grace Cheng
4132364dfb Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev am: e9c795c96b am: 59992bbbb8 am: 387c36968b am: 0adbb4fe60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086565

Change-Id: I0997d4382f2067d0bd2e39e06bce116317db22a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 08:37:56 +00:00
Grace Cheng
0adbb4fe60 Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev am: e9c795c96b am: 59992bbbb8 am: 387c36968b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086565

Change-Id: I0dfea68284b0e19aaa8a7c21eb8733bc02251a3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 07:59:51 +00:00
Grace Cheng
ff0fa142f4 Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev am: e9c795c96b am: 59992bbbb8 am: 387c36968b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086565

Change-Id: Ifebc427b74a8008320d8691689042e2e7bb31084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 07:59:48 +00:00
Grace Cheng
387c36968b Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev am: e9c795c96b am: 59992bbbb8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086565

Change-Id: I12a196c7c0b630885af8ebb820be6ef45177ef55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 07:22:02 +00:00
Grace Cheng
59992bbbb8 Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev am: e9c795c96b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086565

Change-Id: I67dfb8b2e904668b7236187d727f4eae38720888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 06:43:39 +00:00
Grace Cheng
e9c795c96b Merge "Update locked device icon in FingerprintEnrollIntroduction" into tm-qpr-dev 2023-03-18 06:18:32 +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
Bill Yi
3bcb58f7cd Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-18 01:18:29 +00:00
Bill Yi
7879f2d529 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-18 01:18:29 +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
07392a5407 Merge "[LE Audio] Set activity for result after scanning the QR code" into udc-dev am: bb2c12b990 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22097102

Change-Id: Id7b44d3e72f1a09134dd2f36497d5bcb7189617a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-17 11:57:21 +00:00
Betty Chang
85d94c956a Merge "[LE Audio] Set activity for result after scanning the QR code" into udc-dev am: bb2c12b990 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22097102

Change-Id: I60593725a54c2aaaf31bede229911aa1a9858882
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-17 11:56:37 +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
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
Jason Hsu
41987d7df5 Merge "Update the exclamation icon can be announced by screen reader" into udc-dev am: fe9c359367 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22093886

Change-Id: I759f29261d3e9b55f63848844c2c0675e6e6a505
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-17 07:54:01 +00:00
Jason Hsu
da1515c23c Merge "Update the exclamation icon can be announced by screen reader" into udc-dev am: fe9c359367 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22093886

Change-Id: I4300460b93cff1da41201afd492b7f718199afe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-17 07:53:56 +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
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
Bill Yi
2dbe4ce5e3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I848d29310bf900377aaf9d557a7e0cfdb063a700
 2023-03-16 16:35:27 -07:00
Bill Yi
62b0143cf5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib1e2d8288425103c66d8d73f05e6755894a94f93
 2023-03-16 16:30:34 -07: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
45ae15f19c Merge "Revert "Remove duplicate strings."" into udc-dev am: 9a087d6c19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22106646

Change-Id: I0d398a40ead2849aa750f076e9be9c7b297ee284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 20:39:26 +00:00
Kweku Adams
eaba347a70 Merge "Revert "Remove duplicate strings."" into udc-dev am: 9a087d6c19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22106646

Change-Id: I55b37a8eae38e2937160f2bb19fd72fb650f5c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 20:39:06 +00:00
Kweku Adams
9a087d6c19 Merge "Revert "Remove duplicate strings."" into udc-dev 2023-03-16 20:14:16 +00:00
Julia Reynolds
bf920a9e6b Merge "Remove explicit number from string" into udc-dev am: fe310a86de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121609

Change-Id: I0eb6052b993ac3d1d3c8fb49e2dee68ef19b4bd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 20:06:51 +00:00
Julia Reynolds
91ef0f1ee4 Merge "Remove explicit number from string" into udc-dev am: fe310a86de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121609

Change-Id: I2bf60fbfd1e3b5c1b24a6c9a2fa6e8c205547633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 20:03:31 +00:00
Julia Reynolds
fe310a86de Merge "Remove explicit number from string" into udc-dev 2023-03-16 18:52:25 +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
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
c7f1eb2232 Merge "Update strings for hearing device U features" into udc-dev am: 5c1652eab0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087473

Change-Id: I70d14a2fb36738cb20f9b86139e20e8f9addd26e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 09:44:42 +00:00
Jason Hsu
3f86f0f5b4 Merge "Update strings for hearing device U features" into udc-dev am: 5c1652eab0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087473

Change-Id: I83ec4d6b9eb362f5c8da0877d76dc2c1a5c68778
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 09:44:37 +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
TreeHugger Robot
1fb52a55aa Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-16 01:02:53 +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
TreeHugger Robot
827333d9b6 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-03-15 21:24:10 +00:00
Julia Reynolds
686e7169ca Merge "Reduce jank when revoking notification permission" into udc-dev am: 068a55384b am: 84671635cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21888168

Change-Id: I0531dfd13ac5a1639275fadd3432fedf893a1f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 15:37:08 +00:00
Julia Reynolds
1619d4cd25 Merge "Reduce jank when revoking notification permission" into udc-dev am: 068a55384b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21888168

Change-Id: I569c9eebdb67f5715b0546ffb6effbac5eacc42f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 15:11:28 +00:00
Julia Reynolds
84671635cb Merge "Reduce jank when revoking notification permission" into udc-dev am: 068a55384b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21888168

Change-Id: Ib8b029ddfcd77aa82c94c698fb7e2830014bdcdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 15:07:36 +00:00
Julia Reynolds
068a55384b Merge "Reduce jank when revoking notification permission" into udc-dev 2023-03-15 14:50:07 +00:00