PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
71,507 Commits 1 Branch 0 Tags
436633ab5d1304f99442be4e11af4dfb6c82723c
Commit Graph

71507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
76798cd54a [automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: c9fae4d80e -s ours am: 46cde30768 -s ours am: fe8f27e508 -s ours 
am skip reason: Change-Id I5c0fe4b0b3be7191d42db14195791d8a8bee503c with SHA-1 91286c4ec9 is in history

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

Change-Id: Id398169928129db8dee129867cdd0664c02f7fa6
 2020-09-14 22:20:14 +00:00
Bill Yi
fe8f27e508 [automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: c9fae4d80e -s ours am: 46cde30768 -s ours 
am skip reason: Change-Id I5c0fe4b0b3be7191d42db14195791d8a8bee503c with SHA-1 91286c4ec9 is in history

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

Change-Id: Id45eaae95313fb02d2fe6ee17507828a8a9f69d9
 2020-09-14 21:50:54 +00:00
Avinash Nalluri
5f5f75cb3d Fix for incorrect display of preferred network type on UI 
Change-Id: I9af0be1004cc101f08acf080d3976401c26e10e6
Bug: 168527547
 2020-09-14 14:39:14 -07:00
Bill Yi
46cde30768 [automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: c9fae4d80e -s ours 
am skip reason: Change-Id I5c0fe4b0b3be7191d42db14195791d8a8bee503c with SHA-1 91286c4ec9 is in history

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

Change-Id: Icfb9e9a3074558ecbfb6f2a41c8b0cf0da133dc5
 2020-09-14 21:18:52 +00:00
Arc Wang
d785fbab68 [DO NOT MERGE][Wi-Fi] Fix fatal exception in WifiConnectionPreferenceController 
WifiConnectionPreferenceController only shows when there are 2 SIMs,
it shows the connected Wi-Fi network.

WifiConnectionPreferenceController does not use WifiPickerTracker
to get a WifiEntry key. It should not launch WifiNetworkDetailsFragment2
which uses a WifiEntry key to find a WifiEntry.

Bug: 168280554
Test: manual
      1. Make MultiNetworkHeaderController available.
      2. Settings -> Network & internet -> click connected Wi-Fi
      3. See Wi-Fi Details
Change-Id: I2acea3564d2d89fe8e120064b33ef342c97edb60
 2020-09-15 01:03:13 +08:00
Bill Yi
de75424d55 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bf99f9c34a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I35bc7cae4aaf07065047079369cfe0c2650dfb70
 2020-09-14 02:21:10 +00:00
Bill Yi
bf99f9c34a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic5e9637ae3803ba74454583f4425cef0f5abcd62
 2020-09-13 20:54:27 +00:00
Bill Yi
c9fae4d80e Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE 
Merged-In: I5c0fe4b0b3be7191d42db14195791d8a8bee503c
Change-Id: I630901126dc42830b8c36ffd9c22d0b903826704
 2020-09-13 07:58:53 -07:00
Treehugger Robot
ae268ea40d Merge "Add goldmanj to settings owners files." am: 56349f714d am: 26f8b54e38 am: 91286c4ec9 am: 368ae3f9b9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425948

Change-Id: I30981eb4d451fc77ba7ee08b9ad734a392c27fca
 2020-09-12 03:02:52 +00:00
Treehugger Robot
368ae3f9b9 Merge "Add goldmanj to settings owners files." am: 56349f714d am: 26f8b54e38 am: 91286c4ec9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425948

Change-Id: Idd7fbf0b35260a8146d029337cb3de7d29a14ed8
 2020-09-12 02:21:21 +00:00
Treehugger Robot
91286c4ec9 Merge "Add goldmanj to settings owners files." am: 56349f714d am: 26f8b54e38 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425948

Change-Id: I5c0fe4b0b3be7191d42db14195791d8a8bee503c
 2020-09-12 01:36:43 +00:00
Treehugger Robot
26f8b54e38 Merge "Add goldmanj to settings owners files." am: 56349f714d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425948

Change-Id: Ic5d53fe6e4a19519b572afb5814f3ff3a3b6cc5b
 2020-09-12 01:09:51 +00:00
Treehugger Robot
56349f714d Merge "Add goldmanj to settings owners files." 2020-09-12 00:24:02 +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
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
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
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
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
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
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
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
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
Xin Li
36cfa7db8e Merge "Merge Android R" 2020-09-10 17:21: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
ae0c6a9fdb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9cb199fccd6af58b074819d1fdd3d2404fcddfc9
 2020-09-09 14:34:33 +00:00