PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,802 Commits 1 Branch 0 Tags
c8f766c6d3b2589a9a40a1caf6d72ac1e6576650
Commit Graph

64802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Betty Chang
c8f766c6d3 Merge "[Telephony settings] Settings crashes when rotate screen in Preferred network type" am: 18e1a7c047 am: df73f7e090 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1432711

Change-Id: I1f0164ef41f5e21d9010a16c2cc8ea8d02e6c270
 2020-09-23 02:46:26 +00:00
Betty Chang
df73f7e090 Merge "[Telephony settings] Settings crashes when rotate screen in Preferred network type" am: 18e1a7c047 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1432711

Change-Id: Ie43c80c548f4fc73c515daa4fcb810927220aa63
 2020-09-23 02:22:07 +00:00
Betty Chang
18e1a7c047 Merge "[Telephony settings] Settings crashes when rotate screen in Preferred network type" 2020-09-23 01:45:41 +00:00
changbetty
dd91eadaaf [Telephony settings] Settings crashes when rotate screen in Preferred network type 
When activity is recreated, fragments are automatically reattached.
Need to check the savedInstanceState is null or not when we want to add framgment in MobileNetworkActivity.
(lost to check in ag/9667137)

Bug: 154087690
Test: Manual
      make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkActivityTest
Change-Id: Id169353f6dc10306dddd823a904f0803b26a6ddc
 2020-09-21 18:12:03 +08:00
Bill Yi
657e0f3008 [automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 94c8353286 am: e7038aa1a3 -s ours 
am skip reason: Change-Id Ifa4dc400eb8c87c2514a3629288657520476fbfd with SHA-1 ccc406381a is in history

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

Change-Id: I0201d683bb94a0143cd81fa094993007aa7aad6d
 2020-09-19 05:51:28 +00:00
Bill Yi
d50cfa9b63 [automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 48a84d855f am: 5d7f242557 -s ours 
am skip reason: Change-Id Ifa4dc400eb8c87c2514a3629288657520476fbfd with SHA-1 ccc406381a is in history

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

Change-Id: I4463fa09a3cc3cd986293a03a0cd8424cfa20a41
 2020-09-19 05:50:34 +00:00
Bill Yi
e7038aa1a3 Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 94c8353286 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1430073

Change-Id: I5307234cb034d2f255307cbcff5ebee1a470d79b
 2020-09-19 05:23:11 +00:00
Bill Yi
5d7f242557 Merge mainline-release 6664920 to master - DO NOT MERGE am: 48a84d855f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1430073

Change-Id: I0c107d09b4793a6c16b86a559bebc1a5e92e6e96
 2020-09-19 05:22:34 +00: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
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
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
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
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
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
Xin Li
f82ee6a5d3 Merge Android R 
Bug: 168057903
Merged-In: I7972af3db5cb995b4a7c4deb982eeef6c3dddaad
Change-Id: I2e7fc7920cde49624ad7bd4053d33fd36d49e809
 2020-09-08 16:56:07 -07: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
Treehugger Robot
681beda2f8 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-05 18:32:54 +00:00
Treehugger Robot
966f8a889b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e30450cd68 -s ours am: 0749b2e5b1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifeeb5b1ed6feed0931e8b486485ab03cf1d37555
 2020-09-05 15:02:28 +00:00
Treehugger Robot
2d241c544d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 992e9bc161 -s ours am: a4bfe8a50f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id8aea55919ca80fb40dc091d3325889f08fbc926
 2020-09-05 15:02:22 +00:00
Treehugger Robot
d1b40cfb18 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88fe7c9897 -s ours am: 809f01fc74 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I55ff3c61ba1febe39d468c0a59cd558dd08ed677
 2020-09-05 15:02:05 +00:00
Treehugger Robot
0749b2e5b1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e30450cd68 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4918d11aef9655cc94daaefdbc2c6400823beaa9
 2020-09-05 14:26:56 +00:00
Treehugger Robot
a4bfe8a50f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 992e9bc161 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib43bd3e6188189f638e1c583907708eeb270f5df
 2020-09-05 14:26:49 +00:00
Treehugger Robot
809f01fc74 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88fe7c9897 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2087ff5e1201a5024e7f6948976e073e1f68312f
 2020-09-05 14:26:25 +00:00
Treehugger Robot
e30450cd68 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-05 13:55:03 +00:00
Treehugger Robot
992e9bc161 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-05 13:53:33 +00:00
Treehugger Robot
88fe7c9897 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-05 13:51:43 +00:00
Bill Yi
af59e5d24f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8a59656075c476e775ad386c0f6169b565ad3586
 2020-09-05 13:15:50 +00:00
Bill Yi
821f954a9a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie0ee665d6f119236268486b2d199de22463bd29d
 2020-09-05 12:40:07 +00:00
Bill Yi
7cd983aed7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9421d2ca455dff9dcd838d2e5b232b29e5498a0f
 2020-09-05 02:10:54 -07:00
Bill Yi
47a48929ac Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If4262b66f910ae9cff97a30a89b354938d787805
 2020-09-05 01:26:27 -07:00
TreeHugger Robot
444c856107 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11304fb8a3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If3b574996dcfa6bce46af7187589ddb254bfa807
 2020-09-02 18:05:38 +00:00
TreeHugger Robot
11304fb8a3 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-09-02 17:50:47 +00:00