Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a2c9e79 authored by Fan Zhang's avatar Fan Zhang Committed by Gerrit Code Review
Browse files

Merge "DO NOT MERGE Import clean up."

parents b0cc3a6c de117046

src/com/android/settings/AccessiblePreferenceCategory.java

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings;



import android.content.Context;



import androidx.preference.PreferenceCategory;

import androidx.preference.PreferenceViewHolder;

src/com/android/settings/BrightnessPreference.java

+2 −1
Original line number Diff line number Diff line
@@ -19,9 +19,10 @@ package com.android.settings; 
import android.content.Context;

import android.content.Intent;

import android.os.UserHandle;

import androidx.preference.Preference;

import android.util.AttributeSet;



import androidx.preference.Preference;



public class BrightnessPreference extends Preference {



    public BrightnessPreference(Context context, AttributeSet attrs) {

src/com/android/settings/CancellablePreference.java

+3 −2
Original line number Diff line number Diff line
@@ -16,13 +16,14 @@ 
package com.android.settings;



import android.content.Context;

import androidx.preference.Preference;

import androidx.preference.PreferenceViewHolder;

import android.util.AttributeSet;

import android.view.View;

import android.view.View.OnClickListener;

import android.widget.ImageView;



import androidx.preference.Preference;

import androidx.preference.PreferenceViewHolder;



public class CancellablePreference extends Preference implements OnClickListener {



    private boolean mCancellable;

src/com/android/settings/CustomListPreference.java

+3 −2
Original line number Diff line number Diff line
@@ -25,10 +25,11 @@ import android.content.DialogInterface; 
import android.content.DialogInterface.OnClickListener;

import android.content.Intent;

import android.os.Bundle;

import androidx.preference.ListPreferenceDialogFragment;

import androidx.preference.ListPreference;

import android.util.AttributeSet;



import androidx.preference.ListPreference;

import androidx.preference.ListPreferenceDialogFragment;



import com.android.internal.logging.nano.MetricsProto;

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

src/com/android/settings/FallbackHome.java

+1 −4
Original line number Diff line number Diff line
@@ -17,24 +17,21 @@ 
package com.android.settings;



import android.app.Activity;

import android.app.ProgressDialog;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.os.Bundle;

import android.os.Handler;

import android.os.Message;

import android.os.UserHandle;

import android.os.PowerManager;

import android.os.SystemClock;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.Settings;

import android.util.Log;

import android.view.View;

import android.view.WindowManager;

import android.view.WindowManager.LayoutParams;

import android.view.animation.AnimationUtils;