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

Use FooterPreference in xml explicitly

Browse Source 
Removed the FooterPreferenceMixin from the RestrictedAppDetails page.

Fixes: 139641334
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge
Change-Id: I6a4e56725d88353bde361de1dfff4a2a449c842c
This commit is contained in:
Sunny Shao
2019-08-19 11:50:06 +08:00
parent 7af4e5a77c
commit d04c885ff9
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/restricted_apps_detail.xml
View File

@@ -16,9 +16,15 @@
<PreferenceScreen <PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/restricted_app_title"> android:title="@string/restricted_app_title">
<PreferenceCategory <PreferenceCategory
android:key="restrict_app_list"/> android:key="restrict_app_list"/>
<com.android.settingslib.widget.FooterPreference
android:key="restricted_app_footer"
android:title="@string/restricted_app_detail_footer"
android:selectable="false"
settings:searchable="false"/>
</PreferenceScreen> </PreferenceScreen>

5
src/com/android/settings/fuelgauge/RestrictedAppDetails.java
View File

@@ -47,7 +47,6 @@ import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip;
import com.android.settings.widget.AppCheckBoxPreference; import com.android.settings.widget.AppCheckBoxPreference;
import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.utils.StringUtil; import com.android.settingslib.utils.StringUtil;
import com.android.settingslib.widget.FooterPreferenceMixinCompat;
import java.util.List; import java.util.List;
@@ -76,8 +75,6 @@ public class RestrictedAppDetails extends DashboardFragment implements
PackageManager mPackageManager; PackageManager mPackageManager;
@VisibleForTesting @VisibleForTesting
BatteryDatabaseManager mBatteryDatabaseManager; BatteryDatabaseManager mBatteryDatabaseManager;
private final FooterPreferenceMixinCompat mFooterPreferenceMixin =
new FooterPreferenceMixinCompat(this, getSettingsLifecycle());
public static void startRestrictedAppDetails(InstrumentedPreferenceFragment fragment, public static void startRestrictedAppDetails(InstrumentedPreferenceFragment fragment,
List<AppInfo> appInfos) { List<AppInfo> appInfos) {
@@ -97,8 +94,6 @@ public class RestrictedAppDetails extends DashboardFragment implements
super.onCreate(icicle); super.onCreate(icicle);
final Context context = getContext(); final Context context = getContext();
mFooterPreferenceMixin.createFooterPreference().setTitle(
R.string.restricted_app_detail_footer);
mRestrictedAppListGroup = (PreferenceGroup) findPreference(KEY_PREF_RESTRICTED_APP_LIST); mRestrictedAppListGroup = (PreferenceGroup) findPreference(KEY_PREF_RESTRICTED_APP_LIST);
mAppInfos = getArguments().getParcelableArrayList(EXTRA_APP_INFO_LIST); mAppInfos = getArguments().getParcelableArrayList(EXTRA_APP_INFO_LIST);
mPackageManager = context.getPackageManager(); mPackageManager = context.getPackageManager();