Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
74,293 Commits 1 Branch 0 Tags
cd24de93d83e22c978bda404a310fab6d7c2d283
Commit Graph

74293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Bill Yi
51726dfb9b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4 -s ours am: 94d3a30bcf -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: Icee599694366364e6625d00674516d24621dba9b
 2020-09-09 21:29:42 +00:00
Bill Yi
ec05886ffb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ae0c6a9fdb -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: I8817d412d60565eaba0e7fe6d08209086f83361d
 2020-09-09 21:29:28 +00:00
Bill Yi
c59dc080ce [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4 -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: I2c1aa46ba97bfd9094471fc00a2c62fdabba6313
 2020-09-09 21:09:58 +00:00
Bill Yi
94d3a30bcf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4 -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: Iddec8911b06b8da1cf5244c44e505139a48d8453
 2020-09-09 21:09:57 +00:00
Bill Yi
c01738f847 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1a15ffc0e8765702dc2468d075d3348ed69151c9
 2020-09-09 15:52:22 +00:00
Bill Yi
7840751e7d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8d7aa572632771bb3bb165d0d4d9ad9f7302d574
 2020-09-09 15:12:21 +00:00
Yanting Yang
7b8b881f8a Merge "Resolve tiles intent before prompting a dialog for profile selection" 2020-09-09 14:44:35 +00:00
Bill Yi
ae0c6a9fdb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9cb199fccd6af58b074819d1fdd3d2404fcddfc9
 2020-09-09 14:34:33 +00:00
Bill Yi
28825ad9e4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7bc2aaf9e23573eb179950feb6edb427877f0c3f
 2020-09-09 13:56:30 +00:00
Yanting Yang
552f340dda Resolve tiles intent before prompting a dialog for profile selection 
Symptom:
Once the work profile component of the tile is disabled after Settings
preloaded tiles, Settings will crash when the user clicks the work
option from the profile selection dialog.

Root cause:
Settings just checks the users from the preloaded tiles to prompt
profile selection dialog. It doesn’t check the activity for the work
profile user before launching.

Solution:
Resolve the activity by intent as users before launching if the work
profile is enabled. Directly start activity if only one user is
resolvable, otherwise prompt a dialog for profile selection.

Fixes: 162227425
Test: make RunSettingsRoboTests
Change-Id: Idcc4e5a266ab2a2252db30bb97d4be002212c677
 2020-09-09 18:12:42 +08:00
PETER LIANG
0f61d2aa31 Merge "Add the gray color into the palette for color correction." 2020-09-09 09:09:35 +00:00
changbetty
0bf90f7186 [Testing] Use AndroidJUnit4 instead in MobilePlanPreferenceControllerTest 
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Add @Before setup() for context
3. Change Copy Right
4. Workaround the resource getString to resolve the resource not found

Bug: 167997296
Test: atest -c MobilePlanPreferenceControllerTest
Change-Id: I5f43b6a4d20108195164038c02810b725abbcd06
 2020-09-09 15:34:52 +08:00
changbetty
f24a8be2d8 [Testing] Use AndroidJUnit4 instead in NetworkDashboardFragmentTest 
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
3. Change Copy Right
4. Run the NetworkDashboardFragment on the Main thread

Bug: 168000627
Test: atest -c NetworkDashboardFragmentTest
Change-Id: I6d10737b9ac8299f2d7c847a9fdb1c3bdc4e390d
 2020-09-09 11:26:42 +08:00
Xin Li
f82ee6a5d3 Merge Android R 
Bug: 168057903
Merged-In: I7972af3db5cb995b4a7c4deb982eeef6c3dddaad
Change-Id: I2e7fc7920cde49624ad7bd4053d33fd36d49e809
 2020-09-08 16:56:07 -07:00