Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,394 Commits 1 Branch 0 Tags
d1eff9d22e57372beb99c27cb0072ea601d4adde
Commit Graph

121394 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
d1eff9d22e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5be8078ec1 -s ours am: 32c22fa9a2 -s ours am: ce7f901993 -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: I99ca19c6875727956eae08093c323f6201f300ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 23:09:01 +00:00
Bill Yi
21639e3e78 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 113326ed83 -s ours am: fc7bb1a56c -s ours am: f75cf95c2a -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: I21b6e933dba55a92dc44c15e3e49fbe041855ed9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 23:08:46 +00:00
TreeHugger Robot
76932b5ee4 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: I66a74e160ceae1b9a1df596584cf5454c7168605
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:42:04 +00:00
TreeHugger Robot
8838d8639d 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: Iebb07c483f4fb8af1bb278095136559c5dfa25ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:41:51 +00:00
TreeHugger Robot
b1f5565ee9 [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: I6d9e42ed34c1ea50c8b995e323c9c527cd04ef16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:41:41 +00:00
Yanting Yang
22b870bd7d 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: Iaeea61f5f54a2ab5a2bca25a6520d00bbe726bc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:41:33 +00:00
TreeHugger Robot
b33294a11d 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: I32587c2a97c0487da46aac1b96d6bdc689db1322
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:41:12 +00:00
TreeHugger Robot
c321d9f1ea 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: I6a59a7c1ea69576296c84759522965a3dda26e84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:40:23 +00:00
TreeHugger Robot
a18d8913c7 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: I53382574cf5b7196dad573c91f70f791efcdc026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:40:12 +00:00
TreeHugger Robot
9a0c0d7a82 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: Iea5199833d7ad7ae89c743371e420b70aa295ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:40:01 +00:00
TreeHugger Robot
bd81231f46 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: I40a13c28ce829406bd361c1d7fbcd23f288a46ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:00:03 +00:00
Bill Yi
093609c5d9 [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: Ieb4554d64f6344c701c109c3cb62d598891914c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:59:53 +00:00
TreeHugger Robot
f7050b25ee 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: I234c37cf039b6ea2283ecb3275aa783a4213d205
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:34:53 +00:00
Bill Yi
232d836205 [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: Iff384be9146717a2d09643aede4e40fc550f3f1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:34:48 +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
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
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
TreeHugger Robot
374d72f70c 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: Ia488c31773954f0bcbcc1a691ef303058e40ba12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 16:27:58 +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
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
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
e6e9d18833 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: Icb8d32be637445cf8b9adf22755e02e085daf815
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 13:21:09 +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
e0f5d68f1f 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: If302fb70957b0f7e67799c1368a318b19d0df8dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 12:07:02 +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