PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,481 Commits 1 Branch 0 Tags
02be0c65f1bd7a7cc729ba2b7027e184c1d2f49b
Commit Graph

58481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
02be0c65f1 Merge "Listed order on "previously connected" depend on recently connected devices" 2020-02-05 06:20:56 +00:00
TreeHugger Robot
638b45e4f3 Merge "[Wi-Fi] Apply cache in WifiTracker to update the signal icon immediatelly." 2020-02-05 05:54:17 +00:00
Bonian Chen
9e5c6130cd Merge "[Settings] Test case failure - RenameMobileNetworkDialogFragmentTest" 2020-02-05 04:57:10 +00:00
Bonian Chen
1768669a4c [Settings] Test case failure - RenameMobileNetworkDialogFragmentTest 
Ignore test case to avoid from blocking others

Bug: 148907677
Test: build pass
Change-Id: I99101acfc62f8cd247d1a727936638a0ba18cf70
 2020-02-05 12:32:19 +08:00
Automerger Merge Worker
626581e339 [automerger skipped] Merge changes from topic "platform-vpn-user-consent" am: e9b3f3303e am: 5437a80536 am: 8ef20ea9c5 -s ours 
am skip reason: Change-Id I10cf17419636c3c30e1ec06bb3e6751cb5c65d9b with SHA-1 98678221fa is in history

Change-Id: I542dbaf8c20d98a31419381b86d8ed99fbed13f6
 2020-02-05 00:38:43 +00:00
Automerger Merge Worker
2fec4ba1ed Add Platform VPNs to VPN list am: bcd6b8cbca am: 846de91c30 am: 00e44f608c 
Change-Id: Ie11a67984c29b71302239e4491269e50be9be1fb
 2020-02-05 00:38:40 +00:00
Automerger Merge Worker
8ef20ea9c5 Merge changes from topic "platform-vpn-user-consent" am: e9b3f3303e am: 5437a80536 
Change-Id: I82d301a58cb8ea8234f2d4924123a07a3f02b784
 2020-02-05 00:24:12 +00:00
Automerger Merge Worker
00e44f608c Add Platform VPNs to VPN list am: bcd6b8cbca am: 846de91c30 
Change-Id: Ice85a8a0c5b526f67a56e004e3b2d3092076c658
 2020-02-05 00:24:10 +00:00
Automerger Merge Worker
5437a80536 Merge changes from topic "platform-vpn-user-consent" am: e9b3f3303e 
Change-Id: Ia6cd10ee5a8d78f6002874f69d08ed53a3013572
 2020-02-05 00:07:43 +00:00
Automerger Merge Worker
846de91c30 Add Platform VPNs to VPN list am: bcd6b8cbca 
Change-Id: Ic6e288d2e4b9634ad7a050361b309fab212e6520
 2020-02-05 00:07:40 +00:00
Benedict Wong
e9b3f3303e Merge changes from topic "platform-vpn-user-consent" 
* changes:
  Update setVpnPackageAuthorization call with VPN type
  Add Platform VPNs to VPN list
 2020-02-04 23:56:16 +00:00
Yiwen Chen
3099df31d4 Merge "Implement new vibrate for calls in Settings." 2020-02-04 22:55:57 +00:00
Benedict Wong
62e55361a8 Update setVpnPackageAuthorization call with VPN type 
This commit updates the Settings to also pass the additional
VPN type for app-based VPNs.

Bug: 144246835
Test: Compiles, manually tested to be working
Change-Id: I10cf17419636c3c30e1ec06bb3e6751cb5c65d9b
Merged-In: I10cf17419636c3c30e1ec06bb3e6751cb5c65d9b
 2020-02-04 21:06:07 +00:00
Benedict Wong
15ba2177c4 Merge "Update setVpnPackageAuthorization call with VPN type" 2020-02-04 21:04:01 +00:00
TreeHugger Robot
1bfa4a8245 Merge "Revert "Revert "[Settings] Remove dependency of TelephonyIntents""" 2020-02-04 17:56:39 +00:00
TreeHugger Robot
e337835c19 Merge "Ignore drag action on the switch button of MasterSwitchPreference" 2020-02-04 14:54:09 +00:00
Bonian Chen
106e52e021 Revert "Revert "[Settings] Remove dependency of TelephonyIntents"" 
This reverts commit 36d1c17c71.

Reason for revert: Fix has landed at ag/10241730

Change-Id: Iabde9194ed69b7bdb0a91058242bc0c239496dc5
 2020-02-04 13:52:41 +00:00
TreeHugger Robot
85587fc0c1 Merge "Update dark theme slice for new display criteria" 2020-02-04 13:37:21 +00:00
Alex Johnston
72a3827f68 Merge "Update work profile app lock to latest spec" 2020-02-04 13:37:15 +00:00
Morten Krogh-Jespersen
267561a6ef Merge "Revert "[Settings] Remove dependency of TelephonyIntents"" 2020-02-04 13:16:21 +00:00
Morten Krogh-Jespersen
36d1c17c71 Revert "[Settings] Remove dependency of TelephonyIntents" 
This reverts commit 6a6b416c3d.

Reason for revert: b/148838390

Change-Id: I9be2c370c6923e9d7293e4eff5306bc54d49ade2
 2020-02-04 13:10:59 +00:00
TreeHugger Robot
2f3b3a20fc Merge "Update battery manager toggle to support on / off summary." 2020-02-04 13:10:41 +00:00
Bonian Chen
15df6d4b83 Merge "[Settings] fix failure test case - ConditionContextualCardController" 2020-02-04 13:08:10 +00:00
TreeHugger Robot
bd64ff75b7 Merge "Fix failing test cases" 2020-02-04 12:38:46 +00:00
Bonian Chen
2d29e935f7 Merge "[Settings] Add ImsQueryProvisioningStat for VT" 2020-02-04 12:18:49 +00:00
Automerger Merge Worker
b7f5bf4682 [automerger skipped] Merge "[Settings] Avoid rename inactive subscription from NullPointerException" am: 91638e079f am: eafda3c724 am: b0ebb47014 -s ours 
am skip reason: Change-Id Ifc245bec739b4c81d2cee04b091bcdb54d567d4a with SHA-1 1b71b5e601 is in history

Change-Id: I2eae2a31035e0d337f0f0b0554cead9cadaa16b1
 2020-02-04 11:09:10 +00:00
Automerger Merge Worker
b0ebb47014 Merge "[Settings] Avoid rename inactive subscription from NullPointerException" am: 91638e079f am: eafda3c724 
Change-Id: I3e92055ad03cfa4f0bbe80185840f5783559c96f
 2020-02-04 10:59:36 +00:00
Bonian Chen
8873444847 [Settings] fix failure test case - ConditionContextualCardController 
Setup parameters required by CellularDataConditionController

Bug: 148834975
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=ConditionContextualCardControllerTest
Change-Id: I974df385d956dbff10aac874487d07d626992e4b
 2020-02-04 18:58:06 +08:00
Automerger Merge Worker
eafda3c724 Merge "[Settings] Avoid rename inactive subscription from NullPointerException" am: 91638e079f 
Change-Id: I9a488c3d7b6452b64d1cb8b532d0f66f25017773
 2020-02-04 10:51:31 +00:00
Bonian Chen
91638e079f Merge "[Settings] Avoid rename inactive subscription from NullPointerException" 2020-02-04 10:43:01 +00:00
Arc Wang
0466c6e005 Ignore drag action on the switch button of MasterSwitchPreference 
MasterSwitchPreference provides a toggle switch and it only
acts for clicking events. This fix consumes move events to
ignore drag actions.

Bug: 148770615
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MasterSwitchPreferenceTest
      Manually drag the switch button of MasterSwitchPreference and
      observe the switch state is not changed.
Change-Id: I0d8b947b32d35b85403fc65605c18c09a4053135
 2020-02-04 18:26:33 +08:00
Tsung-Mao Fang
1361e89b29 Fix failing test cases 
Test: Run robo test
Fix: 148200531
Change-Id: I73698515d6b6572b2d81eb4ca34a3dd7c370968a
 2020-02-04 18:19:27 +08:00
Bonian Chen
2cf0ba57f8 Merge "[Settings] Avoid rename inactive subscription from NullPointerException" 2020-02-04 10:04:18 +00:00
Sunny Shao
1f3429a25d Update dark theme slice for new display criteria 
- Add "dark theme scheduling is off" as a new display creteria.

Fixes: 142476879
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.homepage
Change-Id: Ib88edd0bd9d4b776cdf8ec93bac4e199e0da41de
 2020-02-04 17:31:51 +08:00
TreeHugger Robot
21276e72d6 Merge "[Wi-Fi] Fix strange split line when there is no connected network" 2020-02-04 07:16:39 +00:00
Jack Yu
5092df3f76 Merge "Refactored cell broadcast area info support" 2020-02-04 07:00:53 +00:00
Benedict Wong
98678221fa Update setVpnPackageAuthorization call with VPN type 
This commit updates the Settings to also pass the additional
VPN type for app-based VPNs.

Bug: 144246835
Test: Compiles, manually tested to be working
Change-Id: I10cf17419636c3c30e1ec06bb3e6751cb5c65d9b
 2020-02-03 21:28:26 -08:00
Automerger Merge Worker
35afeb8c4e Merge "Use IEC units in app info data usage." am: 1668f18a16 am: d9d463013f am: b04872c35d 
Change-Id: I4fea31a06be212c397099a313e9159740b4406a8
 2020-02-04 04:56:36 +00:00
Automerger Merge Worker
b04872c35d Merge "Use IEC units in app info data usage." am: 1668f18a16 am: d9d463013f 
Change-Id: Ic3a5bb04189779d0932663b690d37fed095edabc
 2020-02-04 04:50:40 +00:00
Automerger Merge Worker
d9d463013f Merge "Use IEC units in app info data usage." am: 1668f18a16 
Change-Id: Ief2ba0f1b8338b5b9472bb2837fcb778d2652aba
 2020-02-04 04:43:28 +00:00
Treehugger Robot
1668f18a16 Merge "Use IEC units in app info data usage." 2020-02-04 04:33:30 +00:00
Tsung-Mao Fang
63058f1d1c Merge "Ignore failing test cases" 2020-02-04 04:15:29 +00:00
TreeHugger Robot
3278737129 Merge "[Wi-Fi] Change Auto-connect summary string" 2020-02-04 04:09:04 +00:00
Bonian Chen
ab459dc194 [Settings] Avoid rename inactive subscription from NullPointerException 
1. Init instance before accessing it
2. Re-enable test case

Bug: 147321836
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest
Change-Id: I2375043f16b5a25372af5c9f413fb8384850316c
Merged-In: Ifc245bec739b4c81d2cee04b091bcdb54d567d4a
 2020-02-04 11:43:37 +08:00
Automerger Merge Worker
ca4a21b60b [automerger skipped] Merge "[Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager for mainline" am: cc9aef705a am: 30d7fd79c9 am: 4d2b61d408 -s ours 
am skip reason: Change-Id Ia591e82e1a55f36c98e7b00965532ff0762e1e77 with SHA-1 9b7f5ad91f is in history

Change-Id: Ie6afe1a56f363fb6ed04a1bfe286f0b4b2f38588
 2020-02-04 03:18:05 +00:00
Automerger Merge Worker
4d2b61d408 Merge "[Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager for mainline" am: cc9aef705a am: 30d7fd79c9 
Change-Id: Ia279507e094b7b547ea8293465817a53cc305913
 2020-02-04 03:08:47 +00:00
Arc Wang
f71f9d121b [Wi-Fi] Change Auto-connect summary string 
Bug: 136472407
Test: manual visual
Change-Id: I7b690844adddd1d3eac4d035f5cbd77c49a2628e
 2020-02-04 11:07:44 +08:00
Automerger Merge Worker
30d7fd79c9 Merge "[Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager for mainline" am: cc9aef705a 
Change-Id: I222f5d247438e1a64c0c33123555b97c1b3c5dfd
 2020-02-04 02:55:31 +00:00
Arc Wang
9c11f68c8f [Wi-Fi] Fix strange split line when there is no connected network 
Shows connected network preference only if connected network is available.

Bug: 147990798
Test: manual visual
Change-Id: I119a2617a33df628c4f2cd5087a674f7b9b653fc
 2020-02-04 10:52:58 +08:00
Bonian Chen
1b71b5e601 [Settings] Avoid rename inactive subscription from NullPointerException 
1. Init instance before accessing it
2. Re-enable test case

Bug: 147321836
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest
Change-Id: Ifc245bec739b4c81d2cee04b091bcdb54d567d4a
 2020-02-04 10:47:33 +08:00