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

121834 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Groover
1a3e4e7e35 Merge "Make CheckReturnValue errorprone check a warning for unit tests" into udc-dev am: 8458e7f630 am: da1856f5b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121970

Change-Id: I6d664992005e028c70e7933ee21904d85191b1b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 21:18:43 +00:00
Michael Groover
0aa08f54f1 Merge "Make CheckReturnValue errorprone check a warning for unit tests" into udc-dev am: 8458e7f630 am: 4dc0e53808 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121970

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

Change-Id: Ifc93c03f8033a508a820e25d8c2dd7ba60860939
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 21:00:07 +00:00
Michael Groover
4dc0e53808 Merge "Make CheckReturnValue errorprone check a warning for unit tests" into udc-dev am: 8458e7f630 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121970

Change-Id: I83ca3dc101ad8863e32f10b0a9961505d6dfa82e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 20:59:59 +00:00
Menghan Li
2600b1bbc2 [automerger skipped] Merge "Update color-check-baseline.xml" into tm-qpr-dev am: 1306ebf737 -s ours 
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22105808

Change-Id: I204ee5dc7a8861b51d06420c6bb1d4ff7b216c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 20:59:03 +00:00
menghanli
6f478f1a6b [automerger skipped] Update color-check-baseline.xml am: 796fcccd9b -s ours 
am skip reason: Merged-In Ife355166df080ce7371a95b5cea28575227153f0 with SHA-1 f952e89d4b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22105808

Change-Id: I6a67de10b42d08b3786b01928377d020c8513630
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 20:58:48 +00:00
Michael Groover
da1856f5b1 Merge "Make CheckReturnValue errorprone check a warning for unit tests" into udc-dev am: 8458e7f630 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22121970

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

Change-Id: I26ca2fede77748a1cfb34666eba7f65dff607073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 20:56:14 +00: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
Michael Groover
8458e7f630 Merge "Make CheckReturnValue errorprone check a warning for unit tests" into udc-dev 2023-03-16 20:41:12 +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
Menghan Li
1306ebf737 Merge "Update color-check-baseline.xml" into tm-qpr-dev 2023-03-16 20:29:25 +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
Matías Hernández
8557050477 Merge "Refresh the app's "Conversations" list when there are none" into udc-dev am: 08893ed0b3 am: 86508f09f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22119305

Change-Id: If71121c5eb8693032bd0533135f58a0e97aa21b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 17:02:12 +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
Michael Groover
38819fd906 Make CheckReturnValue errorprone check a warning for unit tests 
CredentialManagerPreferenceControllerTest now differs between the
current development branch and internal main, and the
CheckReturnValue errorprone is failing in the branches that use
the code from the development branch. Modifying
CredentialManagerPreferenceControllerTest does not resolve this
because it results in merge conflicts, but making this check a
warning in the development branch will allow the fix to reach all
affected branches.

Fixes: 273833063
Test: m RUN_ERROR_PRONE=true SettingsUnitTests
Change-Id: Ia923f0d988b1428cbb7378f33b4703ed19113dcd
 2023-03-16 11:31:05 -05:00
Matías Hernández
d0db72339d Merge "Refresh the app's "Conversations" list when there are none" into udc-dev am: 08893ed0b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22119305

Change-Id: Icc7d3311c9accf89bdb43714bdd9dd43de4f4d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 16:28:15 +00:00
Matías Hernández
86508f09f1 Merge "Refresh the app's "Conversations" list when there are none" into udc-dev am: 08893ed0b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22119305

Change-Id: I004e79d313aa29942d8a4762631706b86a2aec87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 16:27:50 +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
a32e8105be Merge "Update strings for hearing device U features" into udc-dev am: 5c1652eab0 am: 3f86f0f5b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087473

Change-Id: Ie92b2263615240981b3686c01289788836901822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 10:19:07 +00: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
Chaohui Wang
8fddeefef3 Merge "Move LogEvent action to Settings" into udc-dev am: ba39aa506b am: 63981f9be2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22067164

Change-Id: I08f5c18388ed67e1a9bbd700724afbbce481f833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 06:57:01 +00: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
63981f9be2 Merge "Move LogEvent action to Settings" into udc-dev am: ba39aa506b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22067164

Change-Id: I69e095201cc99178ad85e47621a08d18a77eefff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 06:41:27 +00:00
Chaohui Wang
4b86d5df4a Merge "Move LogEvent action to Settings" into udc-dev am: ba39aa506b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22067164

Change-Id: Id71c791943e5a58738de1d9b95704e693f957483
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 06:41:19 +00:00
Chaohui Wang
ba39aa506b Merge "Move LogEvent action to Settings" into udc-dev 2023-03-16 06:34:14 +00:00
Automerger Merge Worker
cf8d3f81f9 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 1b76d26f1b -s ours am: ad6b0526ee -s ours am: 2f0033dd50 -s ours" 2023-03-16 06:21:46 +00:00
Bill Yi
487b955fa6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 1b76d26f1b -s ours am: ad6b0526ee -s ours am: 4e2dd8cf2d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087425

Change-Id: I7826b460fc84c955189155742baeeb0ced266389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 06:21:40 +00:00
Bill Yi
6503170edf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 1b76d26f1b -s ours am: ad6b0526ee -s ours am: 2f0033dd50 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087425

Change-Id: I6ecda4e1b1adf223b685af243920c723393b9433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 06:21:40 +00:00
Bill Yi
34ed2b8a28 Merge changes from topic "tc_change_23031509_20" into udc-dev am: ef87f55d9a am: 37d10ccd54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087425

Change-Id: Ifeb77adc5a0d0f0c52ae6245ddc077008ca9f53e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 06:20:39 +00:00
Bill Yi
896022d26c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 787231f181 am: 6484f81d9e -s ours am: 82a6b13f7d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087425

Change-Id: Ifb829cecf08698d668e82aa5a878d486e33ec94f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 06:20:27 +00:00
Bill Yi
214792aaf5 Merge changes from topic "tc_change_23031509_20" into udc-dev am: ef87f55d9a am: 7ec0a6cabf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087425

Change-Id: Ie79c04e4dc8a910ee23b005718fedfe074ac7789
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 06:19:00 +00:00
Bill Yi
bc9e0d01b3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 787231f181 am: 6484f81d9e -s ours am: 88346f7c6f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087425

Change-Id: I29356e32976243cfb2051aea2941df5becbaf5b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 06:18:50 +00:00
Bill Yi
4e2dd8cf2d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 1b76d26f1b -s ours am: ad6b0526ee -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087425

Change-Id: I252c1250e1cadb95e85f49e73ea4750c6c6c49c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 05:47:13 +00:00
Bill Yi
2f0033dd50 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 1b76d26f1b -s ours am: ad6b0526ee -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087425

Change-Id: I7cb16eb36325b6080eb3102d61926bd7e65d7aa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 05:46:57 +00:00
Bill Yi
7ec0a6cabf Merge changes from topic "tc_change_23031509_20" into udc-dev am: ef87f55d9a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087425

Change-Id: I03a38fd5b84d2639731bdc61dc39f8376fb783d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 05:45:56 +00:00
Bill Yi
88346f7c6f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 787231f181 am: 6484f81d9e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087425

Change-Id: I856cb50de4770291a080dab450b4e959e1d2cf84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 05:45:42 +00:00
Bill Yi
37d10ccd54 Merge changes from topic "tc_change_23031509_20" into udc-dev am: ef87f55d9a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087425

Change-Id: Iec816626c6f5516d93a16465aad4a2d9502a530e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 05:45:32 +00:00