TreeHugger Robot
d8ca3881ae
Merge "Restrict DataUsageSummary for guest user" into tm-qpr-dev am: b6399c95b3
am: 64aa2889d1
am: 5d0b8031fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323468
Change-Id: I2d97c089e7da9b2f955bff2f582a5d2fac3606f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 20:00:30 +00:00
TreeHugger Robot
488b5beb34
Merge "Revert "Disallow screenshot on Wi-Fi QR code settings"" into tm-qpr-dev am: 23c17977fb
am: b3599ae3b6
am: d82f2eae5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22317902
Change-Id: I8340a8631de1e8ac74681042f9139cc2d4385dde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 20:00:23 +00:00
TreeHugger Robot
49e36c9c55
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 71f0ec1432
-s ours am: d7b40a08fd
-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: I63111ff1df19f3006a54a217556d8bd9482da38a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 20:00:15 +00:00
Yanting Yang
72b8392b23
Merge "Fix the potential DOS issue for the Settings Apps page" into udc-dev am: bc12caac88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22343650
Change-Id: I1ccf44c2ee3cdcffcd6f1a92eff8409832174cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 20:00:08 +00:00
TreeHugger Robot
c807f85dc8
Merge "Exclude screen on time in battery usage page when the device is in charging." into udc-dev am: 3d548d2f2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21618252
Change-Id: I322fad46d2c96858923082030c2bed31884e07ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 19:59:56 +00:00
TreeHugger Robot
e23eed7706
Merge "Fix checkcolor_hook error of Settings" into udc-dev am: 535fe83821
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347564
Change-Id: Iab93217fbc909be36122a98482ed8fcc0925a827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 19:59:11 +00:00
TreeHugger Robot
98e2c7dbf0
Merge "Unify Tick Preference from Physic keyboard and Regional preference" into udc-dev am: d79985af18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323477
Change-Id: I48f0c77d0e236249192368bc853d033780d1593e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 19:59:02 +00:00
TreeHugger Robot
a9bb4e14f0
Merge "Remove unused listener" into udc-dev am: a99c64dfde
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339269
Change-Id: I4981fa9180b398f9dbb767e208a83db5461cf3a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 19:58:45 +00:00
TreeHugger Robot
0edd4e2b9a
Merge changes from topic "tc_change_23032907_22" into udc-dev am: 925fabe0fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324311
Change-Id: I3a41df3de7c9766aa1acf631e8db07dcfc823938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 18:45:13 +00:00
Bill Yi
5caf2a7e4e
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ac1796011a
am: ace08d1f77
-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: I99c5dff5d265acbfead5690311b9bfc3475a6679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 18:44:59 +00:00
TreeHugger Robot
2094e9d0c2
Merge changes from topic "tc_change_23032907_23" into udc-dev am: a6b4086da5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324312
Change-Id: I9d53109132363f5f8bcb3289461efb5abe79f413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 18:10:32 +00:00
Bill Yi
8452984341
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 71ac923b9e
am: feb063c3b6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324312
Change-Id: I7d4c3dfad42abb3a98bf9001cccef5f7766dc9ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 18:10:30 +00:00
TreeHugger Robot
bc1ae98aaf
Merge "chore(#AlaysOnMagnifier): update feature Settings label and description" into udc-dev am: 785cdf5499
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22322810
Change-Id: Icfb9ff53a6d6acf61c2303be1019e48d2ce84d4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 17:29:29 +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
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
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
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
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
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
Jigar Thakkar
5babf17c07
Merge "Fix user starts by using startProfile" into udc-dev am: e78b3d3f7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22225682
Change-Id: I734046dd9ac0c3580bcad43ad017feae5f6b04f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-29 13:20:40 +00:00
Jigar Thakkar
e78b3d3f7e
Merge "Fix user starts by using startProfile" into udc-dev
2023-03-29 12:45:50 +00:00
Alexander Milantev
c3b4794c9f
Merge "Avoid activity embedding if the activity is already embedded" into udc-dev am: b8beeb1cda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22071824
Change-Id: Iacad07f090ec6075bbd47ef6f4276b1f43cf5a51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-29 12:08:28 +00:00
Alexander Milantev
b8beeb1cda
Merge "Avoid activity embedding if the activity is already embedded" into udc-dev
2023-03-29 11:26:39 +00:00
Jigar Thakkar
ee0c837117
Fix user starts by using startProfile
...
We used ActivityManager.startUserInBackground earlier to start the clone
user. As per the changes done recently (b/267800984),
UserVisibilityMediator now marks all the profiles/users started usign
startUserInBackground as startedInvisible. This results in the apps not
being able to launch on clone profile without a device restart. To fix
this, in this change we move to using ActivityManager.startProfile to
start the clone-user.
Test: Tested on device by creating clone profile through settings app
Bug: 268011720
Change-Id: I4a594cd4d10cfbd7459b04baa45719885decf87e
2023-03-29 10:58:23 +00:00
Weng Su
3abf4d9d5f
Restrict DataUsageSummary for guest user
...
- Don't show DataUsageSummary if the user is a guest
Bug: 262243574
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryTest
Change-Id: I94d0fd18a81dc0f0adba544340e648d58c5d3358
2023-03-29 18:12:44 +08:00
Zoey Chen
70ce5538ab
Merge "[Settings] Remove the intent receiver due to the register exception" into udc-dev am: 082e8b03df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22305127
Change-Id: I2d61ed6b092d734fa5c94f08bf230c53ae1e2a8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-29 09:45:02 +00:00
TreeHugger Robot
362ef0e2c5
Merge "Fix UI problem in system language list" into udc-dev am: 17d7ce6f87
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323946
Change-Id: I4871e5fd1644dc79d5159760bf9f17a9e2004285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-29 09:44:23 +00:00
Zoey Chen
082e8b03df
Merge "[Settings] Remove the intent receiver due to the register exception" into udc-dev
2023-03-29 09:39:33 +00:00
TreeHugger Robot
17d7ce6f87
Merge "Fix UI problem in system language list" into udc-dev
2023-03-29 09:31:24 +00:00
tom hsu
399bc86397
Fix UI problem in system language list
...
- "Add a language" can not show "language" during font and display size
turn into the biggest.
- This is due to view hight limited, change to wrap content for
solution.
Bug: b/275661390
Test: Manual test.
Change-Id: I306e09a92f3a9e047e6ab9a484e0b60f2b86cc62
2023-03-29 15:55:01 +08:00
Taran Singh
c62df024a9
Merge "[Settings] Make scribe setting default_on and secure" into udc-dev am: a6c79eb283
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21677959
Change-Id: I222751a3a247f806919a440c6eddd77a79fb549f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-29 07:48:06 +00:00
Taran Singh
a6c79eb283
Merge "[Settings] Make scribe setting default_on and secure" into udc-dev
2023-03-29 07:28:33 +00:00