PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
107,087 Commits 1 Branch 0 Tags
a24d71cceff3e1bda01daa5b83965ecea3094b97
Commit Graph

107087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stanley Wang
f781d8a02a Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076

Change-Id: I72be188119ae313ba3908dd9c10c1e5e99ce7ef9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 03:36:04 +00:00
Kweku Adams
59e93d5225 Merge "Make final factors configurable." into tm-dev am: 3663986909 am: 4c5cbeb882 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486

Change-Id: Ie840b13d8f234eb83978124781a4ff3796579da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 03:31:56 +00:00
Kweku Adams
5262325601 Merge "Make final factors configurable." into tm-dev am: 3663986909 am: 4c5cbeb882 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486

Change-Id: I20dad61683ad461bf3c16e15e3a49a54822cc7e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 03:30:50 +00:00
Stanley Wang
6ef0f6fed7 Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993 am: 5e5ea25a2b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076

Change-Id: Id58665699afa3a9382bd71a3720650cca9c55537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 03:30:22 +00:00
Xinyi Zhou
425316caae Delete Fast Pair Settings am: 3438e20da1 am: 14c317a689 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888

Change-Id: Id001dbcfca557ec12118f3d9fd3d513fb1f5eb1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 03:30:18 +00:00
Stanley Wang
602b1f3d9d Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993 am: 5e5ea25a2b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076

Change-Id: Ia927700b1a9e593e6b04e10338fedfb9ce188bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 03:29:14 +00:00
Xinyi Zhou
d318a79c25 Delete Fast Pair Settings am: 3438e20da1 am: e2db47e9ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888

Change-Id: I20ade5a70e7c36297c969cb4cc6725c74cd14882
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 03:27:59 +00:00
Xinyi Zhou
4be70892e9 Delete Fast Pair Settings am: 3438e20da1 am: e2db47e9ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888

Change-Id: I44ecf5ea109b9a002a178f42d609a7fbf7bfcf1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 03:27:55 +00:00
Kweku Adams
4c5cbeb882 Merge "Make final factors configurable." into tm-dev am: 3663986909 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486

Change-Id: I1b843304bb15bb3b719dbf906a4b96c29b58264c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 03:02:23 +00:00
Stanley Wang
5e5ea25a2b Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076

Change-Id: Iff5be7799232d27c83d1a826d94c559c4d117ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 03:01:48 +00:00
Kweku Adams
3663986909 Merge "Make final factors configurable." into tm-dev 2022-04-28 02:59:29 +00:00
Stanley Wang
0e861f0993 Merge "Fixe the problem of invalid switch preference." into tm-dev 2022-04-28 02:59:20 +00:00
Xinyi Zhou
e2db47e9ab Delete Fast Pair Settings am: 3438e20da1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888

Change-Id: I76dc3c719352bfd0441a03adef1407b147cee9df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 02:54:55 +00:00
Xinyi Zhou
87259241de Delete Fast Pair Settings am: 3438e20da1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888

Change-Id: I456d514b3b7b3db14bbf6fcbfedf89f73128df6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 02:53:55 +00:00
Xinyi Zhou
14c317a689 Delete Fast Pair Settings am: 3438e20da1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888

Change-Id: Iefb16d41b1901b275f4a5019e78326de8d2e917d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 02:53:51 +00:00
Adam Bookatz
8311f68065 Fix Settings getProfileIdsWithDisabled usage 
In two places, Settings uses getProfileIdsWithDisabled intending to
restrict itself to *managed* profiles, but actually allows for any type
of profile.

Since the declared intent is to only deal with managed profiles, we
update the code to only consider managed profiles.

On devices that only have managed profiles (currently almost all
devices), this cl is a no-op.

Bug: 230495929
Bug: 230534572
Bug: 170249807
Test: com.android.settings.UtilsTest
Test: make RunSettingsRoboTests -j
Change-Id: Id04d45839ef61080b00ca2f91525718cb3a85120
 2022-04-27 18:34:07 -07:00
Bill Yi
9ee24ae348 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-04-28 00:36:49 +00:00
Bill Yi
7222a67b5d Merge changes from topic "tc_change_35" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 12b3ef3439
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-28 00:36:48 +00:00
Lais Andrade
82a3146c23 Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb am: c09c49fcf2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337

Change-Id: I4a46a73c2901720829056efa3c5d70ad89fb1114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 00:15:40 +00:00
TreeHugger Robot
930315e23a Merge "Make the checkbox item large enough to click." into tm-dev am: 9fd4377ddb am: f468355b99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950068

Change-Id: I172be05706cc279e66485496360403ebd6bec731
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 00:12:21 +00:00
TreeHugger Robot
a5ffbc5862 Merge "Fix collapsing toolbar can't collapse problem" into tm-dev am: 5395a4eb28 am: 505a0b8798 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944164

Change-Id: I3cd7fc454d81ac28ebb997d9b02b43ffe5755201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 00:11:13 +00:00
Alex Johnston
8742f0bf9d Merge "Fix USB tethering grey out behaviour" into tm-dev am: 7828dda503 am: 6509505975 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944005

Change-Id: I3ff0a70e17e7366ec1c1b4c95400b5482d61ef85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 00:09:46 +00:00
Weng Su
ff3ced78f9 Merge "Check Wi-Fi permissions for QrCode scanner" into tm-dev am: b6629ab55b am: 37169b93d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944025

Change-Id: I398c19e8f68b32f47742c0c864ae57b69e30c426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:49:41 +00:00
Stanley Wang
211b4fa498 Merge "Fixe the problem of invalid switch preference" into tm-dev am: 17365c8e47 am: 07b4f09127 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17899767

Change-Id: I2b12337792b23962198e3ecbcf7823a441ab8dd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:49:28 +00:00
TreeHugger Robot
0a4de94f81 [automerger skipped] Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9 am: 85705f38d1 -s ours 
am skip reason: skipped by user bonianchen

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950674

Change-Id: I57386b761ffbf62eee86d601f83c5fe59c9a59f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:49:14 +00:00
Xinyi Zhou
3438e20da1 Delete Fast Pair Settings 
Fast Pair will not be launched in T.

Test: -m
Fix: 228614515
Fix: 229356812
Change-Id: I173453e84f0d1b525ea4796ed875f53f30c20d96
 2022-04-27 12:29:59 -07:00
Hugh Chen
0c128aca74 Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec am: 681d69b2b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602

Change-Id: I72fc05a7068125f4c6b68ab27b3a1532ef5f61c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:50:51 +00:00
TreeHugger Robot
cd1904d9ce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27 -s ours am: 5ffb8f9140 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17930029

Change-Id: I436cbf5fca6e2501887ce457969b8eefac2d1318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:44:27 +00:00
Bill Yi
168d5f1029 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours am: ecb3697aec -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17930029

Change-Id: I7158f1ed670f3af6f6707a4991eb85dd42bee67e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:44:10 +00:00
TreeHugger Robot
7d99d82233 Merge "MainClear: remove obsolete check for multi-volume FDE" 2022-04-27 18:42:32 +00:00
TreeHugger Robot
e8731b9422 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 584d9ef1f2 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17930243

Change-Id: I347d29c5dbd465567ba62e06f58715c58801c2b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:40:45 +00:00
Bill Yi
6efb9966c5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aaa5c995b4 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17930243

Change-Id: I16041617955ee84b8bc4b5d5e4d799ba94ef9a03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:40:29 +00:00
TreeHugger Robot
c3ad3d8276 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74 -s ours am: 1f6b29b35a -s ours am: d35e6c93ae -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038

Change-Id: I1703187cb8781b73e95be142383b530b6b961a34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:34:16 +00:00
Bill Yi
bb0ba936d8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f -s ours am: 7146184316 -s ours am: 10a83a199a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038

Change-Id: I87fa781d28a254ef5a6be80c98e37abd52b46572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:34:02 +00:00
TreeHugger Robot
b0b62f812b Merge "Fix the description of one-handed mode doesn't change immediately in Gestures page after users turn on/off in Quick Settings" into tm-dev am: a72b9398fb am: c05c41717e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944022

Change-Id: Ie172ade12edeae024b1ad3eb90d72848be57837c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:32:53 +00:00
Bill Yi
97c746c76f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35705d94c8 -s ours am: fa497ab8af -s ours am: debd5bf4bb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17934542

Change-Id: I8ecc5adaf09e37dfe9a7e21142143e75004cb17d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:29:25 +00:00
Bonian Chen
b3afc78e2d [automerger skipped] Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev am: 73c8e2f45a am: 065ca3dd2f -s ours 
am skip reason: skipped by user bonianchen

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859326

Change-Id: I736b591ea94a7c46e334f73e63ff5650ab351aec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:28:39 +00:00
Bonian Chen
aaf90b2592 Merge "[Settings] Fix flaky presubmit failure" into tm-dev am: 43cf210f90 am: 313284a9ae am: 6ed05ee86f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914304

Change-Id: I992cb714a5ba7ecd7773cf1d385d7a5abf89e67f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:05:11 +00:00
Automerger Merge Worker
1b777b7d8b Merge "Merge "Fix ZenModeScheduleRuleSettingsTest to test onAttach" into tm-dev am: 29c62e7873 am: b16261a8e1" into tm-d1-dev-plus-aosp am: 2e0303ef25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944009

Change-Id: Ibd7cf0196893c998b042bff3873ea604e5c4e5a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:05:05 +00:00
Bonian Chen
e09189620d Merge "[Settings] Fix flaky presubmit failure" into tm-dev am: 43cf210f90 am: 935706425d am: 3a21d96f32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914304

Change-Id: I1ffbe2b734e365ffb4197f9485c36f233f3df708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:04:56 +00:00
Bonian Chen
6fdeff527b Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev am: b92156c03e am: dbbab09d11 am: a9026bb486 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950673

Change-Id: I66ae3de52ec0e2cd415d299691f259c45f704ae8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:04:49 +00:00
Yuri Lin
9bc2aff5d7 Merge "Fix ZenModeScheduleRuleSettingsTest to test onAttach" into tm-dev am: 29c62e7873 am: 0e7619f290 am: 16a5535dd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944009

Change-Id: I6c091ce85dca6810db25cb5a3a51aeeefbf70c1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:04:35 +00:00
Lais Andrade
b34d581d2c Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb am: 9066672c7d am: 4e60155f11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337

Change-Id: I85fca83fcf7e03b306277508da6d6b4880474f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:04:22 +00:00
Bonian Chen
0c22cd1ddd Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev am: b92156c03e am: f211a82f23 am: fc454f31aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950673

Change-Id: I39539a49e5d8e383976f61b0d63882fce717f7bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:04:15 +00:00
Lais Andrade
b760de645d Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb am: e673e22181 am: ae1ae56fb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337

Change-Id: Id60b72fccac5d79ca86854d9109bd20d30899eb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:03:51 +00:00
TreeHugger Robot
e0c25fddba Merge "Make the checkbox item large enough to click." into tm-dev am: 9fd4377ddb am: 54467e3eb8 am: 966e1e8e49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950068

Change-Id: If903749685371471f3fdee44818dd55800412e9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:02:59 +00:00
Bonian Chen
14ccecd03b Merge "[Settings] Fix flaky presubmit failure" into tm-dev am: 43cf210f90 am: 313284a9ae am: 5b79b590c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914304

Change-Id: I344d752191996e60dfbbed3151e8df0acba89ad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:02:27 +00:00
Yuri Lin
727d912d0b Merge "Fix ZenModeScheduleRuleSettingsTest to test onAttach" into tm-dev am: 29c62e7873 am: b16261a8e1 am: 8a3c983398 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944009

Change-Id: I41f31d859bd28ea0ac1955fc345677293b0abea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:02:13 +00:00
Bonian Chen
3c4956b7c4 Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev am: b92156c03e am: dbbab09d11 am: a725b0c3da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950673

Change-Id: Ie33fe0bbd2e508d7c3ce99160846cbe3da13c60b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:01:56 +00:00
Lais Andrade
94c826bda7 Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb am: 9066672c7d am: 109b181126 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337

Change-Id: Ie62b21422489a62129b9d5c64ab8049413069cba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 18:01:48 +00:00