PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,874 Commits 1 Branch 0 Tags
ec01e260fbf88ce7b6d3d278da28a6614b1f8a2b
Commit Graph

47874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Takamasa Kuramitsu
ec01e260fb Merge "Move content later button doesn't work on Migration Wizard" am: 1308b56908 am: d77dfa200e 
am: 7cb8223ce2

Change-Id: I18c7e985c8a1f5e3f4cbc0cdeb980aee9464218d
 2018-10-12 14:21:52 -07:00
Takamasa Kuramitsu
7cb8223ce2 Merge "Move content later button doesn't work on Migration Wizard" am: 1308b56908 
am: d77dfa200e

Change-Id: I88e0b556594e5bdadf3c12d0c1fd0483f928261a
 2018-10-12 14:14:33 -07:00
Takamasa Kuramitsu
d77dfa200e Merge "Move content later button doesn't work on Migration Wizard" 
am: 1308b56908

Change-Id: I210eb94a69ce434c5b838dedbf90a937e92e71e9
 2018-10-12 14:07:25 -07:00
Treehugger Robot
1308b56908 Merge "Move content later button doesn't work on Migration Wizard" 2018-10-12 20:52:31 +00:00
Mill Chen
2559f02d68 Clean up unnecessary spy context statements 
Remove spy context syntax because we do not need to
mock context anymore in the test cases.

Bug: 117644158
Test: robotests
Change-Id: I222eec4fbc1994d7bb79adead40b76ac0a000bdc
 2018-10-12 21:54:02 +08:00
Neil Fuller
5331355163 Merge "Remove explicit dependency on bouncycastle" am: ed21203ea3 am: 6767ce9d24 
am: 92982f7167

Change-Id: Iad9b91446823430cb28dd3447819c6b16f7f6b42
 2018-10-12 03:42:13 -07:00
Neil Fuller
92982f7167 Merge "Remove explicit dependency on bouncycastle" am: ed21203ea3 
am: 6767ce9d24

Change-Id: Ia431a5b7ca139209425825616f698f69bfb781c5
 2018-10-12 03:36:17 -07:00
Neil Fuller
6767ce9d24 Merge "Remove explicit dependency on bouncycastle" 
am: ed21203ea3

Change-Id: Iff190e6a70b85b927597a5b82ff28eaf63070450
 2018-10-12 03:31:10 -07:00
Neil Fuller
ed21203ea3 Merge "Remove explicit dependency on bouncycastle" 2018-10-12 10:18:22 +00:00
TreeHugger Robot
ddd70cdbf6 Merge "Disable sliceView scrolling in the homepage." 2018-10-12 05:05:03 +00:00
TreeHugger Robot
a687b5d28d Merge "Proceed to "finish" page upon completing enrollment" 2018-10-12 03:56:26 +00:00
Emily Chuang
e7a6d1ca1e Disable sliceView scrolling in the homepage. 
Set isScrollable() to false so as to have the "see more" option.

Fixes: 117626982
Test: robotest
Change-Id: Ie0b8a207fb0c1eff41a98cc897e5f8cf29ccce0a
 2018-10-12 10:16:51 +08:00
Kevin Chyn
b0d9b8403a Proceed to "finish" page upon completing enrollment 
Bug: 111548037

Test: manual
Change-Id: I1c0c5cc0eb2d1808221465c5eeba92e59b2cd572
 2018-10-11 18:26:37 -07:00
Lei Yu
6773c7efcb Merge "Change packagename to telephony" 2018-10-11 22:32:31 +00:00
TreeHugger Robot
bf7d0eb156 Merge "Fix crash on KeyboardLayoutDialogFragment" 2018-10-11 20:31:44 +00:00
jackqdyulei
8eec6ff917 Change packagename to telephony 
Also move it under package network, so all of them belong to
com.android.settings.network.telephony.

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I35dbdcd5cc9dab939b0a3efccc8897b9a92338d1
 2018-10-11 11:46:38 -07:00
tmfang
a75eea1b01 Fix crash on KeyboardLayoutDialogFragment 
Since view id changed after fragment migration,
we correct view id.

Change-Id: If81ca06423ac62fd9f6a118be0b5fe3c93356142
Fixes: 117559309
Test: robotest
 2018-10-12 01:27:46 +08:00
TreeHugger Robot
94017b543f Merge "Fix problem on filter widget in memory page" 2018-10-11 16:46:17 +00:00
Neil Fuller
d0821ca8c7 Remove explicit dependency on bouncycastle 
The dependency is unnecessary once bouncycastle
is included in the "standard libraries".

Test: build
Bug: 113148576
Change-Id: I057bb0e277220389db3c77b1035044d93f35432a
 2018-10-11 17:02:36 +01:00
tmfang
0d2faf31c1 Fix problem on filter widget in memory page 
We need to use SettingsSpinnerAdapater
with settings style item.

Test: visual
Bug: 117568930
Change-Id: Ia60b7d08c11a270e029e6b673a12d838f454eccf
Fixes: 117541499
 2018-10-11 13:41:53 +08:00
Lei Yu
695638ce35 Merge "Copy wifiCalling method from telephony to settings" 2018-10-11 04:11:07 +00:00
TreeHugger Robot
45d8fbe54f Merge "Change search fab to search bar." 2018-10-11 02:42:24 +00:00
Lei Yu
62dc9bb747 Merge "Add network listener in MobileSettingsActivity" 2018-10-11 01:14:09 +00:00
Lei Yu
7c570c8bae Merge "Add target fragment for RoamingDialogFragment" 2018-10-11 00:25:18 +00:00
Lei Yu
9b373eb7a0 Merge "Refactor MobileDataPreference" 2018-10-11 00:24:56 +00:00
Fan Zhang
3181e1aceb Change search fab to search bar. 
- Remove search fab from layout xml
- Change RelativeLayout to CoordinatorLayout so we can use prebuilt
  scrolling behavior
- Minor update to theme so search bar background works in dark mode for
  the homepage activity.

Change-Id: If7408c12684be65137e04ae3bb4137204c2d77e0
Fixes: 117508596
Test: robotests, visual
 2018-10-10 16:29:22 -07:00
TreeHugger Robot
04434eb662 Merge "Remove ShadowKeyValueListParser" 2018-10-10 23:23:41 +00:00
jackqdyulei
496094ccde Copy wifiCalling method from telephony to settings 
Bug: 114749736
Test: Build
Change-Id: Iec45273e6a74afe940c280e50a473edc31473994
 2018-10-10 16:07:49 -07:00
jackqdyulei
2554d0271e Add target fragment for RoamingDialogFragment 
Bug: 114749736
Test: Manual
Change-Id: I6f2939d99b72ff2dcf094c84bac75c2ca5d7ff66
 2018-10-10 16:06:51 -07:00
jackqdyulei
1a4781881e Add network listener in MobileSettingsActivity 
Listen to subscription change. If it is changed, refresh UI and build
new fragment for it.

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I436b4d62b06230e767892bda6cf8582d4946097b
 2018-10-10 16:05:58 -07:00
jackqdyulei
36063b9222 Refactor MobileDataPreference 
1. Remove it and change it to SwitchPrference
2. Build MobileDataDialogFragment to show dialog when needed
3. Create controller for it to decide when to launch the dialog

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I02b9662c5829e765f2c71d10ed951d792cf7aaa1
 2018-10-10 16:05:08 -07:00
Fan Zhang
96a90df8ce Merge "Update strings" 2018-10-10 20:56:49 +00:00
TreeHugger Robot
5da72a145f Merge "Use default network template in billing cycle settings." 2018-10-10 20:53:55 +00:00
jackqdyulei
3f365a91e9 Remove ShadowKeyValueListParser 
It is not used anymore.

Change-Id: I52991f42bc0872fd98809d6d6596f4b85d041d60
Fixes: 38346649
Test: RunSettingsRoboTests
 2018-10-10 13:49:00 -07:00
Fan Zhang
6a1f77ef89 Merge "Use proto in contextualCard object" 2018-10-10 20:19:38 +00:00
Fan Zhang
2f324c9484 Merge "Remove mocked resources from slice test cases" 2018-10-10 20:13:52 +00:00
Adam He
585ab7490d Merge "Use AFM.getAutofillServiceComponentName() in Settings's AutofillPickerTrampolineActivity" 2018-10-10 19:54:50 +00:00
Doris Ling
c4b40b0669 Use default network template in billing cycle settings. 
- if the network template is not set in the bundle arguments, use the
default network template for getting the billing data.
- change to use ConnectivityManager.from(context) in DataUsageUtils to
be consistent with the usage in other methods.

Change-Id: I25eb27f8f26d9ecafc66aa2c69806e94c6b63499
Fixes: 117452991
Test: make RunSettingsRoboTests
 2018-10-10 12:50:34 -07:00
Philip P. Moltmann
8e6883185b Merge "Use new RestrictedLockUtils API" 2018-10-10 19:50:06 +00:00
Rick Yiu
b61ce04901 [automerger skipped] Merge "Add null check for vrManager" into pi-dev am: c9e2d80ade 
am: 31e062e640  -s ours

Change-Id: Ia572567d053c0e00cdafeeae71314187720ff9de
 2018-10-10 12:06:58 -07:00
TreeHugger Robot
ea38672a82 Merge "Get the ringtone name in background thread." 2018-10-10 18:54:20 +00:00
Fan Zhang
2f18df0c69 Update strings 
Change-Id: I3a70d787e6db6743638460195f36386111647e4e
Fixes: 117508849
Test: visual
 2018-10-10 11:16:02 -07:00
Rick Yiu
31e062e640 Merge "Add null check for vrManager" into pi-dev 
am: c9e2d80ade

Change-Id: Ifb1f2da7e3493e91f26735e7609c4480b1f0f346
 2018-10-10 11:07:11 -07:00
TreeHugger Robot
c9e2d80ade Merge "Add null check for vrManager" into pi-dev 2018-10-10 17:46:55 +00:00
Raff Tsai
8cd659af19 Use proto in contextualCard object 
Test: make RunSettingsRoboTests
Change-Id: Ic7af69047e33e3b10a993dd9820b4c6ceb23666c
 2018-10-10 10:35:51 -07:00
Fan Zhang
a4c42eb024 Merge "Add contextual card proto libraries." 2018-10-10 17:24:02 +00:00
Fan Zhang
8985efe3b0 Add contextual card proto libraries. 
Test: rebuild
Change-Id: Ifd105a91be4ce3b3ae35766e069d4b4663e54b0f
 2018-10-10 10:14:07 -07:00
Fan Zhang
403beab3fb Merge "Remove hacks to access framework private resources" 2018-10-10 17:10:12 +00:00
Raff Tsai
3ce67421a3 Fix test case error 
Test: make RunSettingsRoboTest
Change-Id: Id8e13cdd13b4a5f21dad5f84be7110ca8cf5282f
 2018-10-10 21:06:19 +08:00
Doris Ling
fa8ee79760 Get the ringtone name in background thread. 
- to prevent anr, retrieve the current ringtone in background thread.

Change-Id: I701adfa618553c03aa24719b2550ea3ee97d9bfa
Fixes: 117124470
Test: make RunSettingsRoboTests
 2018-10-09 17:48:34 -07:00