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

42970 Commits

Author SHA1 Message Date
Joshua Mccloskey
b7af67653a Merge "Fix final UDFPS enrollment haptic." into tm-d1-dev am: dfc6bd1edb am: 5ba13f2c14 am: c128e0423c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17917343

Change-Id: Ib6dc297089e88508ed05fff60a05639783576b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 00:44:14 +00:00
Abel Tesfaye
3fb18c1505 Merge "Merge auto-rotate comment/style fixes from tm-dev that couldn't be cherry picked into master" 2022-04-29 00:02:36 +00:00
William Leshner
2950e7c84d Merge "Disable screen saver setting for non-system users." into tm-qpr-dev am: ed5ba9a647 am: e708b185e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871948

Change-Id: Iba3719c80fccd9b8b7a6e88c7ed5dc334804f52d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 23:59:44 +00:00
Prabal Singh
7642301f28 Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601

Change-Id: I0e90fc35f7916ae920ce08a2da996d69e01cf80f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 20:51:44 +00:00
Prabal Singh
89e0eda197 Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601

Change-Id: Ibfa6243c7bb5757515ed2388f2acec1547c023d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 20:41:46 +00:00
Quang Luong
aa7a544c93 Merge "Use WifiEntry.getBandString() to show band for Frequency preference" 2022-04-28 20:29:40 +00:00
Weng Su
5e3d75a6f9 Show restricted message in Wi-Fi Direct summary 
- See the result screenshot in b/203168953#comment9

Bug: 203168953
Test: manual test
make RunSettingsRoboTests \
    ROBOTEST_FILTER=WifiP2PPreferenceControllerTest

Change-Id: I87ad6d7554fbb4aa86d4617438fa359c67544812
 2022-04-29 03:41:56 +08:00
Weng Su
4e34e65228 Show restricted message in Wi-Fi hotspot summary 
- Refine WifiTetherPreferenceController

- See the result screenshot in b/203168953#comment8

Bug: 203168953
Test: manual test
make RunSettingsRoboTests \
    ROBOTEST_FILTER=WifiTetherPreferenceControllerTest

Change-Id: If094178eb0cd9ccf20ff3899dc4b087b45c66f6b
 2022-04-28 18:28:49 +00:00
ykhung
c12b9500e6 Refine the BatteryUsageStats close() method invoke timing 
Refine invoke batteryUsageStats.close() timing to 1) avoid closing it before the UI is ready to ignore showing the battery usage app list data for AOSP version, and 2) avoid close the BatteryUsageStats which is passed from caller components in the BatteryInfo with unexpected behavior.

Bug: 220717612
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I0f75580ac68d72b41fa9a7f43aa6ea694f0992ff
 2022-04-28 17:16:04 +00:00
Prabal Singh
9a8f44227e Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev 2022-04-28 17:12:28 +00:00
Chaohui Wang
ddedb31f6e Fix flicker for Mobile data & Wi-Fi page 
Both "Mobile data usage" & "Non-carrier data usage".

By,
1. Add header in onCreate() instead of onViewCreated()
2. Keep the space for Spinner, and preload initial cycles
3. Keep the space for 3 usage summaries

Bug: 191730864
Test: manual
Change-Id: I8c309c5f51ce6290383a2d10f75e41d0f207d61a
 2022-04-28 23:00:57 +08:00
Prabal Singh
3e2d7f4581 Remove extra argument WorkPolicyUtil constructor 
Only constructor is required for WorkPolicyInfo constructor. The other
dependencies can be derives

Test: make ROBOTEST_FILTER=EnterprisePrivacyFeatureProviderImplTest RunSettingsRoboTests -j40
Change-Id: I7f35e5ed344d452190b333aad7fa823a010d17b3
 2022-04-28 15:21:18 +01:00
Bonian Chen
3a8315d562 Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f am: 69aa69a45d am: cb72c82a18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991

Change-Id: Ic685c3292694e5922de80aaefc6d0d080220a94c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 13:02:19 +00:00
Bonian Chen
ae297c8f19 Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f am: 69aa69a45d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991

Change-Id: Ia1fdd76b65c635d05f3bd74ab4d1ce687794cbf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 12:10:23 +00:00
Bonian Chen
cb72c82a18 Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f am: 69aa69a45d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991

Change-Id: Ibf8b08764cba09c5d72130fd4ecad37960ea2062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 12:10:11 +00:00
Bonian Chen
69aa69a45d Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991

Change-Id: If187192b7619e4b0dea0b565fbc124651b235466
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 11:42:57 +00:00
Bonian Chen
f9be4c5a5c Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991

Change-Id: I5f9c37b458f185ac261f182ae290950c2d2fe856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 11:41:24 +00:00
Bonian Chen
783314ae4f Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev 2022-04-28 11:05:42 +00:00
PETER LIANG
75e30769c1 Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94 am: 17ddbadb74 am: 0109d6100e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953

Change-Id: Ib3397522957ead248821ca1d362b0a59de73053c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 09:15:15 +00:00
PETER LIANG
ec94752f9d Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94 am: acdb3b8a60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953

Change-Id: Ibd5b4a67660b826c0928b37bc9e6c3cd54ca9e2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 08:42:08 +00:00
PETER LIANG
0109d6100e Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94 am: 17ddbadb74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953

Change-Id: If9b7ad6fcce1288eb5c39d1d6150df0e52a3696e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 08:40:23 +00:00
Calvin Pan
049aa73cb1 Add unit test for AppLocalePickerActivity 
Bug: 223503670
Test: atest
Change-Id: I0e92be43d661dd3bff19c3274d1572ef1f4e9c46
 2022-04-28 08:15:34 +00:00
PETER LIANG
17ddbadb74 Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953

Change-Id: I900480866ed1fb85fb7629223f37538c46ff11b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 07:53:30 +00:00
PETER LIANG
acdb3b8a60 Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953

Change-Id: Ic8db083e3d479c6f85615c36113fa747ce10c62d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 07:51:22 +00:00
PETER LIANG
27aa5f9d94 Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev 2022-04-28 06:45:11 +00:00
Kweku Adams
ac66727cde Merge "Make final factors configurable." into tm-dev am: 3663986909 am: 4c5cbeb882 am: 5262325601 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486

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

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

Change-Id: Ie978c707ae47ff97af937bcc114c5a362044aa8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 05:17:58 +00:00
Kweku Adams
664e3805a7 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: I9705e9019fb5a2ef096e1c7a8a8bb6a29bbba0e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 03:36:35 +00:00
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
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
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
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
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
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
7d99d82233 Merge "MainClear: remove obsolete check for multi-volume FDE" 2022-04-27 18:42:32 +00:00