TreeHugger Robot
f02d69dd4f
Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323478
Change-Id: I6fcc26d5db647b9c36b743592a8b58dda52b1847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 20:04:20 +00:00
Julia Reynolds
fc865d217d
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours am: 8befc27425
-s ours am: cfacc2acb8
-s ours am: 85c25d29d7
-s ours am: 684952a8b0
-s ours am: e4ce644bfe
-s ours am: 2a66721ccf
-s ours am: bee2aa0c8b
-s ours am: 9cbd3bdb54
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: I85c1bcef79fdc660b8302e7e3baae730ff89d63c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 19:38:21 +00:00
TreeHugger Robot
5bde972e4e
Merge "Restrict DataUsageList for guest user" into tm-qpr-dev
2023-03-30 19:08:44 +00:00
Julia Reynolds
9cbd3bdb54
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours am: 8befc27425
-s ours am: cfacc2acb8
-s ours am: 85c25d29d7
-s ours am: 684952a8b0
-s ours am: e4ce644bfe
-s ours am: 2a66721ccf
-s ours am: bee2aa0c8b
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: I0e68d9ee05a4b7fa0a5c38d1ac5138ae4272b2ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 18:57:52 +00:00
Julia Reynolds
bee2aa0c8b
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours am: 8befc27425
-s ours am: cfacc2acb8
-s ours am: 85c25d29d7
-s ours am: 684952a8b0
-s ours am: e4ce644bfe
-s ours am: 2a66721ccf
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: I963414b8f0ab062e653ef5d4840d0c048f984144
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 18:10:42 +00:00
Automerger Merge Worker
d7a04c0467
Merge "[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours am: 8befc27425
-s ours am: cfacc2acb8
-s ours am: 85c25d29d7
-s ours am: 684952a8b0
-s ours am: e4ce644bfe
-s ours am: f445bb3b32
-s ours" into udc-dev
2023-03-30 18:09:08 +00:00
Julia Reynolds
fd60b8f6e2
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours am: 8befc27425
-s ours am: cfacc2acb8
-s ours am: 85c25d29d7
-s ours am: 684952a8b0
-s ours am: e4ce644bfe
-s ours am: f445bb3b32
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Ie5eb9b7ca3cc8e0cef4c089d1921f1b172d2a568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 18:07:36 +00:00
TreeHugger Robot
7c6a59f183
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 36e511b35e
-s ours am: 1cd917c2e7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324316
Change-Id: I8bb2163ceb952297b85e727b263fea044a3df8a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 18:07:00 +00:00
Bill Yi
9f71ec4375
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc45b9f125
-s ours am: d87981f9a5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324316
Change-Id: Ica20e5f531ff51bd05a356c0ea985a37ce6157d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 18:06:56 +00:00
TreeHugger Robot
ce7f901993
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5be8078ec1
-s ours am: 32c22fa9a2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324314
Change-Id: I346438976fefed962e0fff4565c738a594de0ee6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 18:06:49 +00:00
Bill Yi
f75cf95c2a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 113326ed83
-s ours am: fc7bb1a56c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324314
Change-Id: Ia4371f0ce39c336df758cf2477fb601f717bc100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 18:06:29 +00:00
Julia Reynolds
2a66721ccf
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours am: 8befc27425
-s ours am: cfacc2acb8
-s ours am: 85c25d29d7
-s ours am: 684952a8b0
-s ours am: e4ce644bfe
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Ie50619f573b47b5998b52d2933465e09397124fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 17:37:28 +00:00
Julia Reynolds
f445bb3b32
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours am: 8befc27425
-s ours am: cfacc2acb8
-s ours am: 85c25d29d7
-s ours am: 684952a8b0
-s ours am: e4ce644bfe
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Ie5dfb22c27e0557719ddd96c104f5582f6c14b43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 17:36:12 +00:00
TreeHugger Robot
5d0b8031fd
Merge "Restrict DataUsageSummary for guest user" into tm-qpr-dev am: b6399c95b3
am: 64aa2889d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323468
Change-Id: I7a12612e6aef131353d1dfbe2c8f4dd86d7b5b1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 17:28:36 +00:00
TreeHugger Robot
d82f2eae5c
Merge "Revert "Disallow screenshot on Wi-Fi QR code settings"" into tm-qpr-dev am: 23c17977fb
am: b3599ae3b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22317902
Change-Id: I3940fb8e1333d051d12ddb5001717d473bf89d39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 17:18:01 +00:00
Julia Reynolds
e4ce644bfe
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours am: 8befc27425
-s ours am: cfacc2acb8
-s ours am: 85c25d29d7
-s ours am: 684952a8b0
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: I760d7d641cc26d9d640c3504414a16a26d70bc24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 16:57:36 +00:00
TreeHugger Robot
1cd917c2e7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 36e511b35e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324316
Change-Id: Ifa057f10375fc7aca6b547d891885b432ff86724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 16:55:34 +00:00
Bill Yi
d87981f9a5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc45b9f125
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324316
Change-Id: Icf4b8a84abb39d55d9f324e9b0800aeb5876b8d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 16:55:25 +00:00
TreeHugger Robot
32c22fa9a2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5be8078ec1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324314
Change-Id: Iac3c79d71dd698f8980ed4e04cf1d98788c1cca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 16:55:22 +00:00
Bill Yi
fc7bb1a56c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 113326ed83
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324314
Change-Id: Iab62e1e02d2ac27033b90fcc15198fb855e7b13a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 16:54:56 +00:00
TreeHugger Robot
64aa2889d1
Merge "Restrict DataUsageSummary for guest user" into tm-qpr-dev am: b6399c95b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323468
Change-Id: I5565f72a9d96e5212b2db3b57d9978648596fba3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 16:30:30 +00:00
TreeHugger Robot
b3599ae3b6
Merge "Revert "Disallow screenshot on Wi-Fi QR code settings"" into tm-qpr-dev am: 23c17977fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22317902
Change-Id: Ieb852ea9a7963f0407f7a78e38df0050085ffbfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 16:30:11 +00:00
Julia Reynolds
684952a8b0
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours am: 8befc27425
-s ours am: cfacc2acb8
-s ours am: 85c25d29d7
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Ic239b938c957b82b8eb072ba55b34ab9388a24af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 16:25:15 +00:00
TreeHugger Robot
d7b40a08fd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 71f0ec1432
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324311
Change-Id: I26610f2a63c6e192822a93f76c0b20c2f06d787d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 16:20:43 +00:00
Yanting Yang
bc12caac88
Merge "Fix the potential DOS issue for the Settings Apps page" into udc-dev
2023-03-30 15:13:16 +00:00
TreeHugger Robot
3d548d2f2d
Merge "Exclude screen on time in battery usage page when the device is in charging." into udc-dev
2023-03-30 15:01:42 +00:00
TreeHugger Robot
535fe83821
Merge "Fix checkcolor_hook error of Settings" into udc-dev
2023-03-30 14:18:11 +00:00
Yanting Yang
705872ada6
Fix checkcolor_hook error of Settings
...
Bug: 276273674
Test: verify with repo upload
Change-Id: Ia5ba89bb1b491785b953ba7909b3fa7528a0a636
2023-03-30 20:51:09 +08:00
TreeHugger Robot
d79985af18
Merge "Unify Tick Preference from Physic keyboard and Regional preference" into udc-dev
2023-03-30 12:39:25 +00:00
Zaiyue Xue
ff11b8e307
Exclude screen on time in battery usage page when the device is in charging.
...
Bug: 265751163
Fix: 265751163
Test: manual
Change-Id: I4ed71e1d6fad56a7cbfc9cd47ed4d791f45261ce
2023-03-30 20:23:33 +08:00
Yanting Yang
56e07c25b3
Fix the potential DOS issue for the Settings Apps page
...
The usage access permission of Settings app could be turned off by
starting the activity with USAGE_ACCESS_SETTINGS. Once the Settings app
loses the usage access permission, it will crash the Apps page which
depends on the usage to show recent apps. And this symptom will persist
even with device reboot.
To fix this vulnerability, we can add a package check in onCreate() to
avoid someone trying to start USAGE_ACCESS_SETTINGS with the Settings
package from third party apps.
Bug: 264260808
Test: Manually verify solution with the repro steps and also test the
normal visiting behavior.
Change-Id: If7cb0880e706369504e432b1f1104d06b1fcfa26
Change-Id: I70871aed763d14a79e474547c77c20a9677af6ff
2023-03-30 19:52:39 +08:00
tom hsu
23359bc0e9
Unify Tick Preference from Physic keyboard and Regional preference
...
- Also change icon color from colorAccentPrimaryVarient to colorAccentPrimary
Bug: b/272398108
Bug: b/264476709
Test: Manual test.
Change-Id: Ide602c6fb9501b832df646692ec618be8a76e7b9
2023-03-30 18:52:23 +08:00
TreeHugger Robot
a99c64dfde
Merge "Remove unused listener" into udc-dev
2023-03-30 09:12:48 +00:00
TreeHugger Robot
71f0ec1432
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-03-30 06:57:35 +00:00
TreeHugger Robot
925fabe0fb
Merge changes from topic "tc_change_23032907_22" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ac1796011a
Import translations. DO NOT MERGE ANYWHERE
2023-03-30 06:57:34 +00:00
TreeHugger Robot
a6b4086da5
Merge changes from topic "tc_change_23032907_23" into udc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 71ac923b9e
Import translations. DO NOT MERGE ANYWHERE
2023-03-30 05:49:47 +00:00
Wesley Wang
7effe64c18
Remove unused listener
...
- Remove OnMainSwitchChangeListener and it's interface since the
callback will duplicate with setCheck() method, cause the toggle on
event come with twice while on and off, in futher to casue some
duplicate work or error metrics logging
Bug: 218405966
Test: make SettingsRoboTests
Change-Id: If20ed6488d21443b9c623e8fe4de383a84ea673a
2023-03-30 12:14:05 +08:00
TreeHugger Robot
36e511b35e
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-03-29 22:22:14 +00:00
TreeHugger Robot
5be8078ec1
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-03-29 22:22:14 +00:00
TreeHugger Robot
b6399c95b3
Merge "Restrict DataUsageSummary for guest user" into tm-qpr-dev
2023-03-29 19:52:27 +00:00
TreeHugger Robot
23c17977fb
Merge "Revert "Disallow screenshot on Wi-Fi QR code settings"" into tm-qpr-dev
2023-03-29 19:51:37 +00:00
TreeHugger Robot
785cdf5499
Merge "chore(#AlaysOnMagnifier): update feature Settings label and description" into udc-dev
2023-03-29 18:05:59 +00:00
Julia Reynolds
85c25d29d7
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours am: 8befc27425
-s ours am: cfacc2acb8
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: I8124bdb6668bc43f275489abb311994ea69645db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-29 16:58:46 +00:00
Roy Chou
7dbfbd73d6
chore(#AlaysOnMagnifier): update feature Settings label and description
...
Update strings based on b/275635152.
Bug: 275635152
Test: manually
Change-Id: Ia00bb87282d4a00518e216079a16fe71ffe32e1f
2023-03-29 16:32:38 +00:00
Julia Reynolds
cfacc2acb8
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours am: 8befc27425
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Ie11a802db36591d58289cd82956c5205f0893244
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-29 16:28:40 +00:00
Julia Reynolds
8befc27425
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: I8d1fa61e9c43c711725505554b464697f1f1ad4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-29 15:56:56 +00:00
Bill Yi
ace08d1f77
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ac1796011a
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324311
Change-Id: Ia6f166fc4c7df9015e0e6607c4fe8d542fc892bc
2023-03-29 14:12:36 +00:00
Bill Yi
feb063c3b6
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 71ac923b9e
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324312
Change-Id: I9b924aee32e04adeddef0d2043ff4880ccbcbd30
2023-03-29 14:12:33 +00:00
Weng Su
6e79778d3c
Restrict DataUsageList for guest user
...
- Don't show DataUsageList if the user is a guest
Bug: 262741858
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageListTest
Change-Id: Id877c2235c6a65683f2d0a0ba381dffba4dd95b8
2023-03-29 21:44:55 +08:00
Jigar Thakkar
e78b3d3f7e
Merge "Fix user starts by using startProfile" into udc-dev
2023-03-29 12:45:50 +00:00