[Dynamic Home] Make a new page for all top level settings

Since we are moving conditionals/suggestions to a different place, there
is no need to use DashboardSummary to display top level settings any
more. We can simplify a lot of code for top level settings and reduce it
to a standard DashboardFragment.

- Create a new DashboardFragment + xml for all top level internal items
- Add a PreferenceController to provide summary for Network & internet
  item.
- Mark a bunch of things deprecated for future work.

Bug: 110405144
Test: robotests
Change-Id: I9f778777131c28eb836b722e089e026a59f5ddc6
This commit is contained in:
Fan Zhang
2018-08-07 18:06:39 -07:00
parent 9980096d33
commit 25d9f3812b
8 changed files with 397 additions and 5 deletions

View File

@@ -0,0 +1,86 @@
/*
* Copyright (C) 2018 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.network;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
import android.content.Context;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowRestrictedLockUtils;
import com.android.settings.wifi.WifiMasterSwitchPreferenceController;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = ShadowRestrictedLockUtils.class)
public class TopLevelNetworkEntryPreferenceControllerTest {
@Mock
private WifiMasterSwitchPreferenceController mWifiPreferenceController;
@Mock
private MobileNetworkPreferenceController mMobileNetworkPreferenceController;
@Mock
private TetherPreferenceController mTetherPreferenceController;
private Context mContext;
private TopLevelNetworkEntryPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new TopLevelNetworkEntryPreferenceController(mContext, "test_key");
ReflectionHelpers.setField(mController, "mWifiPreferenceController",
mWifiPreferenceController);
ReflectionHelpers.setField(mController, "mMobileNetworkPreferenceController",
mMobileNetworkPreferenceController);
ReflectionHelpers.setField(mController, "mTetherPreferenceController",
mTetherPreferenceController);
}
@Test
public void getSummary_hasMobileAndHotspot_shouldReturnMobileSummary() {
when(mWifiPreferenceController.isAvailable()).thenReturn(true);
when(mMobileNetworkPreferenceController.isAvailable()).thenReturn(true);
when(mTetherPreferenceController.isAvailable()).thenReturn(true);
assertThat(mController.getSummary())
.isEqualTo("Wi\u2011Fi, mobile, data usage, and hotspot");
}
@Test
public void getSummary_noMobileOrHotspot_shouldReturnSimpleSummary() {
when(mWifiPreferenceController.isAvailable()).thenReturn(true);
when(mMobileNetworkPreferenceController.isAvailable()).thenReturn(false);
when(mTetherPreferenceController.isAvailable()).thenReturn(false);
assertThat(mController.getSummary())
.isEqualTo("Wi\u2011Fi and data usage");
}
}