Merge "Use SettingsLib's versions of Custom* classes." into oc-dr1-dev (d392a9bf) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/BugreportPreference.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import android.widget.TextView;

		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settingslib.CustomDialogPreference;

		public class BugreportPreference extends CustomDialogPreference {

src/com/android/settings/CustomDialogPreference.java

deleted100644 → 0

+0 −112

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.settings;

		import android.app.AlertDialog;
		import android.app.Dialog;
		import android.content.Context;
		import android.content.DialogInterface;
		import android.os.Bundle;
		import android.support.v14.preference.PreferenceDialogFragment;
		import android.support.v7.preference.DialogPreference;
		import android.util.AttributeSet;
		import android.view.View;

		public class CustomDialogPreference extends DialogPreference {

		private CustomPreferenceDialogFragment mFragment;

		public CustomDialogPreference(Context context, AttributeSet attrs, int defStyleAttr,
		int defStyleRes) {
		super(context, attrs, defStyleAttr, defStyleRes);
		}

		public CustomDialogPreference(Context context, AttributeSet attrs, int defStyleAttr) {
		super(context, attrs, defStyleAttr);
		}

		public CustomDialogPreference(Context context, AttributeSet attrs) {
		super(context, attrs);
		}

		public CustomDialogPreference(Context context) {
		super(context);
		}

		public boolean isDialogOpen() {
		return getDialog() != null && getDialog().isShowing();
		}

		public Dialog getDialog() {
		return mFragment != null ? mFragment.getDialog() : null;
		}

		protected void onPrepareDialogBuilder(AlertDialog.Builder builder,
		DialogInterface.OnClickListener listener) {
		}

		protected void onDialogClosed(boolean positiveResult) {
		}

		protected void onClick(DialogInterface dialog, int which) {
		}

		protected void onBindDialogView(View view) {
		}

		private void setFragment(CustomPreferenceDialogFragment fragment) {
		mFragment = fragment;
		}

		public static class CustomPreferenceDialogFragment extends PreferenceDialogFragment {

		public static CustomPreferenceDialogFragment newInstance(String key) {
		final CustomPreferenceDialogFragment fragment = new CustomPreferenceDialogFragment();
		final Bundle b = new Bundle(1);
		b.putString(ARG_KEY, key);
		fragment.setArguments(b);
		return fragment;
		}

		private CustomDialogPreference getCustomizablePreference() {
		return (CustomDialogPreference) getPreference();
		}

		@Override
		protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
		super.onPrepareDialogBuilder(builder);
		getCustomizablePreference().setFragment(this);
		getCustomizablePreference().onPrepareDialogBuilder(builder, this);
		}

		@Override
		public void onDialogClosed(boolean positiveResult) {
		getCustomizablePreference().onDialogClosed(positiveResult);
		}

		@Override
		protected void onBindDialogView(View view) {
		super.onBindDialogView(view);
		getCustomizablePreference().onBindDialogView(view);
		}

		@Override
		public void onClick(DialogInterface dialog, int which) {
		super.onClick(dialog, which);
		getCustomizablePreference().onClick(dialog, which);
		}
		}
		}

src/com/android/settings/CustomEditTextPreference.java

deleted100644 → 0

+0 −118

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.settings;

		import android.app.AlertDialog;
		import android.app.Dialog;
		import android.content.Context;
		import android.content.DialogInterface;
		import android.os.Bundle;
		import android.support.v14.preference.EditTextPreferenceDialogFragment;
		import android.support.v7.preference.EditTextPreference;
		import android.util.AttributeSet;
		import android.view.View;
		import android.widget.EditText;

		public class CustomEditTextPreference extends EditTextPreference {

		private CustomPreferenceDialogFragment mFragment;

		public CustomEditTextPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
		super(context, attrs, defStyleAttr, defStyleRes);
		}

		public CustomEditTextPreference(Context context, AttributeSet attrs, int defStyleAttr) {
		super(context, attrs, defStyleAttr);
		}

		public CustomEditTextPreference(Context context, AttributeSet attrs) {
		super(context, attrs);
		}

		public CustomEditTextPreference(Context context) {
		super(context);
		}

		public EditText getEditText() {
		return mFragment != null ? (EditText) mFragment.getDialog().findViewById(android.R.id.edit)
		: null;
		}

		public boolean isDialogOpen() {
		return getDialog() != null && getDialog().isShowing();
		}

		public Dialog getDialog() {
		return mFragment != null ? mFragment.getDialog() : null;
		}

		protected void onPrepareDialogBuilder(AlertDialog.Builder builder,
		DialogInterface.OnClickListener listener) {
		}

		protected void onDialogClosed(boolean positiveResult) {
		}

		protected void onClick(DialogInterface dialog, int which) {
		}

		protected void onBindDialogView(View view) {
		}

		private void setFragment(CustomPreferenceDialogFragment fragment) {
		mFragment = fragment;
		}

		public static class CustomPreferenceDialogFragment extends EditTextPreferenceDialogFragment {

		public static CustomPreferenceDialogFragment newInstance(String key) {
		final CustomPreferenceDialogFragment fragment = new CustomPreferenceDialogFragment();
		final Bundle b = new Bundle(1);
		b.putString(ARG_KEY, key);
		fragment.setArguments(b);
		return fragment;
		}

		private CustomEditTextPreference getCustomizablePreference() {
		return (CustomEditTextPreference) getPreference();
		}

		@Override
		protected void onBindDialogView(View view) {
		super.onBindDialogView(view);
		getCustomizablePreference().onBindDialogView(view);
		}

		@Override
		protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
		super.onPrepareDialogBuilder(builder);
		getCustomizablePreference().setFragment(this);
		getCustomizablePreference().onPrepareDialogBuilder(builder, this);
		}

		@Override
		public void onDialogClosed(boolean positiveResult) {
		super.onDialogClosed(positiveResult);
		getCustomizablePreference().onDialogClosed(positiveResult);
		}

		@Override
		public void onClick(DialogInterface dialog, int which) {
		super.onClick(dialog, which);
		getCustomizablePreference().onClick(dialog, which);
		}
		}
		}

src/com/android/settings/EditPinPreference.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -23,6 +23,8 @@ import android.util.AttributeSet;
		import android.view.View;
		import android.widget.EditText;

		import com.android.settingslib.CustomEditTextPreference;

		/**
		* TODO: Add a soft dialpad for PIN entry.
		*/

src/com/android/settings/SeekBarDialogPreference.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,8 @@ import android.view.View;
		import android.widget.ImageView;
		import android.widget.SeekBar;

		import com.android.settingslib.CustomDialogPreference;

		/**
		* Based on frameworks/base/core/java/android/preference/SeekBarDialogPreference.java
		* except uses support lib preferences.