Bill Yi
af6c532d9a
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-03 01:34:02 +00:00
Bill Yi
ba52774bcb
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-03 01:34:02 +00:00
Bill Yi
8ece0258d9
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-03 01:34:02 +00:00
Alejandro Nijamkin
f31108f11a
Specifies nav destination when opening shortcuts.
...
Doing this will open the correct screen when clicking on "Shortcuts"
under Settings > Display > Lock screen.
Fix: 258471384
Test: manually verified that clicking on it opens the wallpaper picker
experience with the correct page showing.
Change-Id: I627bcb9c9fac7a834f1c9d9cb36b73a6c8817af5
2022-12-02 16:08:32 -08:00
Grace Cheng
0d74f4b755
Removes duplicate SFPS string and updates references
...
Removes duplicate security_settings_fingerprint_v2_home_screen_text string and replaces references with security_settings_fingerprint_enroll_finish_v2_message
Test: Open fingerprint settings on SFPS device where fingerprints are enrolled, observe correct string
Fixes: 259316600
Change-Id: I259669a09f5535f3a776793659e5bc6bdb90a44c
Merged-In: I259669a09f5535f3a776793659e5bc6bdb90a44c
DO NOT MERGE
2022-12-02 23:50:37 +00:00
Dmitry Dementyev
da9c2c2757
Merge "Show account name as a single line string." into tm-qpr-dev am: 71dd4b23e8
am: 96999068e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20556506
Change-Id: I6f12ffcadb096c67f4fe94b39dec9addf63775e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 20:45:57 +00:00
Dmitry Dementyev
96999068e9
Merge "Show account name as a single line string." into tm-qpr-dev am: 71dd4b23e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20556506
Change-Id: Ifcc84304cf3d8a69069792a9d1ace64187f125ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 20:05:16 +00:00
Dmitry Dementyev
71dd4b23e8
Merge "Show account name as a single line string." into tm-qpr-dev
2022-12-02 19:30:59 +00:00
Bonian Chen
967bc7b044
[Settings] Code refactor - apply BasePreferenceController
...
Apply BasePreferenceController for better compatible with existing
softawre architecture.
Bug: 260540995
Test: local
Change-Id: I6d69ff878a062299b4d8478f6c0341b37a28532d
2022-12-02 17:23:38 +00:00
David Gutierrez
56475c0747
Updated RecentLocationAccessSeeAllFragment to use a SettingsEnum value rather than a MetricsEvent value.
...
Bug: 260074865
Test: none
Change-Id: I96f7e4d5306d468dd32a9affac28bd8c3f90bb75
2022-12-02 16:11:00 +00:00
David Gutierrez
be120eca3e
Dead code removal
...
Test: on-device testing
Change-Id: I96e7e4d5306d468dd32a9affad28bd8c3f90bb75
2022-12-02 16:10:13 +00:00
João Victor Mendes Freire
b59b276b3a
Fix user not being redirect to user details page
...
When adding a new user and rotating the device, the settings app was not
redirecting to the user settings page, was occured with the device in
portrait.
Bug: 256013217
Test: manually tested
Change-Id: I724883ff3bc3653708d02b31d66b102ab6f7b3be
2022-12-02 14:45:43 +00:00
João Victor Mendes Freire
98c58a00fd
Fix settings crash on users page on config change
...
The background task loses the reference to the Activity once it is
destroyed and recreated after a config change (such as screen rotation).
This resulted in getContext() returning null and openUserDetails()
crashing.
To fix this, we simply store the context before dispatching the
background worker.
Bug: 256021119
Test: manually tested
Change-Id: I3399fa5586de0cb5fc159204166f92902dd42de0
2022-12-02 12:46:33 +00:00
TreeHugger Robot
35a3004491
Merge "Add AlarmsAndRemindersAppListProvider to SpecialAppAccess"
2022-12-02 09:08:07 +00:00
Tom Hsu
dca164e800
Merge "[Settings] modify to use LocaleHelper on AppLocaleDetails" am: 3b9cb9a7d9
am: 916110007d
am: 9ad53e4e89
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2316599
Change-Id: Ic915dba7e9405bb541a07326b404de5308e3ea9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 08:51:07 +00:00
Tom Hsu
9ad53e4e89
Merge "[Settings] modify to use LocaleHelper on AppLocaleDetails" am: 3b9cb9a7d9
am: 916110007d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2316599
Change-Id: I2d1c10ec2cac55485987ac2f5daf38c001800b75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 08:12:47 +00:00
Tom Hsu
916110007d
Merge "[Settings] modify to use LocaleHelper on AppLocaleDetails" am: 3b9cb9a7d9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2316599
Change-Id: I4864b0cecaae1daebfd05a7b4f8d21adb23c31b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 07:42:10 +00:00
Tom Hsu
3b9cb9a7d9
Merge "[Settings] modify to use LocaleHelper on AppLocaleDetails"
2022-12-02 07:16:28 +00:00
Kuan Wang
1e8ca1d7d2
Move fuelgauge_usage_state.proto into fuelgauge folder.
...
Test: make RunSettingsRoboTests + manual
Bug: 20424125
Change-Id: Id0ed25e06258764ec58263c2e2f7dec7bfd81c0a
2022-12-02 15:00:58 +08:00
Chaohui Wang
a45ecb8034
Clean up some UnusedResources detected by lint 8
...
Bug: 234570979
Test: Make Settings
Change-Id: Iaf044fdc4cfcf1eab172f0735c5c7f0330a46107
2022-12-02 14:59:44 +08:00
Chaohui Wang
a3647a7332
Add AlarmsAndRemindersAppListProvider to SpecialAppAccess
...
Bug: 235727273
Test: Manually with Settings
Change-Id: I122033451826df95eadafa75953f1bcda516a9c8
2022-12-02 14:54:50 +08:00
TreeHugger Robot
2eb121ce3f
Merge "Revert "Move the auto data switch preference into DDS sim""
2022-12-02 06:41:39 +00:00
TreeHugger Robot
230c71301a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 86efc1e18e
-s ours am: ccba0e07ca
-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: I74ddab9f2d9da665d6733de476825df64e793e04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 03:35:11 +00:00
Bill Yi
0e2bf342e6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e80f3b385
-s ours am: ba6987b817
-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: Ibbadff4801149d35425b0e04845368192362c4bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 03:34:59 +00:00
TreeHugger Robot
bd2c03890e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 42468bf0c0
-s ours am: 4b83349d05
-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: I0bc059edde7bf72a38e8c4e44a7bd018110d6b61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 03:34:40 +00:00
Bill Yi
d4c0f0a01b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5b52c4b62c
-s ours am: c0b92c74d7
-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: I4576314d0b231cfd203b8915ae6b10401b1a7d30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 03:34:20 +00:00
Wesley Wang
f3aed71e2f
[automerger skipped] Merge "Fix LoaderCallback.onLoadFinished uncalled issue" into tm-qpr-dev am: 1f139628b3
am: ada410afbe
-s ours
...
am skip reason: Merged-In I41a041d5878f9930db44775408380d0d4588faba with SHA-1 41ce87729e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20516821
Change-Id: I8b1f31116bf12742c74041d2855615ce18e36075
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 03:28:06 +00:00
TreeHugger Robot
4e1c8feb39
[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: de5e399778
-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: Ie1c9150fd6b0350fc80ab5d1723baa23fc93b9f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 03:27:53 +00:00
Arc Wang
ce8f6083a1
[automerger skipped] Settings 2-pane deep link vulnerabilities am: 434c8934c4
-s ours am: f35358a5ec
-s ours am: dd065b488c
-s ours am: 48166d608d
-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: Ice430cfa746025931421601d5855163db7bd900d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 03:27:49 +00:00
Arc Wang
f5ba61cb8c
[automerger skipped] Merge "Settings 2-pane deep link vulnerabilities" into tm-qpr-dev am: 252bf820ee
-s ours am: fb7ff5c75a
-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: Iab5eaa1e94b58aadc38244d926709ad3080dd24a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 03:27:37 +00:00
Arc Wang
aa6476ad6f
[automerger skipped] Settings 2-pane deep link vulnerabilities am: 23412ad94a
-s ours am: 97fdb8a7a2
-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: Ifaace91bc41f214098a56d65df964e54cfbbbc58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 03:27:34 +00:00
Joshua Mccloskey
72bfbdd79e
[automerger skipped] Merge "Revert "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro."" into tm-qpr-dev am: 1dd3fefa93
am: 88c9b00bac
-s ours
...
am skip reason: Merged-In I1fcc8b3ecd42859af591a7b250edfedbbdf204e4 with SHA-1 391a34f7d5
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20592595
Change-Id: I5ace273fafbca130bff07d5dbac09a9fa98e251a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 03:27:24 +00:00
Ale Nijamkin
c184a471bf
Merge "Brings back "Control from locked device" setting." into tm-qpr-dev am: d81ae0a645
am: 2a557b75fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20590947
Change-Id: Iefe3c423fae6c6eb720b1b816af196736089067f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 03:27:05 +00:00
Kuan Wang
bc4548b29e
Add BugReportContentProvider to support new battery usage architecture.
...
Test: make RunSettingsRoboTests + manually
Bug: 256123932
Change-Id: I8cc48f5c66e5cbd958bdd73ff8e7d6e555bd9c3b
2022-12-02 02:53:13 +00:00
Wesley Wang
7c9f11071c
[automerger skipped] Merge "Clean up useless defender dialog code" into tm-qpr-dev am: 2d30eaa3bd
am: 0c5e243f35
-s ours
...
am skip reason: Merged-In If3cbe4072c891f1af6b5aa4fb624e4e486c78ad6 with SHA-1 a725bac68c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20516820
Change-Id: I01228ca8f4306593acc6ad9b3797a2146ad45b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 02:09:35 +00:00
Wesley Wang
ed516cc492
[automerger skipped] Merge "Add dock defender battery tips" into tm-qpr-dev am: f218f350c4
am: eb565adf5d
-s ours
...
am skip reason: Merged-In Ib6c09df056744142f42f5e2a13252b58e54c7534 with SHA-1 8d11d9ceea
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20489769
Change-Id: I873fa1567197f977c938bc47d0d8c3f716df0429
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 02:09:26 +00:00
Bill Yi
a9b782d3f1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: ba89f20949
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20594782
Change-Id: Ic68ef1864d3acd846e028118ff06c6f96cfaed49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 01:57:54 +00:00
Bill Yi
ba89f20949
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-12-02 01:32:31 +00:00
Bill Yi
2597fd1b82
Merge changes from topic "tc_change_22113013_19"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e56e42bc2a
Import translations. DO NOT MERGE ANYWHERE
2022-12-02 01:32:31 +00:00
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
Weng Su
c5ec83f1bd
Add minimum TLS version for Wi-Fi EAP network
...
- Remove "TLS v1.3" if device does not support it
Bug: 258372351
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test
Change-Id: If7e41e8c404b4fbf92268afddd92bc6553e60576
2022-12-02 07:06:20 +08: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
Anna Bauza
b6c3a34476
add settings log to user creation actions
...
Bug: 260573368
Test: croot && make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.users.UserSettingsTest"
Change-Id: If54799d074103df3a46945acab337bfa9d88dd0c
2022-12-01 19:11:57 +00:00
Bonian Chen
e15c2c2a5b
Merge "[Settings] Code refactor"
2022-12-01 16:29:14 +00:00