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

121483 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
8d91a57792 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-03-16 00:51:39 +00:00
TreeHugger Robot
8cb7a890c7 Merge changes from topic "tc_change_23031509_19" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10f88f394b
  Import translations. DO NOT MERGE ANYWHERE
 2023-03-16 00:51:39 +00:00
Dmitry Dementyev
84e533536d Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991 am: a3d15a91e1 am: 92babcaef5 am: c03f2fe49c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: I4a906b5a00c86fbe93141acda9db00cc190ce7c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 23:31:06 +00:00
Diya Bera
1e6508ef77 Merge "Remove subtitle from biometric prompt in Settings (Passwords & Accounts)" into tm-qpr-dev am: f7359a5001 am: ed1bb20ff1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22084586

Change-Id: I15927b82d701b37054746103c42ced0f3f7ab9c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 23:30:45 +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
TreeHugger Robot
49c4abbf69 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 827333d9b6 -s ours am: bc3053ca51 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1cb6df101c5d3a150d62ef1d333900a5bddb35ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:22:37 +00:00
Bill Yi
3fe085e762 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1de90287e1 -s ours am: 350628d706 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I26a8ef0a711e15f9f452a8c1912f4a4ff1f6fa2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:22:32 +00:00
TreeHugger Robot
29827c0b25 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 70bb56cb83 -s ours am: 053aec9616 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5cc6aaa53dac09a10f7e3e5d4253f3b26069362a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:22:16 +00:00
Bill Yi
9db3fa17e0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a73552148b -s ours am: 89ec1ab87e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I347e6418c56cccb6a3aaee67dda7392ec0de0ef9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:21:56 +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
6faa24da9d 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: Ieaea748f1a7f75954f16acce47a94aeb20d86fd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:17:09 +00:00
TreeHugger Robot
bc3053ca51 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 827333d9b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ad68d1100681f6df21668d62485f9f29f9c4d8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 21:45:00 +00:00
Bill Yi
350628d706 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1de90287e1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I59b1204fb9eba20091d3033860819796c1ca58a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 21:44:57 +00:00
TreeHugger Robot
053aec9616 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 70bb56cb83 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia29ddec60f6c08bf86280b31f3329f9327cc0d2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 21:44:47 +00:00
Bill Yi
89ec1ab87e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a73552148b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I61380c2773ea05dcac939334bad338e4dd8c52b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 21:44:10 +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
TreeHugger Robot
827333d9b6 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-03-15 21:24:10 +00:00
TreeHugger Robot
70bb56cb83 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-03-15 21:24:10 +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
Dmitry Dementyev
4f67ca0cfa Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: I887d715a24724806bf20808ca91b6ed23d492b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 20:19:04 +00:00
Dmitry Dementyev
32813a2bef Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: I859c957eb1f94bd9c5858b71c551a1e2e10b0468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 19:39:21 +00:00
Michael Groover
5b5da43ef8 [RESTRICT AUTOMERGE] Add isTrue to assertThat statements in CredentialManagerPCTest 
Change-Id: I34f808bc497971aa53fc7842159795d8407ed113
Fixes: 273763249
Test: atest CredentialManagerPreferenceControllerTest
 2023-03-15 19:28:36 +00:00
Dmitry Dementyev
f56584cd21 Convert argument to intent in AddAccountSettings. am: c7e8052b52 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: I83ab1d878491552ccb3ea1545742d1915fd8a6f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 19:01:57 +00:00
Bill Yi
aef5e4d513 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10f88f394b 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ic930418914a624eefdcb9094c3684e76f2f170d1
 2023-03-15 16:58:00 +00:00
Bill Yi
6484f81d9e [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 787231f181 
Blank merge reason: commit message contains skip directive

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

Change-Id: I462ed789b5300979b9e8bd61a548f1dee85a7ca9
 2023-03-15 16:57:59 +00:00
Julia Reynolds
4d1535441e Merge "Don't show NLSes with excessively long component names" into tm-qpr-dev am: 7626600bbf am: ce0c1c4de7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22066389

Change-Id: I03d1f3a7b40598abfa3bbd1fee85b457a471acd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 15:00:44 +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
ce0c1c4de7 Merge "Don't show NLSes with excessively long component names" into tm-qpr-dev am: 7626600bbf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22066389

Change-Id: I90173ce86cc356ba97e4ff51dffd6b6588bb0c49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 14:27:39 +00:00
Julia Reynolds
7626600bbf Merge "Don't show NLSes with excessively long component names" into tm-qpr-dev 2023-03-15 13:59:23 +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
Jason Hsu
9f29b957e7 Merge "Click the search result "System Sounds" will crash the Settings app" into udc-dev 2023-03-15 12:00:37 +00:00
TreeHugger Robot
df5bbc630d Merge "Hide Dock speaker plays from sound pages" into udc-dev 2023-03-15 11:52:38 +00:00
Mill Chen
a860bf3220 Hide Dock speaker plays from sound pages 
In order to ensure the setting only works on the analog docks, adding
the docking state checks.

Bug: 270492232
Test: manual test
1) Connect to digital dock
2) Check the sound page and the dock speaker plays shouldn't be
   displayed

Change-Id: I1dc1e0aac8b9067ec8f5f1defc721294caf2949e
 2023-03-15 10:25:32 +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
SongFerng Wang
40cf9a2132 Merge "Avoid ANR when UI query network selection state" into udc-dev 2023-03-15 09:46:21 +00:00
TreeHugger Robot
bec6e40dd3 Merge "[Regional preference] Make prerference and fragment title are same." into udc-dev 2023-03-15 08:55:50 +00:00
Daniel Huang
f826b3f427 Merge "The PK settings UI should show subtype labels instead of the subtype's language names." into udc-dev 2023-03-15 08:15:07 +00:00
SongFerngWang
7b9c22348a Avoid ANR when UI query network selection state 
Moving the quert network selection state to back ground
and listening the service state to detect the betwork selection
changed.

Bug: 270652395
Test: atest AutoSelectPreferenceControllerTest
Change-Id: I81a597f28cf7ce25ff4eff5100bdb4d29c897a14
(cherry picked from commit 7b80b4ecd9)
 2023-03-15 07:54:06 +00:00
tom hsu
97821a7317 [Regional preference] Make prerference and fragment title are same. 
Bug: b/272440256
Test: Manual test passed
Change-Id: I0d5ce8f55977ce6fc300b28501f98f4860031380
 2023-03-15 15:35:34 +08:00
Jason Hsu
7ab852b48e Merge "Return getMetricsCategory() for each new page hearing aid and flash notifications in android U" into udc-dev 2023-03-15 06:25:13 +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
Diya Bera
4ffddaa19f Remove subtitle from biometric prompt in Settings (Passwords & Accounts) 
Bug: 250064171
Test: Manual - repro according to bug
Change-Id: I5896c3cec13d65093fa928db042952045269b93f
 2023-03-15 04:17:50 +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
Bill Yi
a73552148b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idd94e1c8ca5d1a8f1c46786e83d83a3d6b68493c
 2023-03-14 19:12:19 -07:00