PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Learn mode link is not in footer text

Browse Source 
Use wrong footerPreference key.

Change-Id: Ic88b4bf9cf336474231329aa2154242d3f95b91a
Fix: 139086150
Test: visual
This commit is contained in:
Raff Tsai
2019-08-09 17:13:08 +08:00
parent 73e3aa192e
commit 946441ca27
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/two_state_button.xml
View File

@@ -22,7 +22,8 @@
android:paddingStart="72dp" android:paddingStart="72dp"
android:paddingEnd="72dp" android:paddingEnd="72dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight">
<Button <Button
android:id="@+id/state_on_button" android:id="@+id/state_on_button"

16
res/xml/battery_saver_settings.xml
View File

@@ -39,16 +39,16 @@
android:title="@string/battery_saver" android:title="@string/battery_saver"
android:selectable="false" android:selectable="false"
android:summary="@string/battery_saver_turn_on_summary" android:summary="@string/battery_saver_turn_on_summary"
settings:allowDividerBelow="true"
settings:textOn="@string/battery_saver_button_turn_on" settings:textOn="@string/battery_saver_button_turn_on"
settings:textOff="@string/battery_saver_button_turn_off" 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 <com.android.settingslib.widget.FooterPreference
android:key="battery_saver_footer"> android:key="battery_saver_footer_preference"
<com.android.settingslib.widget.FooterPreference android:selectable="false"
android:key="battery_saver_footer_preference" android:title="@*android:string/battery_saver_description"
android:title="@*android:string/battery_saver_description" settings:allowDividerAbove="true"
android:selectable="false" /> settings:searchable="false"/>
</PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>

3
src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.fuelgauge.batterysaver;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.content.Context; import android.content.Context;
import android.os.Bundle;
import android.provider.SearchIndexableResource; import android.provider.SearchIndexableResource;
import android.text.Annotation; import android.text.Annotation;
import android.text.Spannable; import android.text.Spannable;
@@ -49,7 +48,7 @@ import java.util.List;
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
public class BatterySaverSettings extends DashboardFragment { public class BatterySaverSettings extends DashboardFragment {
private static final String TAG = "BatterySaverSettings"; 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 SpannableStringBuilder mFooterText;
private String mHelpUri; private String mHelpUri;