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

Settings Fragment Migration (Build pass app)

Browse Source 
This patch focused on fixing compile errors and some runtime errors.

Test: We can't test it now. But we will have an integration test later.
Bug: 110259478
Change-Id: I16c471ddcd0fa1460c665b7f74d86fcace5ee67b
This commit is contained in:
tmfang
2018-06-28 11:39:05 +08:00
committed by Fan Zhang
parent 99cc23d0da
commit 27c84de325
164 changed files with 792 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/display/DensityPreference.java
View File

@@ -27,12 +27,12 @@ import android.widget.EditText;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.CustomEditTextPreference;
import com.android.settingslib.CustomEditTextPreferenceCompat;
import com.android.settingslib.display.DisplayDensityUtils;
import java.text.NumberFormat;
public class DensityPreference extends CustomEditTextPreference {
public class DensityPreference extends CustomEditTextPreferenceCompat {
private static final String TAG = "DensityPreference";
public DensityPreference(Context context, AttributeSet attrs) {

6
src/com/android/settings/display/TimeoutListPreference.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.display;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
@@ -33,6 +32,9 @@ import com.android.settingslib.RestrictedLockUtils;
import java.util.ArrayList;
import androidx.appcompat.app.AlertDialog.Builder;
public class TimeoutListPreference extends RestrictedListPreference {
private static final String TAG = "TimeoutListPreference";
private EnforcedAdmin mAdmin;
@@ -46,7 +48,7 @@ public class TimeoutListPreference extends RestrictedListPreference {
}
@Override
protected void onPrepareDialogBuilder(AlertDialog.Builder builder,
protected void onPrepareDialogBuilder(Builder builder,
DialogInterface.OnClickListener listener) {
super.onPrepareDialogBuilder(builder, listener);
if (mAdmin != null) {