PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
74,307 Commits 1 Branch 0 Tags
4774e8107a1a460e784d09e42f15214d575574e6
Commit Graph

74307 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
4774e8107a [automerger skipped] Merge "Fix NullPointerException, TelephonyManager.getServiceState is null" am: 11db11d236 am: e73b25e37b am: 42710f069d am: 07536baadf -s ours am: 8b498d237b -s ours 
am skip reason: Change-Id I61e59f7ba9d6c64019d620d6cb80099ded41473f with SHA-1 a12327b5f3 is in history

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

Change-Id: If8a740ff1190738501a6cfccf307edb19952d4b1
 2020-09-11 23:48:45 +00:00
Bonian Chen
0a3a51bdea [automerger skipped] Merge "[Settings] subscription UI should be closed when SIM is removed" am: b3efa585f2 am: 5dba10a956 am: 5975853b18 am: 0f2bc3bad9 am: e68a8c4953 -s ours 
am skip reason: Change-Id I2854147c956faa633a9682eee0028db6cd2d3912 with SHA-1 95b129c87d is in history

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

Change-Id: I4e9b95fd36178898037f191c71e1fa8ebae5e163
 2020-09-11 23:48:36 +00:00
Xin Li
cd24de93d8 [automerger skipped] Merge "Merge Android R" am: 36cfa7db8e -s ours am: 3fd1488575 -s ours am: a486aae1f4 -s ours am: 53be426ddf -s ours am: df5b0a4c2d -s ours 
am skip reason: Change-Id I7972af3db5cb995b4a7c4deb982eeef6c3dddaad with SHA-1 ada75ad54d is in history

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

Change-Id: I7eff9e027cc44c0496570be3d25765dfda1ee9d6
 2020-09-11 21:27:38 +00:00
TreeHugger Robot
0492944509 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-11 18:59:25 +00:00
Jeremy Goldman
1f718138e5 Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" 2020-09-11 17:38:52 +00:00
Jeremy Goldman
9b8efdbe4c Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" 2020-09-11 17:38:18 +00:00
Bill Yi
4b281f9631 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I30d13ccd5d64c3379cf6470730f1bda6b2da5e1f
 2020-09-11 15:51:34 +00:00
Betty Chang
b5cc1860f3 Merge "[Testing] Use AndroidJUnit4 instead in MmsMessagePreferenceControllerTest" 2020-09-11 09:50:06 +00:00
Bonian Chen
8b498d237b [automerger skipped] Merge "Fix NullPointerException, TelephonyManager.getServiceState is null" am: 11db11d236 am: e73b25e37b am: 42710f069d am: 07536baadf -s ours 
am skip reason: Change-Id I61e59f7ba9d6c64019d620d6cb80099ded41473f with SHA-1 a12327b5f3 is in history

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

Change-Id: I14c1d9f0d2ad15fc9355ff505a362b6b09b88a4f
 2020-09-11 09:28:50 +00:00
Bonian Chen
e68a8c4953 Merge "[Settings] subscription UI should be closed when SIM is removed" am: b3efa585f2 am: 5dba10a956 am: 5975853b18 am: 0f2bc3bad9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425488

Change-Id: I2828a05151f0d5dc0a1ba314b15d0ec89710772f
 2020-09-11 09:28:28 +00:00
Bonian Chen
07536baadf Merge "Fix NullPointerException, TelephonyManager.getServiceState is null" am: 11db11d236 am: e73b25e37b am: 42710f069d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425489

Change-Id: Ic862e8fded74ab13e528874abd690e55d5fb2bfd
 2020-09-11 08:42:31 +00:00
Bonian Chen
0f2bc3bad9 Merge "[Settings] subscription UI should be closed when SIM is removed" am: b3efa585f2 am: 5dba10a956 am: 5975853b18 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425488

Change-Id: I74e8fe4508bcafff0bc08a8d88eff771a1158ec3
 2020-09-11 08:42:22 +00:00
Betty Chang
4c8756704c Merge "[Testing] Use AndroidJUnit4 instead in AppPrefLoaderTest" 2020-09-11 08:38:59 +00:00
Mariia Sandrikova
17757a96d5 Merge "Vertically center notification priority labels." 2020-09-11 08:24:28 +00:00
TreeHugger Robot
168f468c92 Merge "Add permission to protect data when sending broadcast" 2020-09-11 08:20:43 +00:00
Bonian Chen
42710f069d Merge "Fix NullPointerException, TelephonyManager.getServiceState is null" am: 11db11d236 am: e73b25e37b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425489

Change-Id: I6a0ebc1fadd409ad57933f5f2e6eb722187c6b40
 2020-09-11 08:07:32 +00:00
Bonian Chen
5975853b18 Merge "[Settings] subscription UI should be closed when SIM is removed" am: b3efa585f2 am: 5dba10a956 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425488

Change-Id: I32087c8910c01323c70eb124cff1247c4d60fed5
 2020-09-11 08:04:23 +00:00
Bonian Chen
e73b25e37b Merge "Fix NullPointerException, TelephonyManager.getServiceState is null" am: 11db11d236 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425489

Change-Id: Ic35b120bdf5470863b2f5112259280ba051a27c5
 2020-09-11 07:18:22 +00:00
Bonian Chen
5dba10a956 Merge "[Settings] subscription UI should be closed when SIM is removed" am: b3efa585f2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425488

Change-Id: I3ced24e5b1d9f382e6041c38414d8247c2e2abe4
 2020-09-11 07:17:53 +00:00
Hugh Chen
75dea8ea80 Add permission to protect data when sending broadcast 
This CL before, DevicePickerFragment didn't check the
whether 3rd-party app have Bluetooth permission before
sending broadcast. It's will cause the 3rd-party app can
get Bluetooth device information without request permission.

This CL will send broadcast with Bluetooth permission that
make sure the receiver who have Bluetooth permission can get
this Bluetooth device infomation.

Bug: 161716630
Test: verify on test apk to confirm that not showing mac address.
Change-Id: I6662dc38b3491e5ee467058dd74863ecac27cdd7
 2020-09-11 15:15:34 +08:00
changbetty
866f40b2f6 [Testing] Use AndroidJUnit4 instead in MmsMessagePreferenceControllerTest 
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Change the Copy Right
3. Remove the ShadowSubscriptionManager

Bug: 168278301
Test: atest -c MmsMessagePreferenceControllerTest
Change-Id: Ie2e9c99f9899d422fde41fcd6cf4a918bc0eaf98
 2020-09-11 14:52:28 +08:00
Bonian Chen
11db11d236 Merge "Fix NullPointerException, TelephonyManager.getServiceState is null" 2020-09-11 06:46:58 +00:00
Bonian Chen
b3efa585f2 Merge "[Settings] subscription UI should be closed when SIM is removed" 2020-09-11 06:46:36 +00:00
changbetty
5a22464bfa [Testing] Use AndroidJUnit4 instead in AppPrefLoaderTest 
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Change the Copy Right

Bug: 168277399
Test: atest -c AppPrefLoaderTest
Change-Id: If4c79ae1831bd531c7e4f0a068f06a592418d7fe
 2020-09-11 06:36:54 +00:00
Xin Li
df5b0a4c2d [automerger skipped] Merge "Merge Android R" am: 36cfa7db8e -s ours am: 3fd1488575 -s ours am: a486aae1f4 -s ours am: 53be426ddf -s ours 
am skip reason: Change-Id I7972af3db5cb995b4a7c4deb982eeef6c3dddaad with SHA-1 ada75ad54d is in history

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

Change-Id: Ie074bd5d37e2694337d1a659596f968bb0fae17c
 2020-09-11 03:59:09 +00:00
Xin Li
53be426ddf [automerger skipped] Merge "Merge Android R" am: 36cfa7db8e -s ours am: 3fd1488575 -s ours am: a486aae1f4 -s ours 
am skip reason: Change-Id I7972af3db5cb995b4a7c4deb982eeef6c3dddaad with SHA-1 ada75ad54d is in history

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

Change-Id: I4185295946132a254d112db31c4f7ef39c34c691
 2020-09-11 03:33:38 +00:00
Xin Li
a486aae1f4 [automerger skipped] Merge "Merge Android R" am: 36cfa7db8e -s ours am: 3fd1488575 -s ours 
am skip reason: Change-Id I7972af3db5cb995b4a7c4deb982eeef6c3dddaad with SHA-1 ada75ad54d is in history

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

Change-Id: I62c3578d5dd1ce64b95dd1b2e54e648a3f362676
 2020-09-11 02:02:47 +00:00
SongFerngWang
0c2cabef6e Fix NullPointerException, TelephonyManager.getServiceState is null 
Add the null protect for TelephonyManager.getServiceState.

Bug: 166676020
Test: 1. make RunSettingsRoboTests ROBOTEST_FILTER=\
RenameMobileNetworkDialogFragmentTest (PASS)
2. make RunSettingsRoboTests ROBOTEST_FILTER=\
AutoSelectPreferenceControllerTest (PASS)
3. make RunSettingsRoboTests ROBOTEST_FILTER=\
PreferredNetworkModePreferenceControllerTest (PASS)
4. make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest (PASS)

Merged-In: I61e59f7ba9d6c64019d620d6cb80099ded41473f
Change-Id: Ib80e5e7498a078435185814d11c3b2bcc4318f59
 2020-09-11 09:27:41 +08:00
Bonian Chen
22a70a5e15 [Settings] subscription UI should be closed when SIM is removed 
When SIM is removed, subscription UI should actively be closed (instead of
waiting for user to leave UI).

Bug: 160197149
Test: manual
Merged-In: I2854147c956faa633a9682eee0028db6cd2d3912
Change-Id: I920b88879a225f1d6ce696c7784d1f6f279c16d9
 2020-09-11 09:18:34 +08:00
Xin Li
3fd1488575 [automerger skipped] Merge "Merge Android R" am: 36cfa7db8e -s ours 
am skip reason: Change-Id I7972af3db5cb995b4a7c4deb982eeef6c3dddaad with SHA-1 ada75ad54d is in history

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

Change-Id: Ie39f3baca4e2059d4e4e1db1a65dd42137223b9d
 2020-09-11 00:40:25 +00:00
Jeremy Goldman
a1aaccf670 [Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest 
1. Rather than mocking the PreferenceScreen, create an instance via
PreferenceManager. Rather than stubbing PreferenceScreen functions to
return the PreferenceCategory mock, the mock is inserted using public
functions.
2. PreferenceCategory active state is checked rather than verifying the
arguments of function calls.
3. mHeaderController test superclass overrides functions which use the
Lifecycle, because doReturn+when on Spy objects has undesired side
effects.
4. Looper message queue prepared for the PreferenceScreen.

Bug: 168130550
Diff: https://diff.googleplex.com/#key=w7a7L3seOowE
Test: atest -c MultiNetworkHeaderControllerTest
Change-Id: Ic66425aca4047d2eacd04509f3bfb315f6dd57fc
 2020-09-10 20:10:22 +00:00
Yi Jiang
f7b60ee566 Merge "Disable screen attention when DISALLOW_CONFIG_SCREEN_TIMEOUT" 2020-09-10 17:33:36 +00:00
Xin Li
36cfa7db8e Merge "Merge Android R" 2020-09-10 17:21:53 +00:00
Mariia Sandrikova
b74bf962cc Vertically center notification priority labels. 
Fix: 161297560
Test: manual
Change-Id: Idd4600a48e1ba50b9a861c9989de9baeb1493eab
 2020-09-10 16:52:15 +00:00
Jeremy Goldman
4126ec2d32 [Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest 
Test: atest -c EuiccPreferenceControllerTest
Change-Id: I028ca81d38252beb3abccef9e938988510f3f55e
 2020-09-10 15:19:01 +00:00
Jeremy Goldman
ff6bc3ce27 [Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest 
Diff: https://diff.googleplex.com/#key=OYsSkuGzJNkP
Test: atest -c MobileDataPreferenceControllerTest
Change-Id: I1a2d7b38023681f3db3320aa9f315109280cfbd0
 2020-09-10 15:15:08 +00:00
Yi Jiang
038d18ff73 Disable screen attention when DISALLOW_CONFIG_SCREEN_TIMEOUT 
Test: atest AdaptiveSleepDetailPreferenceControllerTest
Bug: 161938926
Change-Id: I4ed96ad36efe67091a26cbfe2cde16c116f7c8fb
 2020-09-10 00:58:03 -07:00
TreeHugger Robot
20d17a4ca5 Merge "Add a feature flag for silky home" 2020-09-10 07:55:43 +00:00
TreeHugger Robot
b7682b98ec Merge "Update battery saver preference key" 2020-09-10 07:02:38 +00:00
Yanting Yang
5775d758e3 Add a feature flag for silky home 
Bug: 168166015
Test: robotest & rebuild
Change-Id: I1096f046acc7d34c2658caa2691884dcf0be7cfc
 2020-09-10 13:10:50 +08:00
Betty Chang
e8b877e3ee Merge "[Testing] Use AndroidJUnit4 instead in NetworkDashboardFragmentTest" 2020-09-10 02:30:24 +00:00
Betty Chang
914fdb6b5f Merge "[Testing] Use AndroidJUnit4 instead in MobilePlanPreferenceControllerTest" 2020-09-10 02:30:09 +00:00
Kevin Chyn
3c3450e656 Merge "1/n: Clean up BiometricEnrollActivity" 2020-09-10 01:25:23 +00:00
TreeHugger Robot
700b219fb1 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-09 22:40:15 +00:00
TreeHugger Robot
29068a8310 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-09 22:29:15 +00:00
Kevin Chyn
eb8c0f14ea 1/n: Clean up BiometricEnrollActivity 
Test: fingerprint and face enroll via
      adb shell am start -a android.settings.BIOMETRIC_ENROLL
Test: credential enroll via
      adb shell am start -a android.settings.BIOMETRIC_ENROLL --ei android.provider.extra.BIOMETRIC_AUTHENTICATORS_ALLOWED 32768

Bug: 162341940
Bug: 152242790
Change-Id: Idfdf96891ba9a2394f61eedb0adde2adf9fd85e6
 2020-09-09 15:07:24 -07:00
Bill Yi
32589a674e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4 -s ours am: c59dc080ce -s ours am: 64fd27fd35 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8c99168a70bc12ef906ce13a8a347cddbb07f050
 2020-09-09 21:45:43 +00:00
Bill Yi
733707023e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4 -s ours am: 94d3a30bcf -s ours am: 51726dfb9b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If2f72cd6d841e69446829353ba757b6cf75255f2
 2020-09-09 21:45:26 +00:00
Bill Yi
807c4ed6e8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ae0c6a9fdb -s ours am: ec05886ffb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4b71254bab7afbf816e03c97090da2433e2a941a
 2020-09-09 21:44:53 +00:00
Bill Yi
64fd27fd35 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4 -s ours am: c59dc080ce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I01197f570e0cc53a724b1ee64819aab2ed954b43
 2020-09-09 21:36:37 +00:00