Commit Graph

28447 Commits

Author SHA1 Message Date
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
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
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
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
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
Julia Reynolds
a331c50b53 Reduce jank when revoking notification permission
-Reorder fields so the appear/disappear more cleanly
-Remove some divider lines- they don't animate with the content, for
some reason
-Remove an unused field
-Hide the badge field (remaining field with divider) if there are no
channels
-Change style of 'Notifications are blocked' field to better match
the other fields

Test: revoke notification permission for apps with and without channels
Test: BadgePreferenceControllerTest
Fixes: 233962859
Change-Id: Ife894172bf91d838edf3b0546c5ee00e206a855f
2023-03-15 09:08:10 -04:00
Matías Hernández
6b13d794bc Merge "Delete stuff related to removed "Conversations that can interrupt" settings" into udc-dev am: 2cabe8786e am: be3c8b66ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21988900

Change-Id: Ifc5f1477f20b3c33075bc866ed473fbd5e6649b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 10:59:30 +00:00
Bill Yi
5c24e1864d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie52051d98db9590f6a0de10033febcd6a5126b75
2023-03-15 03:34:19 -07:00
Matías Hernández
be3c8b66ba Merge "Delete stuff related to removed "Conversations that can interrupt" settings" into udc-dev am: 2cabe8786e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21988900

Change-Id: I580fb71a42be1e400596c62425334b8ab5433d74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 10:26:32 +00:00
Matías Hernández
f38b8aa4c1 Merge "Delete stuff related to removed "Conversations that can interrupt" settings" into udc-dev am: 2cabe8786e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21988900

Change-Id: Ie517a41e5e5f80f1fb81c037af235d0aac0bb699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 10:26:11 +00:00
Matías Hernández
2cabe8786e Merge "Delete stuff related to removed "Conversations that can interrupt" settings" into udc-dev 2023-03-15 10:12:23 +00:00
Tom Hsu
2f4e3b3041 Merge "Add Regional preference UI for Physical keyboard location." into udc-dev am: 29bcb4d553 am: 510b9b6b49
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21913842

Change-Id: Iac2042b8bfe511b51551394b7e7cd5b0cb16da17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 05:32:52 +00:00
Tom Hsu
510b9b6b49 Merge "Add Regional preference UI for Physical keyboard location." into udc-dev am: 29bcb4d553
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21913842

Change-Id: I066acb89131eab600688f44758288d75e68a0bd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 04:57:13 +00:00
Tom Hsu
5fb635e82d Merge "Add Regional preference UI for Physical keyboard location." into udc-dev am: 29bcb4d553
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21913842

Change-Id: I46c61d49106859d425f00531585e6ff61ed90545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 04:56:16 +00:00
Tom Hsu
29bcb4d553 Merge "Add Regional preference UI for Physical keyboard location." into udc-dev 2023-03-15 04:21:02 +00:00
tom hsu
397f06abff Add Regional preference UI for Physical keyboard location.
Bug: b/271805730
Test: Maunal test.
Test: atest passed.
Change-Id: Iab4351c158d6cf24d1a5aa1307ef0182eec522ae
2023-03-15 12:10:21 +08:00
Lucas Silva
95d06ff9de Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef am: 5671ddb191 am: d17cb44367 am: c1e0f6f3ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019

Change-Id: Ia6d2268fb3ede33f805447fbdf8ed9c7fbd73145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:43:16 +00:00
Lucas Silva
c1e0f6f3ea Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef am: 5671ddb191 am: d17cb44367
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019

Change-Id: I62ef3a16f55bad8da006e719c0faf1d63b869535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:21:50 +00:00
Lucas Silva
18b58726dc Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef am: 5671ddb191 am: d17cb44367
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019

Change-Id: I3c5bbcbeedf8150559666a5360671f38e87d9179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:20:40 +00:00
Lucas Silva
d17cb44367 Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef am: 5671ddb191
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019

Change-Id: Ib9e3e0effc2f486a15c4caec31bdecde0f358029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:39:31 +00:00
Behnam Heydarshahi
8e10c8e488 Merge "Extend settings panel under navigation bar" into tm-qpr-dev am: 17701cd976 am: afb4dd1ece am: a1daad718e am: 4f3401050d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20929206

Change-Id: Ia429c3c5a8520b540b542a6634316d45f5ca15d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 21:59:55 +00:00
Lucas Silva
5671ddb191 Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019

Change-Id: I4ba691553814eeb5b2b73f3b9665829db905de10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 21:54:01 +00:00
Lucas Silva
148f1592ef Merge "Add home controls button to screensaver settings" into tm-qpr-dev 2023-03-14 21:47:03 +00:00
Behnam Heydarshahi
3135bc59e0 Merge "Extend settings panel under navigation bar" into tm-qpr-dev am: 17701cd976 am: afb4dd1ece am: a1daad718e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20929206

Change-Id: I560471fe2df61a2e83d39f0d8e32f1bbfc11cba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 21:26:44 +00:00
Behnam Heydarshahi
4f3401050d Merge "Extend settings panel under navigation bar" into tm-qpr-dev am: 17701cd976 am: afb4dd1ece am: a1daad718e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20929206

Change-Id: Ifc2c41c7ecf598a1e5e4d3586fbaa4f197da2760
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 21:25:22 +00:00
Behnam Heydarshahi
a1daad718e Merge "Extend settings panel under navigation bar" into tm-qpr-dev am: 17701cd976 am: afb4dd1ece
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20929206

Change-Id: I38f7acc1b1c5cbb08432d6e3b3229305da381379
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 20:22:07 +00:00
Behnam Heydarshahi
afb4dd1ece Merge "Extend settings panel under navigation bar" into tm-qpr-dev am: 17701cd976
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20929206

Change-Id: I60aab9b333efc5d38f0cbc6f3635948bf734091f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 19:43:25 +00:00
Behnam Heydarshahi
17701cd976 Merge "Extend settings panel under navigation bar" into tm-qpr-dev 2023-03-14 18:54:48 +00:00
Andreas Miko
51cb60cc7c Add setting to disable PIN animation and password am: 30bf66db42
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21369281

Change-Id: I39f9675c5b3fc234608882780a62141061bf1e74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 18:05:35 +00:00
Matías Hernández
3d7cc756be Merge "Show correct chevron for "Priority" on RTL languages" into udc-dev am: 239176684e am: 61087cda06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21986572

Change-Id: Ibb3ceaacfbfd3671a3d1d137f38bea8f26a6c4a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 17:13:10 +00:00
Matías Hernández
61087cda06 Merge "Show correct chevron for "Priority" on RTL languages" into udc-dev am: 239176684e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21986572

Change-Id: I1d8888bdb05699472f6a4ef15cdbd544f7ae776f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 17:11:08 +00:00
Matías Hernández
60ada686f7 Merge "Show correct chevron for "Priority" on RTL languages" into udc-dev am: 239176684e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21986572

Change-Id: Icafa108382f45ca6f40b3efb357fe8aa0061effd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 17:06:17 +00:00
Matías Hernández
239176684e Merge "Show correct chevron for "Priority" on RTL languages" into udc-dev 2023-03-14 16:57:58 +00:00
Matías Hernández
0882b04ed5 Delete stuff related to removed "Conversations that can interrupt" settings
Bug: 226486181
Test: N/A, dead code removal only
Change-Id: I100db518880a7eee402af37f49e416ec61ff8486
2023-03-14 16:53:53 +01:00
Matías Hernández
0fc7f8c9d7 Merge "Fix icons size in "Add DND Schedule" dialog" into udc-dev am: 55a91dda13 am: 77c0dd9469
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21986564

Change-Id: If2db3c4266dcc3acaefe525a06ba5ab46708c70e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 13:50:41 +00:00
Matías Hernández
c06866227d Merge "Fix icons size in "Add DND Schedule" dialog" into udc-dev am: 55a91dda13
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21986564

Change-Id: Ie400da9eef62d1e0ad5d711e194968b434785c07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 13:17:45 +00:00
Matías Hernández
77c0dd9469 Merge "Fix icons size in "Add DND Schedule" dialog" into udc-dev am: 55a91dda13
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21986564

Change-Id: I8b76b13b3db3451825bad5c43114cdaec3583b8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 13:17:12 +00:00