Bill Yi
f19ebcb301
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa
-s ours am: c9c69ea360
-s ours am: 9367464e52
-s ours am: f1f62b352c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24309430
Change-Id: I0f7c024b79cdc14b3dc265508cb82fa3b488a5ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-03 22:01:09 +00:00
Bill Yi
a0f275a513
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa
-s ours am: c9c69ea360
-s ours am: d30110938b
-s ours am: af556233d4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24309430
Change-Id: Id49f20e4a21408870110e7364b6941aef05ad1c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-03 21:59:11 +00:00
Bill Yi
f1f62b352c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa
-s ours am: c9c69ea360
-s ours am: 9367464e52
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24309430
Change-Id: I6a1ae6c7613ccff26f3d41d87146929e310e743a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-03 21:11:20 +00:00
Bill Yi
af556233d4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa
-s ours am: c9c69ea360
-s ours am: d30110938b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24309430
Change-Id: If2c18dc1506888e14ecedec41c3271677ad6cf46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-03 21:11:17 +00:00
Bill Yi
d30110938b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa
-s ours am: c9c69ea360
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24309430
Change-Id: Iacac202218bc55ef63d7c123db16fac26c554e69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-03 20:29:06 +00:00
Bill Yi
0975bc739c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa
-s ours am: 5c84922740
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24309430
Change-Id: Ic05c630a2b77cac4d8dfab1b08b53f5ca8e841e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-03 20:28:25 +00:00
Bill Yi
9367464e52
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa
-s ours am: c9c69ea360
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24309430
Change-Id: I3af9bf6002860f11db00b5b8d0c3340741db7cae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-03 20:27:46 +00:00
Bill Yi
5c84922740
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24309430
Change-Id: I2baa90b1e2e99513f1ed5254a3f1025ef79bc41c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-03 19:45:08 +00:00
Bill Yi
c9c69ea360
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24309430
Change-Id: Ia533f5f510595ee2d748364f1e30e8b8a9a4a911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-03 19:43:11 +00:00
Bill Yi
c52abcd3fa
Import translations. DO NOT MERGE ANYWHERE
...
BUG:291684185
Auto-generated-cl: translation import
Change-Id: Ia444bb69cc499bd8d4a5ffc8c72babdda213c385
2023-08-03 11:04:31 -07:00
Martin Stjernholm
8d5577af57
Merge "Revert "Clean up unused WifiManager.ActionListener"" into main
2023-08-03 13:51:54 +00:00
Martin Stjernholm
c4a0abef8c
Revert "Clean up unused WifiManager.ActionListener"
...
This reverts commit a2adee5362
.
Reason for revert: Breaks build - b/294364808
Change-Id: I4f323c2fc43dddbf2f2dd0e323f026727263c99e
2023-08-03 13:46:27 +00:00
Chaohui Wang
26e4d39680
Merge "Not to retrieve Preference_title" into main
2023-08-03 13:42:48 +00:00
Treehugger Robot
b7db2a6ff3
Merge "Clean up unused WifiManager.ActionListener" into main
2023-08-03 13:23:46 +00:00
Zoey Chen
bebaec607e
Merge "[Regional Preference] Add description for checked/not checked" into main
2023-08-03 11:30:42 +00:00
Graciela Putri
a321c8969e
Merge "Add intent to access aspect ratio app list page" into udc-qpr-dev am: 830c9eec71
am: 4488c05a48
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24264905
Change-Id: Iec4bc825314e4637880d1536d3ba83031b995e93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-03 09:46:17 +00:00
Chaohui Wang
e2821e8c44
Not to retrieve Preference_title
...
No longer retrieve Preference_title in SettingsMainSwitchPreference,
because it's private in androidx, migrate to Preference's getTitle() and
setTitle() instead.
This will help to fix references to resources for Settings in the future
cls.
Bug: 293810334
Test: visual - on Adaptive brightness page
Change-Id: If40a879ff222e980a563662797dffb00f6b62597
2023-08-03 16:48:04 +08:00
Graciela Putri
4488c05a48
Merge "Add intent to access aspect ratio app list page" into udc-qpr-dev am: 830c9eec71
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24264905
Change-Id: I529524033cea3716f9c155c383b797663c8d530a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-03 08:44:57 +00:00
Graciela Putri
830c9eec71
Merge "Add intent to access aspect ratio app list page" into udc-qpr-dev
2023-08-03 08:23:58 +00:00
Edgar Wang
873c321726
Merge "Make Quick setttings developer tiles searchable" into main
2023-08-03 06:22:22 +00:00
Zoey Chen
0f70d8d690
[Regional Preference] Add description for checked/not checked
...
Bug: 288223637
Test: make RunSettingsRoboTests -j128 ROBOTEST_FILTER=LocaleListEditorTest
Change-Id: I0d1a2de93ad2911c555acef2f4e00cd715c62f17
2023-08-03 04:46:41 +00:00
Bill Yi
eb42040010
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a05d24aeb
-s ours am: 3e25353a21
-s ours am: b5fcedb941
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299822
Change-Id: Ib1512c05a99dd17d49ee3946e7daa847ed6d0e1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-03 01:46:48 +00:00
Bill Yi
8ea4cda2ae
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a05d24aeb
-s ours am: b5d9af927d
-s ours am: 6145b47ddb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299822
Change-Id: Icdfedeccdb75bb9450e728f0dac93478768bfddb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-03 01:43:10 +00:00
Bill Yi
b5fcedb941
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a05d24aeb
-s ours am: 3e25353a21
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299822
Change-Id: Id17148d318d09dcaa0b77104651948a1cc46e6dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-03 01:17:13 +00:00
Bill Yi
6145b47ddb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a05d24aeb
-s ours am: b5d9af927d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299822
Change-Id: I918221453e8f08724511185cf4028df1befe7758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-03 00:56:44 +00:00
Bill Yi
b5d9af927d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a05d24aeb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299822
Change-Id: I13cf5ec73c081b0edfa01b2bcfd46b8b87dda63b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-03 00:38:12 +00:00
Bill Yi
3e25353a21
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a05d24aeb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299822
Change-Id: Ic96fddd3151d389e8871be0dd3ec46df6ee9392f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-03 00:37:45 +00:00
Justin McClain
073059a2c7
Merge "Adding owners file." into main am: 3bf19b75fb
am: 01dbc55db8
am: 63256b458d
am: 6d5ae56ab7
am: 2469a9c0cc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2684514
Change-Id: I36e6b269cff0ac2ada526ab3d3a809d500b6b059
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-02 21:59:50 +00:00
Bill Yi
6a05d24aeb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0203970ca5ae0cd875997a601a8f66cf96de39f1
2023-08-02 14:57:40 -07:00
Justin McClain
2469a9c0cc
Merge "Adding owners file." into main am: 3bf19b75fb
am: 01dbc55db8
am: 63256b458d
am: 6d5ae56ab7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2684514
Change-Id: I906643a9b4c923f8c6268eb52326f066e8d0f155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-02 21:13:54 +00:00
Justin McClain
6d5ae56ab7
Merge "Adding owners file." into main am: 3bf19b75fb
am: 01dbc55db8
am: 63256b458d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2684514
Change-Id: I3d616f015890d6ec77efc2558aa780553424dcfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-02 20:30:49 +00:00
Yanting Yang
f5e74b8f49
Merge "Support App details for work profile apps" into main
2023-08-02 20:12:32 +00:00
Eric Biggers
a75824cf37
Merge "Catch exceptions from setLockCredential()" into main
2023-08-02 19:40:27 +00:00
Justin McClain
63256b458d
Merge "Adding owners file." into main am: 3bf19b75fb
am: 01dbc55db8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2684514
Change-Id: I9ae167fda396f42065c30c680bdc66806a02f342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-02 19:22:29 +00:00
Justin McClain
01dbc55db8
Merge "Adding owners file." into main am: 3bf19b75fb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2684514
Change-Id: I2f3b523f8ac1988ba51a9cc77b5868ff8f9e0ec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-02 18:19:22 +00:00
Justin McClain
3bf19b75fb
Merge "Adding owners file." into main
2023-08-02 17:10:52 +00:00
Elliot Sisteron
fb86e84186
Merge "Fix entrerprise strings replacement for Safety Center." into main
2023-08-02 12:11:17 +00:00
Treehugger Robot
b042f81e34
Merge "Remove context from userFeatureProvider" into main
2023-08-02 10:18:09 +00:00
Chaohui Wang
515c0b8e3a
Remove context from userFeatureProvider
...
UserFeatureProviderImpl is created by using application context,
no need pass context in when get.
Bug: 286764889
Test: m Settings
Change-Id: I80ac7124c3278399e562d4d7d49d1847847b92af
2023-08-02 17:25:41 +08:00
Edgar Wang
f77ff76950
Make Quick setttings developer tiles searchable
...
Bug: 286365859
Test: manual verify
Change-Id: I2b3578d4aa80d48a4dcc29cfaac2f25089f0d4e8
2023-08-02 09:25:23 +00:00
Edgar Wang
a789e9214e
Merge "Fix when turn off "Ask for PIN before unpinning" we don't check the result of ChooseLockSettings" into main
2023-08-02 09:15:56 +00:00
Yu Chao (zhào-yò)
2b2dfebaff
Merge "Migrate VpnSettings from RestrictedSettingsFragment to RestrictedDashboardFragment." into main
2023-08-02 08:05:02 +00:00
Chaohui Wang
a2adee5362
Clean up unused WifiManager.ActionListener
...
Bug: 285231003
Test: m Settings
Change-Id: I84ec6a76e486df207140c0f5cbda1c6727fe4989
2023-08-02 15:08:04 +08:00
YK Hung
26b38e7d33
[automerger skipped] Merge "Implement the battery tips cards.(1/2)" into udc-qpr-dev am: 270b7ef18d
am: 42f0193b4b
-s ours
...
am skip reason: Merged-In I4443cdb21b3ba30900fc2f6fcc21c4c56dc1293f with SHA-1 c4ac74872b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24124246
Change-Id: I4759df8246dd798ac07d7da260487af60ba20f2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-02 05:04:50 +00:00
Treehugger Robot
6a0adf823c
Merge "Update the incompatible charging banner tip icon" into udc-qpr-dev am: 103adb753a
am: 5058935211
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24276935
Change-Id: Ia625b2356fa07e3264539f31c1239fea977b307f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-02 05:04:01 +00:00
YK Hung
f6a7b7c349
Merge "Add cache strategy for getUsageSource()." into udc-qpr-dev am: 1b43697eb8
am: 5964c972fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24236476
Change-Id: If040bea85d7eb72805175f2585e1155100d5eb6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-02 05:02:44 +00:00
YK Hung
42f0193b4b
Merge "Implement the battery tips cards.(1/2)" into udc-qpr-dev am: 270b7ef18d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24124246
Change-Id: I657cab61453b5f7708fcf305d1a9611d3022c4d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-02 04:26:29 +00:00
Treehugger Robot
5058935211
Merge "Update the incompatible charging banner tip icon" into udc-qpr-dev am: 103adb753a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24276935
Change-Id: Icda113c650b9544ae8218436fdd0a511f76d2aba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-02 04:23:14 +00:00
YK Hung
5964c972fa
Merge "Add cache strategy for getUsageSource()." into udc-qpr-dev am: 1b43697eb8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24236476
Change-Id: I658e16b80d85c9e7022d57e8f960f11d5e5cd6dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-02 04:21:53 +00:00
YK Hung
270b7ef18d
Merge "Implement the battery tips cards.(1/2)" into udc-qpr-dev
2023-08-02 03:30:08 +00:00