PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
67,528 Commits 1 Branch 0 Tags
15c5be7deb086e8cd40b98a72b3e6025f6ecd673
Commit Graph

67528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
15c3938b96 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d033b41dc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8a8a7ada0c4b307ec2088f21037fd7e3696d5684
 2020-09-19 01:47:35 +00:00
Bill Yi
1d033b41dc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2553421a8fef1330908cba8afc10013ce6331778
 2020-09-18 16:54:49 -07:00
Bill Yi
94c8353286 Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" 2020-09-18 18:47:53 +00:00
Bill Yi
48a84d855f Merge mainline-release 6664920 to master - DO NOT MERGE 
Merged-In: Ifa4dc400eb8c87c2514a3629288657520476fbfd
Change-Id: Ib4c9dcb035b9b3e6168309d6d85a310c10e987af
 2020-09-17 21:57:11 -07:00
Bonian Chen
3864e2f218 Merge "[Testing] Remove Robolectric import and use AndroidJUnit4 instead in MobileDataEnabledListenerTest" am: f5fa52884b am: 49936c5eb5 am: ccc406381a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427810

Change-Id: I65499d47dfa6b2905f65bcf6729f4f5e2ab02af9
 2020-09-15 09:09:28 +00:00
Bonian Chen
ccc406381a Merge "[Testing] Remove Robolectric import and use AndroidJUnit4 instead in MobileDataEnabledListenerTest" am: f5fa52884b am: 49936c5eb5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427810

Change-Id: Ifa4dc400eb8c87c2514a3629288657520476fbfd
 2020-09-15 08:40:08 +00:00
Bonian Chen
49936c5eb5 Merge "[Testing] Remove Robolectric import and use AndroidJUnit4 instead in MobileDataEnabledListenerTest" am: f5fa52884b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427810

Change-Id: I27c52df26b156a041cbee79386c388738c6e46c5
 2020-09-15 07:37:06 +00:00
Bonian Chen
f5fa52884b Merge "[Testing] Remove Robolectric import and use AndroidJUnit4 instead in MobileDataEnabledListenerTest" 2020-09-15 07:09:12 +00:00
changbetty
8de635ea7b [Testing] Remove Robolectric import and use AndroidJUnit4 instead in MobileDataEnabledListenerTest 
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context

Bug: 162048313
Test: atest -c MobileDataEnabledListenerTest
Merged-In: I81b3d6ac075666a45649c8d811832a40bdb1b41b
Change-Id: I34687eb69ef62cd3b6ea6519cee608a7b95f242b
 2020-09-15 12:24:10 +08:00
changbetty
a1bdb6f502 [Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest 
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
3. Change Copy Right

Bug: 164986221
Test: atest -c TelephonyBasePreferenceControllerTest
Merged-In: Iabe24aef0b7a5c3aa9d7be275f0c4ed552cdd2e8
Change-Id: I8dbe2f544930ef02732c618fb392c2dec1abaa2f
 2020-09-15 12:21:54 +08:00
changbetty
5c46c0f881 [Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest 
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
3. Change the Copy Right

Bug: 164986958
Test: atest -c TelephonyTogglePreferenceControllerTest
Merged-In: I3d6c39f45cb1efb1742148f20f03372214eb0cbe
Change-Id: Ie7343f8c6dd45add2832679d95372e750ce350ce
 2020-09-15 12:20:10 +08:00
changbetty
2817fa8e44 [Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest 
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
3. Change Copy Right

Bug: 164986221
Test: atest -c TelephonyBasePreferenceControllerTest
Merged-In: Iabe24aef0b7a5c3aa9d7be275f0c4ed552cdd2e8
Change-Id: I96e99506b534dbe7fc9e66739295e09fc543663f
 2020-09-15 12:12:31 +08:00
Jeremy Goldman
0c48f53cfe [Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest 
Test: atest -c EuiccPreferenceControllerTest
Merged-In: I028ca81d38252beb3abccef9e938988510f3f55e
Change-Id: I5fcd2f3e9d2e845ec9e1e2693c10330e4292fb7a
 2020-09-15 12:05:44 +08:00
Jeremy Goldman
ca5aa8786d [Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest 
Diff: https://diff.googleplex.com/#key=OYsSkuGzJNkP
Test: atest -c MobileDataPreferenceControllerTest
Merged-In: I1a2d7b38023681f3db3320aa9f315109280cfbd0
Change-Id: Ica6625bb924ad0e813b4f9cdca62b0126b63214e
 2020-09-15 10:36:14 +08:00
Jeremy Goldman
d713cc6873 [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
Merged-In: Ic66425aca4047d2eacd04509f3bfb315f6dd57fc
Change-Id: I07925cfbb05636bdf7f0efe1811405a01dcf6523
 2020-09-15 10:34:24 +08: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
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
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
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
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
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
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
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
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
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
28825ad9e4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7bc2aaf9e23573eb179950feb6edb427877f0c3f
 2020-09-09 13:56:30 +00:00
Xin Li
f82ee6a5d3 Merge Android R 
Bug: 168057903
Merged-In: I7972af3db5cb995b4a7c4deb982eeef6c3dddaad
Change-Id: I2e7fc7920cde49624ad7bd4053d33fd36d49e809
 2020-09-08 16:56:07 -07:00
Bill Yi
3f9c81573d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3b5e256b0d5be8922d8716955d1744b140835122
 2020-09-06 19:52:05 +00:00
Bill Yi
ee8c3875ba Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0eedcd75ce4aca6fffdd86fb7da8b177c01a9696
 2020-09-06 12:31:40 +00:00
Treehugger Robot
8b2080e7cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8 -s ours am: ada75ad54d -s ours am: f75d48d9f8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieac8fcc9f4209d6682556ba2dd89f0191d138ffe
 2020-09-05 19:31:31 +00:00
Treehugger Robot
f75d48d9f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8 -s ours am: ada75ad54d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8d01018b9590b293954df3c7690477b99ee72e4e
 2020-09-05 18:56:42 +00:00
Treehugger Robot
ada75ad54d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7972af3db5cb995b4a7c4deb982eeef6c3dddaad
 2020-09-05 18:44:03 +00:00