Commit Graph

118023 Commits

Author SHA1 Message Date
TreeHugger Robot
ccba0e07ca [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 86efc1e18e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id42d6535c3b219d289fa4e9bf2739f8839a44834
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-02 01:26:12 +00:00
Bill Yi
ba6987b817 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e80f3b385 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I97f06867b4319a6a0183479dae02753495b3f50f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-02 01:25:54 +00:00
TreeHugger Robot
4b83349d05 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 42468bf0c0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id5c324e54bcf0eb4c5824c38def999c1077b46b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-02 01:25:34 +00:00
Bill Yi
c0b92c74d7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5b52c4b62c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I36708423c3952486150b396b8a0f2fa40dac6bf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-02 01:25:10 +00:00
TreeHugger Robot
86efc1e18e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-02 00:50:39 +00:00
TreeHugger Robot
42468bf0c0 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-02 00:50:39 +00:00
Jack Yu
64511c4934 Revert "Move the auto data switch preference into DDS sim"
This reverts commit 28ce6b9057.

Reason for revert: b/253698164 was not approved by the UX team and discussed with the telephony team.

Change-Id: Ia02b3fb204fad83fee40ee05b908ad8ea56820a3
2022-12-01 22:28:52 +00:00
David Gutierrez
d7f49bf0db Replaced Location and Location Service Page IDs with their appropriate page IDs.
Test: none
Bug: 260070770
Bug: 260051255
Change-Id: I96e7e4d5306d468dd32a9affac28bd8c3f90bb75
2022-12-01 19:38:10 +00:00
Bonian Chen
e15c2c2a5b Merge "[Settings] Code refactor" 2022-12-01 16:29:14 +00:00
TreeHugger Robot
2e671a0247 Merge "Fix flaky fingerprintUdfpsOverlayEnrollment_PlaysAllAnimationsAssetsCorrectly" 2022-12-01 13:08:05 +00:00
Edgar Wang
aa9e26b73c Merge "Avoid media transcode can be bypass guard of developer options" 2022-12-01 11:30:04 +00:00
Chaohui Wang
449987dce2 Merge "Clean up AllAppListModel.filter" 2022-12-01 10:21:21 +00:00
Vania Januar
912284de8e Merge "Add a stylus controller to Bluetooth Device Details." 2022-12-01 10:16:31 +00:00
lbill
b19aeb63b6 Fix flaky fingerprintUdfpsOverlayEnrollment_PlaysAllAnimationsAssetsCorrectly
We should return the corresponding getStageThresholdSteps() for udfps test,
otherwise the test can simulate last stage only and make the test fail.

Bug: 228100413
Bug: 260659253
Test: make RunSettingsRoboTests ROBOTEST_FILTER= \
"com.android.settings.biometrics.fingerprint .FingerprintEnrollEnrollingTest"

Change-Id: I4c712c84f357f275e5a169d16d2ed382fa4494ef
2022-12-01 09:18:10 +00:00
TreeHugger Robot
0ba8fffbcc Merge "Fix the issue that no data is returned when there is no full charge data in the database." 2022-12-01 09:04:22 +00:00
Wesley Wang
ada410afbe Merge "Fix LoaderCallback.onLoadFinished uncalled issue" into tm-qpr-dev am: 1f139628b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20516821

Change-Id: I97e0f4e61b4208ede2e138c55a5747be9008ef04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01 07:04:13 +00:00
Kuan Wang
362def5275 Fix the issue that no data is returned when there is no full charge data
in the database.

Test: make RunSettingsRoboTests + manual
Bug: 260938983
Bug: 253553141
Change-Id: Ie12f239ce83a6ac2cd95c1663cd82e2974a7eaf3
2022-12-01 14:39:03 +08:00
Wesley Wang
1f139628b3 Merge "Fix LoaderCallback.onLoadFinished uncalled issue" into tm-qpr-dev 2022-12-01 06:30:10 +00:00
TreeHugger Robot
de5e399778 [automerger skipped] Merge "Settings 2-pane deep link vulnerabilities" into tm-dev am: 7aade1aced -s ours am: 06b7aa4774 -s ours am: 04837d7a5e -s ours
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498 is already in history

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

Change-Id: I593f31d55f319f6f06a0a78823820d82b44b1005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01 04:14:57 +00:00
Arc Wang
48166d608d [automerger skipped] Settings 2-pane deep link vulnerabilities am: 434c8934c4 -s ours am: f35358a5ec -s ours am: dd065b488c -s ours
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498 is already in history

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

Change-Id: I0344ddf46512844865fd628c4da0fedc1f730832
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01 04:14:48 +00:00
TreeHugger Robot
d5387cd1f1 [automerger skipped] Merge "Settings 2-pane deep link vulnerabilities" into tm-dev am: 7aade1aced -s ours am: 0d5b1df946 -s ours
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498 is already in history

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

Change-Id: Ic6c1822298765f77de0a57ec7c78bdc40df69898
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01 03:39:09 +00:00
Arc Wang
287a6255cd [automerger skipped] Settings 2-pane deep link vulnerabilities am: 434c8934c4 -s ours am: 866f356291 -s ours
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498 is already in history

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

Change-Id: Ieacadc5d2458a4515f96635282a965a3c3f239b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01 03:39:00 +00:00
TreeHugger Robot
04837d7a5e [automerger skipped] Merge "Settings 2-pane deep link vulnerabilities" into tm-dev am: 7aade1aced -s ours am: 06b7aa4774 -s ours
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498 is already in history

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

Change-Id: Ia96d55c64aba6d99e977270dc9a2f93fdf07823b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01 03:37:49 +00:00
Arc Wang
dd065b488c [automerger skipped] Settings 2-pane deep link vulnerabilities am: 434c8934c4 -s ours am: f35358a5ec -s ours
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498 is already in history

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

Change-Id: I657a5ceff11a3a0b9d895111306e24de95afb49c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01 03:37:46 +00:00
TreeHugger Robot
0d5b1df946 [automerger skipped] Merge "Settings 2-pane deep link vulnerabilities" into tm-dev am: 7aade1aced -s ours
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498 is already in history

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

Change-Id: I02b4b73e94d0770fb75a0e694f4c6cfbd9667d98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01 03:11:54 +00:00
Arc Wang
866f356291 [automerger skipped] Settings 2-pane deep link vulnerabilities am: 434c8934c4 -s ours
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498 is already in history

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

Change-Id: I6b91ab2869aa64cac8629fd5c1f014262cb3015e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01 03:11:52 +00:00
TreeHugger Robot
06b7aa4774 [automerger skipped] Merge "Settings 2-pane deep link vulnerabilities" into tm-dev am: 7aade1aced -s ours
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498 is already in history

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

Change-Id: I7b0f9a99ad886490c7a2a28a80fdefd1c00b4995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01 03:11:15 +00:00
Arc Wang
f35358a5ec [automerger skipped] Settings 2-pane deep link vulnerabilities am: 434c8934c4 -s ours
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498 is already in history

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

Change-Id: I5422c2f01dea4a60d3ff0677d167d050fd2efd69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01 03:11:13 +00:00
Arc Wang
fb7ff5c75a [automerger skipped] Merge "Settings 2-pane deep link vulnerabilities" into tm-qpr-dev am: 252bf820ee -s ours
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498 is already in history

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

Change-Id: Ib6050754c0d8712c5e9c25ff94f2d760a2ce9d42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01 02:33:51 +00:00
Arc Wang
97fdb8a7a2 [automerger skipped] Settings 2-pane deep link vulnerabilities am: 23412ad94a -s ours
am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b97498 is already in history

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

Change-Id: I7d301044893e7ceb9f94c8593946ddba329489e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01 02:33:46 +00:00
TreeHugger Robot
7aade1aced Merge "Settings 2-pane deep link vulnerabilities" into tm-dev 2022-12-01 02:31:14 +00:00
Arc Wang
252bf820ee Merge "Settings 2-pane deep link vulnerabilities" into tm-qpr-dev 2022-12-01 01:45:56 +00:00
Joshua Mccloskey
88c9b00bac Merge "Revert "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro."" into tm-qpr-dev am: 1dd3fefa93
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20592595

Change-Id: Ic81bafc8063bba1e65eef7729001556e8a330247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01 01:27:36 +00:00
Ale Nijamkin
2a557b75fe Merge "Brings back "Control from locked device" setting." into tm-qpr-dev am: d81ae0a645
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20590947

Change-Id: I0c201a2a1fd594d81162c9e84fe5c775e602e5a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01 01:26:37 +00:00
Joshua Mccloskey
1dd3fefa93 Merge "Revert "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro."" into tm-qpr-dev 2022-12-01 01:02:40 +00:00
Ale Nijamkin
d81ae0a645 Merge "Brings back "Control from locked device" setting." into tm-qpr-dev 2022-12-01 00:50:42 +00:00
Chaohui Wang
33beb69e33 Clean up AllAppListModel.filter
Since it is same as default.

Bug: 260660819
Test: Make Settings
Change-Id: I7eab8843f44a3457805512bab0d8cb02e9427ca4
2022-12-01 00:40:39 +00:00
Zekan Qian
f8728be7e5 Merge "Use SpaIntent util in Settings." 2022-12-01 00:25:30 +00:00
Bonian Chen
bfacd938f6 [Settings] Code refactor
Create PreferenceController for each of the Preference presented on
screen, which allows SettingsFragment better control the behavior of
Preference.

Bug: 260540995
Test: auto and local test
Change-Id: Iadd9c10fb353d6304d61e65687a505c71a53179a
2022-11-30 23:42:35 +00:00
Bonian Chen
c5bd302514 Merge "[Settings] Remove some warning message" 2022-11-30 23:38:54 +00:00
Dmitry Dementyev
d8c388a284 Merge "Show account name as a single line string." 2022-11-30 22:50:43 +00:00
Bill Yi
24d1b2812e [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e56e42bc2a
Blank merge reason: commit message contains skip directive

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

Change-Id: I425993e2f32f2d167dacf0484d2ba3d2042bd4f4
2022-11-30 22:05:22 +00:00
Wesley Wang
0c5e243f35 Merge "Clean up useless defender dialog code" into tm-qpr-dev am: 2d30eaa3bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20516820

Change-Id: Icd0d4853960504be5e6c358ab76af84bae752df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-30 17:21:44 +00:00
Wesley Wang
eb565adf5d Merge "Add dock defender battery tips" into tm-qpr-dev am: f218f350c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20489769

Change-Id: I5944ee42fe0e6da8a3e3a815ec3cebbabb79b155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-30 17:21:36 +00:00
Joshua Mccloskey
b79c8c6eb4 Merge "Revert "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro."" 2022-11-30 16:58:45 +00:00
Vania Januar
2df165a58a Add a stylus controller to Bluetooth Device Details.
Feature is currently flagged behing SETTINGS_SHOW_STYLUS_PREFERENCES.

Bug: 251201006
Test: SettingsRoboTests StylusDevicesControllerTest
DD: go/stylus-connected-devices-doc
Change-Id: I438b7fe5ca1c94f9dfb506c8918d0e6cb005ca33
2022-11-30 16:06:14 +00:00
Tetiana Meronyk
7eadcb9b20 Merge "Remove system user from displaying in Storage Settings in HSUM" 2022-11-30 12:51:22 +00:00
Zekan Qian
0ce8a8993e Use SpaIntent util in Settings.
Bug: 244122804
Test: unit-test
Change-Id: I5b2d02d102c87620331d4e91e654e848f5a8df6a
2022-11-30 20:43:09 +08:00
Jackson Michael Moreira Miranda
2122313bb5 Merge "Changing the process to create a new user" 2022-11-30 12:05:30 +00:00
Wesley Wang
2d30eaa3bd Merge "Clean up useless defender dialog code" into tm-qpr-dev 2022-11-30 11:57:01 +00:00