PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,429 Commits 1 Branch 0 Tags
1672efb2be6fcf38dfa4a0fb35af02840e78e274
Commit Graph

76429 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
1672efb2be [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: cd24de93d8 -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: I4198eac7be30d7713e8efaaf646a94b037b59742
 2020-09-11 22:41:37 +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
cf400a6459 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0492944509 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1040a87b9c1b80857fc93674eff989cde18fd3e1
 2020-09-11 20:10:24 +00:00
TreeHugger Robot
0492944509 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-11 18:59:25 +00:00
Jeremy Goldman
21b6c0a489 Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 1f718138e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12559422

Change-Id: I494885635c00445c2597dea7b126f4d376465213
 2020-09-11 18:18:14 +00:00
Jeremy Goldman
cb0056d159 Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 9b8efdbe4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12549082

Change-Id: Id1c2f18fcc604539253c01c55c988839002d3436
 2020-09-11 18:18:05 +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
98172e82e2 Merge "[Testing] Use AndroidJUnit4 instead in MmsMessagePreferenceControllerTest" am: b5cc1860f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12559487

Change-Id: Ic8f73d50cee796de9dcaf6abbb992ef0602f8e0f
 2020-09-11 10:14:18 +00:00
Betty Chang
b5cc1860f3 Merge "[Testing] Use AndroidJUnit4 instead in MmsMessagePreferenceControllerTest" 2020-09-11 09:50:06 +00:00
Betty Chang
7ed8132b28 Merge "[Testing] Use AndroidJUnit4 instead in AppPrefLoaderTest" am: 4c8756704c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12533600

Change-Id: I633f6df5ea53fd69c5319f080dccf203bc263822
 2020-09-11 08:55:24 +00:00
Mariia Sandrikova
309ad973f5 Merge "Vertically center notification priority labels." am: 17757a96d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12548098

Change-Id: Ic3387ad5836dd0a0cf4a7dc1c8683a9e8f8c3d49
 2020-09-11 08:55:17 +00:00
TreeHugger Robot
80fb884eea Merge "Add permission to protect data when sending broadcast" am: 168f468c92 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12559486

Change-Id: Id45b5abe2cae1035edeb91d09a15faabf4b2822b
 2020-09-11 08:55:05 +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
c014151552 Merge "Disable screen attention when DISALLOW_CONFIG_SCREEN_TIMEOUT" am: f7b60ee566 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12543482

Change-Id: I0dafe9ea5d6806c68d8b166959653803ac4ea530
 2020-09-10 18:00:45 +00:00
Jeremy Goldman
1dfedb24c7 [Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest am: 4126ec2d32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12549080

Change-Id: I1443da523cc4b8504691a3303ee6c12ced520e49
 2020-09-10 18:00:05 +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
TreeHugger Robot
f1ab7bc3ea Merge "Add a feature flag for silky home" am: 20d17a4ca5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12546612

Change-Id: I6e97d7576bca81b4fc237d6fcc2072d4aee78087
 2020-09-10 08:05:45 +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
f24dbb2896 Merge "Update battery saver preference key" am: b7682b98ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12416882

Change-Id: I79d46536e9ca37e401ab17ba701f7dbb85e60f4b
 2020-09-10 07:18:28 +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
29575ab4a4 Merge "[Testing] Use AndroidJUnit4 instead in NetworkDashboardFragmentTest" am: e8b877e3ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12536857

Change-Id: Idaa9d72f4b4988cd6a5b52f93319069d76a49a34
 2020-09-10 03:02:45 +00:00
Betty Chang
54d30c4d40 Merge "[Testing] Use AndroidJUnit4 instead in MobilePlanPreferenceControllerTest" am: 914fdb6b5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12533611

Change-Id: I019fdcdc63adc0e2f1d39e7a5d962a0ac8290f2d
 2020-09-10 03:02:37 +00: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
a376fb08fa Merge "1/n: Clean up BiometricEnrollActivity" am: 3c3450e656 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12550297

Change-Id: Ia31a28266057f3bbd60398fa6a1bf0eea28e9a01
 2020-09-10 01:45:32 +00:00
Kevin Chyn
3c3450e656 Merge "1/n: Clean up BiometricEnrollActivity" 2020-09-10 01:25:23 +00:00
TreeHugger Robot
c068c82e34 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 700b219fb1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I860ecb7701da5038b1249c09c3a0e9bf0a41344e
 2020-09-09 23:01:16 +00:00
TreeHugger Robot
4fe663be55 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 29068a8310 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I16dfb02843bbfa242e33573bcbf66baf8efe01a4
 2020-09-09 23:00:30 +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
e0e81b9e9f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28825ad9e4 -s ours am: c59dc080ce -s ours am: 64fd27fd35 -s ours am: 32589a674e -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: Ie2579389d50eaef12b2b40ec2d4807daa658ad38
 2020-09-09 22:02:57 +00:00