Merge changes I3ee2313c,Ibbf9eb2a

* changes:
  Remove divider line for battery card preference
  Add CardPreference in battery settings page

tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java

@@ -44,6 +44,7 @@ import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
 import com.android.settings.fuelgauge.batterytip.tips.SummaryTip;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.widget.CardPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -72,17 +73,14 @@ public class BatteryTipPreferenceControllerTest {
     private BatteryTip mBatteryTip;
     @Mock
     private SettingsActivity mSettingsActivity;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private PreferenceManager mPreferenceManager;
     @Mock
     private InstrumentedPreferenceFragment mFragment;
 
     private Context mContext;
-    private PreferenceGroup mPreferenceGroup;
+    private CardPreference mCardPreference;
     private BatteryTipPreferenceController mBatteryTipPreferenceController;
     private List<BatteryTip> mOldBatteryTips;
     private List<BatteryTip> mNewBatteryTips;
-    private Preference mPreference;
     private FakeFeatureFactory mFeatureFactory;
 
     @Before
@@ -90,12 +88,9 @@ public class BatteryTipPreferenceControllerTest {
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
 
-        mPreferenceGroup = spy(new PreferenceCategory(mContext));
+        mCardPreference = spy(new CardPreference(mContext));
         when(mPreferenceScreen.getContext()).thenReturn(mContext);
-        when(mPreferenceGroup.getPreferenceManager()).thenReturn(mPreferenceManager);
-        doReturn(mPreferenceGroup).when(mPreferenceScreen).findPreference(KEY_PREF);
-        mPreference = new Preference(mContext);
-        mPreference.setKey(KEY_TIP);
+        doReturn(mCardPreference).when(mPreferenceScreen).findPreference(KEY_PREF);
         mFeatureFactory = FakeFeatureFactory.setupForTest();
 
         mOldBatteryTips = new ArrayList<>();
@@ -104,7 +99,7 @@ public class BatteryTipPreferenceControllerTest {
         mNewBatteryTips.add(new SummaryTip(BatteryTip.StateType.INVISIBLE, AVERAGE_TIME_MS));
 
         mBatteryTipPreferenceController = buildBatteryTipPreferenceController();
-        mBatteryTipPreferenceController.mPreferenceGroup = mPreferenceGroup;
+        mBatteryTipPreferenceController.mCardPreference = mCardPreference;
         mBatteryTipPreferenceController.mPrefContext = mContext;
     }
 
@@ -112,18 +107,7 @@ public class BatteryTipPreferenceControllerTest {
     public void testDisplayPreference_addSummaryTip() {
         mBatteryTipPreferenceController.displayPreference(mPreferenceScreen);
 
-        assertOnlyContainsSummaryTip(mPreferenceGroup);
-    }
-
-    @Test
-    public void testUpdateBatteryTips_updateTwice_firstShowSummaryTipThenRemoveIt() {
-        // Display summary tip because its state is new
-        mBatteryTipPreferenceController.updateBatteryTips(mOldBatteryTips);
-        assertOnlyContainsSummaryTip(mPreferenceGroup);
-
-        // Remove summary tip because its new state is invisible
-        mBatteryTipPreferenceController.updateBatteryTips(mNewBatteryTips);
-        assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(0);
+        assertOnlyContainsSummaryTip(mCardPreference);
     }
 
     @Test
@@ -142,11 +126,11 @@ public class BatteryTipPreferenceControllerTest {
         mBatteryTipPreferenceController.saveInstanceState(bundle);
 
         final BatteryTipPreferenceController controller = buildBatteryTipPreferenceController();
-        controller.mPreferenceGroup = mPreferenceGroup;
+        controller.mCardPreference = mCardPreference;
         controller.mPrefContext = mContext;
         controller.restoreInstanceState(bundle);
 
-        assertOnlyContainsSummaryTip(mPreferenceGroup);
+        assertOnlyContainsSummaryTip(mCardPreference);
     }
 
     @Test
@@ -166,12 +150,11 @@ public class BatteryTipPreferenceControllerTest {
         when(mBatteryTip.getType()).thenReturn(SMART_BATTERY_MANAGER);
         List<BatteryTip> batteryTips = new ArrayList<>();
         batteryTips.add(mBatteryTip);
-        doReturn(mPreference).when(mBatteryTip).buildPreference(any());
         doReturn(false).when(mBatteryTip).shouldShowDialog();
         doReturn(KEY_TIP).when(mBatteryTip).getKey();
         mBatteryTipPreferenceController.updateBatteryTips(batteryTips);
 
-        mBatteryTipPreferenceController.handlePreferenceTreeClick(mPreference);
+        mBatteryTipPreferenceController.handlePreferenceTreeClick(mCardPreference);
 
         verify(mBatteryTipListener).onBatteryTipHandled(mBatteryTip);
     }
@@ -182,10 +165,7 @@ public class BatteryTipPreferenceControllerTest {
                 BasePreferenceController.AVAILABLE_UNSEARCHABLE);
     }
 
-    private void assertOnlyContainsSummaryTip(final PreferenceGroup preferenceGroup) {
-        assertThat(preferenceGroup.getPreferenceCount()).isEqualTo(1);
-
-        final Preference preference = preferenceGroup.getPreference(0);
+    private void assertOnlyContainsSummaryTip(CardPreference preference) {
         assertThat(preference.getTitle()).isEqualTo(
                 mContext.getString(R.string.battery_tip_summary_title));
         assertThat(preference.getSummary()).isEqualTo(

tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java

@@ -56,7 +56,8 @@ public class BatteryTipTest {
 
     @Test
     public void buildPreference() {
-        final Preference preference = mBatteryTip.buildPreference(mContext);
+        final Preference preference = new Preference(mContext);
+        mBatteryTip.updatePreference(preference);
 
         assertThat(preference.getTitle()).isEqualTo(TITLE);
         assertThat(preference.getSummary()).isEqualTo(SUMMARY);

tests/robotests/src/com/android/settings/widget/CardPreferenceTest.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2019 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.widget;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class CardPreferenceTest {
+
+    private Context mContext;
+    private CardPreference mCardPreference;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mContext.setTheme(R.style.PreferenceTheme);
+        mCardPreference = new CardPreference(mContext);
+    }
+
+    @Test
+    public void getLayoutResource() {
+        assertThat(mCardPreference.getLayoutResource()).isEqualTo(R.layout.card_preference_layout);
+    }
+
+}