PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
67,480 Commits 1 Branch 0 Tags
2f068a914ee7029d6c76b74975e695c0642d04df
Commit Graph

67480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
2f068a914e Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533ddbb am: fc6cb188b5 am: be8b195fe1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427809

Change-Id: I63d1925ed0bb4347098b926e27dcd4b8887421a4
 2020-09-29 06:04:54 +00:00
Treehugger Robot
be8b195fe1 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533ddbb am: fc6cb188b5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427809

Change-Id: I844668256cf7b87f6dc29272e3d01c7c51b813e5
 2020-09-29 05:29:24 +00:00
Treehugger Robot
722f9f4ea8 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35cea am: b4093123de am: e13fa41a29 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426565

Change-Id: If21308e7f0e67eb39c791206f1e0ee05697b54e8
 2020-09-29 05:14:28 +00:00
Treehugger Robot
6513978872 Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 27806fde5e am: e0890849cd am: 000159f6db 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426553

Change-Id: I9e08c98c28e15bc5833d4c23e569a83840d40172
 2020-09-29 05:14:19 +00:00
Treehugger Robot
24dc71f7e8 Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5 am: 8c58bd4520 am: e570e80eb8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562

Change-Id: I3bf65953a9751b8cfd9dab666f5b1ad400bbdd36
 2020-09-29 05:14:11 +00:00
Treehugger Robot
bb98b793e5 Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2 am: 27978c5d47 am: 5f81bb9a07 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552

Change-Id: Ic774e63dd14139999e96210bc89476edc095e02b
 2020-09-29 05:14:03 +00:00
Treehugger Robot
7f3bbcddf0 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c am: 48c399c18a am: 7c9cc5621b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808

Change-Id: I4397688b601c1a8bd53ce49b5ec6db16eff9db5a
 2020-09-29 05:13:51 +00:00
Treehugger Robot
fc6cb188b5 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 177533ddbb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427809

Change-Id: I8342d2c6813115f9705ca2e5ef201125ea0f9576
 2020-09-29 05:13:43 +00:00
Treehugger Robot
177533ddbb Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" 2020-09-29 05:03:06 +00:00
Treehugger Robot
e13fa41a29 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35cea am: b4093123de 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426565

Change-Id: I9af0af7bbb19cfb1c7337960dc83fbc8e59eeab4
 2020-09-29 05:00:53 +00:00
Treehugger Robot
000159f6db Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 27806fde5e am: e0890849cd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426553

Change-Id: I88eeb86872e17fa03385dad601ed5e11f9b176d7
 2020-09-29 05:00:44 +00:00
Treehugger Robot
e570e80eb8 Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5 am: 8c58bd4520 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562

Change-Id: Ieb5efa13b99875a9177016ec90faadd5e2d17f67
 2020-09-29 05:00:35 +00:00
Treehugger Robot
5f81bb9a07 Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2 am: 27978c5d47 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552

Change-Id: If991989404484407853bd8ac42430761d1e37018
 2020-09-29 05:00:26 +00:00
Treehugger Robot
7c9cc5621b Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c am: 48c399c18a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808

Change-Id: I716f8a88d3d6a6022d679736bb278d3f9eb638bb
 2020-09-29 05:00:12 +00:00
Treehugger Robot
b4093123de Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: 93cec35cea 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426565

Change-Id: Icf8adbe951a8ac435cf3b035bab59508f5f48d0e
 2020-09-29 04:46:44 +00:00
Treehugger Robot
e0890849cd Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 27806fde5e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426553

Change-Id: Ie004598ea8d432d931a54469c1229e1b215ea759
 2020-09-29 04:46:30 +00:00
Treehugger Robot
8c58bd4520 Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" am: 1cd8904fc5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426562

Change-Id: I8de47f938f94b000ba4274b3b4ef2ec77181b0e5
 2020-09-29 04:46:15 +00:00
Treehugger Robot
27978c5d47 Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 3eeb8b44c2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1426552

Change-Id: Ia304c487a41b82f67d51542b09585b52c64ab94c
 2020-09-29 04:45:57 +00:00
Treehugger Robot
48c399c18a Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" am: 71c667322c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427808

Change-Id: If68a407eac5837b85781ae4eb20c4bfad1436700
 2020-09-29 04:45:22 +00:00
Treehugger Robot
93cec35cea Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" 2020-09-29 04:33:23 +00:00
Treehugger Robot
27806fde5e Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" 2020-09-29 04:30:56 +00:00
Treehugger Robot
1cd8904fc5 Merge "[Testing] use AndroidJUnit4 in new EuiccPreferenceControllerTest" 2020-09-29 04:29:55 +00:00
Treehugger Robot
3eeb8b44c2 Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" 2020-09-29 04:28:34 +00:00
Treehugger Robot
71c667322c Merge "[Testing] Use AndroidJUnit4 instead in TelephonyTogglePreferenceControllerTest" 2020-09-29 04:27:45 +00:00
Treehugger Robot
2532a70ba1 Merge "Avoid unexpected state changes for enhanced preferences" am: 7f6271364b am: 6891dd4590 am: 423f9801e9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425491

Change-Id: Ibc85aecd1c5a83e67970fd9daf381e1da3f35bf2
 2020-09-28 02:53:19 +00:00
Treehugger Robot
423f9801e9 Merge "Avoid unexpected state changes for enhanced preferences" am: 7f6271364b am: 6891dd4590 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425491

Change-Id: Ibaaf851ae4b9b486b83b795aa9818413cd0f14bf
 2020-09-28 02:25:26 +00:00
Treehugger Robot
6891dd4590 Merge "Avoid unexpected state changes for enhanced preferences" am: 7f6271364b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425491

Change-Id: I82d1bcd87109666b5b74e8d74811f423ae33105e
 2020-09-28 02:12:11 +00:00
Treehugger Robot
7f6271364b Merge "Avoid unexpected state changes for enhanced preferences" 2020-09-28 02:01:05 +00:00
tim peng
3501adcc86 Merge "Set highest priority as default value to Bluetooth codec" am: 594849082b am: d3a9f472a2 am: f01d260512 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1435258

Change-Id: Iaaef48f2af763fb1905596205bedd6b33574750e
 2020-09-24 13:05:41 +00:00
tim peng
f01d260512 Merge "Set highest priority as default value to Bluetooth codec" am: 594849082b am: d3a9f472a2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1435258

Change-Id: I92cf2605c1e9ee48abedc483a1e461d196b09ef2
 2020-09-24 12:39:06 +00:00
tim peng
d3a9f472a2 Merge "Set highest priority as default value to Bluetooth codec" am: 594849082b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1435258

Change-Id: Ie0aed850c6d0818070d162f4e99c633dc50ef204
 2020-09-24 12:02:53 +00:00
tim peng
594849082b Merge "Set highest priority as default value to Bluetooth codec" 2020-09-24 11:48:51 +00:00
Treehugger Robot
b6aa1db254 Merge "Modify Wi-Fi settings owners file" am: 9d4bc729d9 am: 37be325d99 am: b28e9291ec 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1432713

Change-Id: I5b73f4ca105ae2584db008e87372dd52f4c2211c
 2020-09-24 06:22:23 +00:00
Treehugger Robot
b28e9291ec Merge "Modify Wi-Fi settings owners file" am: 9d4bc729d9 am: 37be325d99 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1432713

Change-Id: Ic856efa4218938ba4b05d0003fcd266f6e5f1a42
 2020-09-24 06:00:40 +00:00
Treehugger Robot
37be325d99 Merge "Modify Wi-Fi settings owners file" am: 9d4bc729d9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1432713

Change-Id: I4ca6e91aeba1cf349255101c0fe1629dc80aeaee
 2020-09-24 05:43:13 +00:00
Treehugger Robot
9d4bc729d9 Merge "Modify Wi-Fi settings owners file" 2020-09-24 05:24:27 +00:00
timhypeng
a45a0e8980 Set highest priority as default value to Bluetooth codec 
-To set highest priority when codec modification comes from development setting

Bug: 165442632
Test: make -j42 RunSettingsRoboTests
Change-Id: I8cfbaa276f3b3e269f4a80e8aae987fbb90f646e
 2020-09-24 12:01:01 +08:00
SongFerng Wang
f4e466d20c Merge "Fix for incorrect display of preferred network type on UI" am: bb25d4841c am: 59996190cc am: 14d4ca3cc0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1431699

Change-Id: Icfb3a897844380990971bab39e19ef1d137e2b53
 2020-09-23 10:36:19 +00:00
SongFerng Wang
14d4ca3cc0 Merge "Fix for incorrect display of preferred network type on UI" am: bb25d4841c am: 59996190cc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1431699

Change-Id: I09f8fc61950baac0f3d987efe84c7c6aaa6c5c13
 2020-09-23 09:50:37 +00:00
SongFerng Wang
59996190cc Merge "Fix for incorrect display of preferred network type on UI" am: bb25d4841c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1431699

Change-Id: I51e37f71b93af68a88c989b29a0230d3c771e26b
 2020-09-23 09:10:26 +00:00
SongFerng Wang
bb25d4841c Merge "Fix for incorrect display of preferred network type on UI" 2020-09-23 08:49:19 +00:00
Betty Chang
1555c9b8e5 Merge "[Telephony settings] Settings crashes when rotate screen in Preferred network type" am: 18e1a7c047 am: df73f7e090 am: c8f766c6d3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1432711

Change-Id: I8100cb2f94593bb36655f6faf3ccd1ab11e56170
 2020-09-23 03:04:38 +00:00
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
Arc Wang
2421aeaa94 Modify Wi-Fi settings owners file 
Test: N/A.
Change-Id: I03afd97db30b82661f2acd73e4720ab56dd2a5f2
 2020-09-21 17:46:03 +08:00
Bill Yi
379ae6c7b8 [automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 94c8353286 am: e7038aa1a3 -s ours am: 657e0f3008 -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: I9bffdf82e1739f2d962e3f5b5aa5369a45d0533b
 2020-09-19 07:01:22 +00:00
Bill Yi
5ff5b3187c [automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 48a84d855f am: 5d7f242557 -s ours am: d50cfa9b63 -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: I208048eb3581ea9f380b6e51a8f253106e942ece
 2020-09-19 07:00:56 +00: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