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

121291 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SongFerng Wang
d77aee952e Merge "Close the dialog activity when user click cancel or background" into udc-dev am: e959be60a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22133443

Change-Id: I33971c5308a2a170c48b92bb976b9253ee3d31ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-17 07:53:19 +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
Bill Yi
71e954c78b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I79c7f425dac1cd278eface63dc0c3702616bfc88
 2023-03-16 20:45:10 -07:00
Bill Yi
82c23db452 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie8640533b71ecdb1baf669edd91ed6df54df8a4d
 2023-03-16 20:40:36 -07:00
Bill Yi
59769526e0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I15422a02d7174c3cfc21c00ce39cbde8d0234c8b
 2023-03-16 20:29:17 -07:00
Bill Yi
7c58d10ebb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9910d114216f4f3c749fa096cb37e0d843bb82fc
 2023-03-16 20:23:48 -07:00
Bill Yi
6a2956d8f6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id5f1e2b04c372627f2fde37fc8139bf1a6bc3068
 2023-03-16 16:53:20 -07: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
Menghan Li
8b8d20e8d5 [automerger skipped] Merge "Update color-check-baseline.xml" into tm-qpr-dev am: 1306ebf737 -s ours am: 2600b1bbc2 -s ours am: 813f654aa1 -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: I3fe4acd8ef00a78e81c779eb858177f5557cc574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 22:17:52 +00:00
menghanli
1d5f0f3f97 [automerger skipped] Update color-check-baseline.xml am: 796fcccd9b -s ours am: 6f478f1a6b -s ours am: dba1c83ed4 -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: If522ebe6ba5eb52beb19df64686493522793d00a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 22:17:50 +00:00
Menghan Li
813f654aa1 [automerger skipped] Merge "Update color-check-baseline.xml" into tm-qpr-dev am: 1306ebf737 -s ours am: 2600b1bbc2 -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: Id167b7cda9295904f5f8aa173bacaeb7175a9b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 21:37:43 +00:00
menghanli
dba1c83ed4 [automerger skipped] Update color-check-baseline.xml am: 796fcccd9b -s ours am: 6f478f1a6b -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: I3059f4c5bb13108c00abfe3844e45739312ba155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 21:37:36 +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
8458e7f630 Merge "Make CheckReturnValue errorprone check a warning for unit tests" into udc-dev 2023-03-16 20:41:12 +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
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
fe310a86de Merge "Remove explicit number from string" into udc-dev 2023-03-16 18:52:25 +00:00
Sally
611d1adff3 Update Extra dim banner for tablets 
The corner radius on top left/bottom right now map to the device frame

Bug: 273553096
Test: manual check of light and dark theme
Change-Id: I8005ecdaa0d96df2e6b73a4e3b791a964f231708
 2023-03-16 17:30:31 +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
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
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
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
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
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
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
ad6b0526ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 1b76d26f1b -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: I0bc07fa0395e104736cb53de3e0271578e1ba382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 05:43:52 +00:00
Bill Yi
1b76d26f1b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-03-16 05:20:45 +00:00
Bill Yi
ef87f55d9a Merge changes from topic "tc_change_23031509_20" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 787231f181
  Import translations. DO NOT MERGE ANYWHERE
 2023-03-16 05:20:45 +00:00
menghanli
796fcccd9b Update color-check-baseline.xml 
(Fixed according to the instructions in prebuilts/checkcolor/README.md)

Bug: 273556105
Test: repo upload checks
Change-Id: Iaf4ab9f6cc1c836348226bc36358cbb73d2583d2
Merged-In: Ife355166df080ce7371a95b5cea28575227153f0
 2023-03-16 02:29:38 +00:00
TreeHugger Robot
34e74c19b3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8d91a57792 -s ours am: f4c558c9cb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6ee2e592f1eed2300bb9625a71f6300ccd152d84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 02:05:17 +00:00
TreeHugger Robot
f4c558c9cb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8d91a57792 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie3156715be7dc47c0f6801066949f1becf6d50ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 01:24:54 +00:00
TreeHugger Robot
f8edeb14fd Merge changes from topic "tc_change_23031509_19" into udc-dev am: 8cb7a890c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22084583

Change-Id: I71b1f61b3a68b6ba83fc8886ab84845e7879de89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 01:12:32 +00:00
Bill Yi
11c5f98ade [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10f88f394b am: aef5e4d513 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2dbb9c7adc27b85f746657e7ab498339fc158859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 01:12:24 +00:00
TreeHugger Robot
1fb52a55aa Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-16 01:02:53 +00:00
TreeHugger Robot
8d91a57792 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-03-16 00:51:39 +00:00