PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
77,782 Commits 1 Branch 0 Tags
1ad6bbad88b9dd22b3954fe3ed2bc65ac048ff9c
Commit Graph

77782 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
Quang Luong
8704114f02 Merge "[Wi-Fi] Show Pie+x Wi-Fi icon when a connected Wi-Fi is not default route" into rvc-qpr-dev am: db667a8971 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12444567

Change-Id: I655406b69ef689a1b604ed6fc6c9e4d2bbf8bf82
 2020-09-11 18:57:42 +00:00
Jeremy Goldman
9e1e47fef7 Add goldmanj to settings owners files. 
Test: N/A, code not edited.
Change-Id: I23a64e52d01ebeda1509d1e207200d868444d955
 2020-09-11 18:55:46 +00:00
Quang Luong
db667a8971 Merge "[Wi-Fi] Show Pie+x Wi-Fi icon when a connected Wi-Fi is not default route" into rvc-qpr-dev 2020-09-11 18:30:32 +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
d7b3015b5f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0770b54a6b -s ours am: bf6337ed40 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib3a00d19a3dfdf48d504f02e413a4b5168dd4b3b
 2020-09-11 17:26:41 +00:00
Bill Yi
53286dbe5d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d10db1189 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I19bf6756d238cc2eac1e0ef4bb8634532793ffe0
 2020-09-11 17:26:22 +00:00
Bill Yi
3cd0a8710e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0770b54a6b -s ours am: e02435c0d5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iae4c4b746419b71471e09da20c13a8301060ba7d
 2020-09-11 17:25:50 +00:00
Bill Yi
bf6337ed40 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0770b54a6b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f3a1ce32ce46d006902ee3108ff7db8022297ba
 2020-09-11 16:48:48 +00:00
Bill Yi
e02435c0d5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0770b54a6b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I49e9c3a2001f1132248274c6aa9c6b6e7644b8da
 2020-09-11 16:46:19 +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
Bill Yi
6d10db1189 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0e7a6b9b829341cbcdf6bace5cb813c6a182f12d
 2020-09-11 14:36:20 +00:00
Bill Yi
0770b54a6b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I713058fc16146fcb8c3ec66cfccaf7c736981a4e
 2020-09-11 13:56:47 +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
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
Ted Wang
3876d72b7c Update state when there is Bluetooth tethering state changed 
Monitor Bluetooth Tethering state and update preference when there is
Bluetooth tethering state change.
Add test case to verify when recieve
BluetoothPan.TETHERING_STATE_CHANGED will update bluetooth state

Bug: 138688805
Test: make RunSettingsRoboTests
Merged-Id: I8f468d1d99ed6d87f6cd8305ef56b0d7a5dec95b
Change-Id: I8f468d1d99ed6d87f6cd8305ef56b0d7a5dec95b
 2020-09-11 09:09:46 +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
changbetty
018ab8e800 [Testing] Use AndroidJUnit4 instead in CarrierSettingsVersionPreferenceControllerTest 
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Change the Copy Right
3. Remove the shadowCarrierConfigManager to mock the
CarrierConfigManager

Bug: 168281601
Test: atest -c CarrierSettingsVersionPreferenceControllerTest
Change-Id: Id14d103a82d2d2954721624ed7a16204ee0f25b6
 2020-09-11 08:45:03 +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
Hugh Chen
602e761ba0 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 07:23:06 +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
Taesu Lee
99637baab2 Avoid unexpected state changes for enhanced preferences 
Assigning current call state to mCallState right before registering
PhoneStateListener so that the preferences have correct state before
first onCallStateChanged() by initial registration even.

Bug: 166307650
Test: Check the preferences state when onStop() -> onStart()

Change-Id: I861a687497ba4da7a845540fd92ae2b865392d60
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
 2020-09-11 14:36:26 +09:00
Taesu Lee
c6cc866d10 Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING 
Bug: 165660739
Test: Manual

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: Iba07c70cb18e8d9f748518d6d141191de5a3d422
 2020-09-11 13:58:18 +09:00
Baligh Uddin
31a41fde11 Merge mainline-prod into master 
$ git merge -s ours origin/mainline-prod

All commits are from upstream.

Bug: 168176832
Test: presubmit
Change-Id: I4702d0dd3c35e43f758100043490e8c566a307bc
 2020-09-11 04:37:10 +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