Learn mode link is not in footer text
Use wrong footerPreference key.
Change-Id: Ic88b4bf9cf336474231329aa2154242d3f95b91a
Fix: 139086150
Test: visual
diff --git a/res/layout/two_state_button.xml b/res/layout/two_state_button.xml
index 3ad1634..162465e 100644
--- a/res/layout/two_state_button.xml
+++ b/res/layout/two_state_button.xml
@@ -22,7 +22,8 @@
android:paddingStart="72dp"
android:paddingEnd="72dp"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeight">
<Button
android:id="@+id/state_on_button"
diff --git a/res/xml/battery_saver_settings.xml b/res/xml/battery_saver_settings.xml
index a6e2d9f..0436105 100644
--- a/res/xml/battery_saver_settings.xml
+++ b/res/xml/battery_saver_settings.xml
@@ -39,16 +39,16 @@
android:title="@string/battery_saver"
android:selectable="false"
android:summary="@string/battery_saver_turn_on_summary"
+ settings:allowDividerBelow="true"
settings:textOn="@string/battery_saver_button_turn_on"
settings:textOff="@string/battery_saver_button_turn_off"
- settings:controller="com.android.settings.fuelgauge.batterysaver.BatterySaverButtonPreferenceController" />
+ settings:controller="com.android.settings.fuelgauge.batterysaver.BatterySaverButtonPreferenceController"/>
- <PreferenceCategory
- android:key="battery_saver_footer">
- <com.android.settingslib.widget.FooterPreference
- android:key="battery_saver_footer_preference"
- android:title="@*android:string/battery_saver_description"
- android:selectable="false" />
- </PreferenceCategory>
+ <com.android.settingslib.widget.FooterPreference
+ android:key="battery_saver_footer_preference"
+ android:selectable="false"
+ android:title="@*android:string/battery_saver_description"
+ settings:allowDividerAbove="true"
+ settings:searchable="false"/>
</PreferenceScreen>
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java
index be23f72..6216917 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java
@@ -18,7 +18,6 @@
import android.app.settings.SettingsEnums;
import android.content.Context;
-import android.os.Bundle;
import android.provider.SearchIndexableResource;
import android.text.Annotation;
import android.text.Spannable;
@@ -49,7 +48,7 @@
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
public class BatterySaverSettings extends DashboardFragment {
private static final String TAG = "BatterySaverSettings";
- public static final String KEY_FOOTER_PREFERENCE = "footer_preference";
+ private static final String KEY_FOOTER_PREFERENCE = "battery_saver_footer_preference";
private SpannableStringBuilder mFooterText;
private String mHelpUri;