Add description for Wi-Fi calling mode
Replace the view of dialog with custom view that adds description as summary. Test: manual Bug: 34793636 Change-Id: If9792b0a35c59c1260176b4b2c62107861de73b5
This commit is contained in:
Kazuya Ohshiro
Hall Liu
@@ -0,0 +1,203 @@
|
||||
/*
|
||||
* Copyright (C) 2018 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.wifi.calling;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.res.TypedArray;
|
||||
import android.os.Parcel;
|
||||
import android.os.Parcelable;
|
||||
import android.util.AttributeSet;
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.ListAdapter;
|
||||
import android.widget.RadioButton;
|
||||
import android.widget.TextView;
|
||||
import androidx.appcompat.app.AlertDialog.Builder;
|
||||
import com.android.settings.CustomListPreference;
|
||||
import com.android.settings.R;
|
||||
|
||||
/**
|
||||
* ListPreference contain the entry summary.
|
||||
*/
|
||||
public class ListWithEntrySummaryPreference extends CustomListPreference {
|
||||
private static final String LOG_TAG = "ListWithEntrySummaryPreference";
|
||||
private final Context mContext;
|
||||
private CharSequence[] mSummaries;
|
||||
|
||||
/**
|
||||
* ListWithEntrySummaryPreference constructor.
|
||||
*
|
||||
* @param context The context of view.
|
||||
* @param attrs The attributes of the XML tag that is inflating the linear layout.
|
||||
*/
|
||||
public ListWithEntrySummaryPreference(Context context, AttributeSet attrs) {
|
||||
super(context, attrs);
|
||||
mContext = context;
|
||||
|
||||
TypedArray array = context.obtainStyledAttributes(attrs,
|
||||
R.styleable.ListWithEntrySummaryPreference, 0, 0);
|
||||
mSummaries = array.getTextArray(R.styleable.ListWithEntrySummaryPreference_entrySummaries);
|
||||
array.recycle();
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the summaries of mode items to be shown in the mode select dialog.
|
||||
*
|
||||
* @param summariesResId The summaries of mode items.
|
||||
*/
|
||||
public void setEntrySummaries(int summariesResId) {
|
||||
mSummaries = getContext().getResources().getTextArray(summariesResId);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the summaries of mode items to be shown in the mode select dialog.
|
||||
*
|
||||
* @param summaries The summaries of mode items.
|
||||
*/
|
||||
public void setEntrySummaries(CharSequence[] summaries) {
|
||||
mSummaries = summaries;
|
||||
}
|
||||
|
||||
private CharSequence getEntrySummary(int index) {
|
||||
if (mSummaries == null) {
|
||||
Log.w(LOG_TAG, "getEntrySummary : mSummaries is null");
|
||||
return "";
|
||||
}
|
||||
return mSummaries[index];
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onPrepareDialogBuilder(Builder builder,
|
||||
DialogInterface.OnClickListener listener) {
|
||||
ListAdapter la = (ListAdapter) new SelectorAdapter(mContext,
|
||||
R.xml.single_choice_list_item_2, this);
|
||||
builder.setSingleChoiceItems(la, findIndexOfValue(getValue()), listener);
|
||||
super.onPrepareDialogBuilder(builder, listener);
|
||||
}
|
||||
|
||||
private static class SelectorAdapter extends ArrayAdapter<CharSequence> {
|
||||
private final Context mContext;
|
||||
private ListWithEntrySummaryPreference mSelector;
|
||||
|
||||
/**
|
||||
* SelectorAdapter constructor.
|
||||
*
|
||||
* @param context The current context.
|
||||
* @param rowResourceId The resource id of the XML tag that is inflating the linear layout.
|
||||
* @param listPreference The instance of ListWithEntrySummaryPreference.
|
||||
*/
|
||||
public SelectorAdapter(Context context, int rowResourceId,
|
||||
ListWithEntrySummaryPreference listPreference) {
|
||||
super(context, rowResourceId, listPreference.getEntryValues());
|
||||
mContext = context;
|
||||
mSelector = listPreference;
|
||||
}
|
||||
|
||||
@Override
|
||||
public View getView(int position, View convertView, ViewGroup parent) {
|
||||
LayoutInflater inflater = LayoutInflater.from(mContext);
|
||||
View row = inflater.inflate(R.xml.single_choice_list_item_2, parent, false);
|
||||
|
||||
TextView title = (TextView) row.findViewById(R.id.title);
|
||||
title.setText(mSelector.getEntries()[position]);
|
||||
|
||||
TextView summary = (TextView) row.findViewById(R.id.summary);
|
||||
summary.setText(mSelector.getEntrySummary(position));
|
||||
|
||||
RadioButton rb = (RadioButton) row.findViewById(R.id.radio);
|
||||
if (position == mSelector.findIndexOfValue(mSelector.getValue())) {
|
||||
rb.setChecked(true);
|
||||
}
|
||||
|
||||
return row;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Parcelable onSaveInstanceState() {
|
||||
final Parcelable superState = super.onSaveInstanceState();
|
||||
|
||||
final SavedState myState = new SavedState(superState);
|
||||
myState.mEntries = getEntries();
|
||||
myState.mEntryValues = getEntryValues();
|
||||
myState.mSummaries = mSummaries;
|
||||
return myState;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onRestoreInstanceState(Parcelable state) {
|
||||
if (state == null || !state.getClass().equals(SavedState.class)) {
|
||||
// Didn't save state for us in onSaveInstanceState
|
||||
super.onRestoreInstanceState(state);
|
||||
return;
|
||||
}
|
||||
|
||||
SavedState myState = (SavedState) state;
|
||||
super.onRestoreInstanceState(myState.getSuperState());
|
||||
setEntries(myState.mEntries);
|
||||
setEntryValues(myState.mEntryValues);
|
||||
mSummaries = myState.mSummaries;
|
||||
}
|
||||
|
||||
/**
|
||||
* We save entries, entryValues and summaries into bundle.
|
||||
* At onCreate of fragment, dialog will be restored if it was open. In this case,
|
||||
* we need to restore entries, entryValues and summaries. Without those information,
|
||||
* crash when entering multi window during wfc modes dialog shown.
|
||||
*/
|
||||
private static class SavedState extends BaseSavedState {
|
||||
private CharSequence[] mEntries;
|
||||
private CharSequence[] mEntryValues;
|
||||
private CharSequence[] mSummaries;
|
||||
|
||||
public SavedState(Parcel source) {
|
||||
super(source);
|
||||
mEntries = source.readCharSequenceArray();
|
||||
mEntryValues = source.readCharSequenceArray();
|
||||
mSummaries = source.readCharSequenceArray();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToParcel(Parcel dest, int flags) {
|
||||
super.writeToParcel(dest, flags);
|
||||
dest.writeCharSequenceArray(mEntries);
|
||||
dest.writeCharSequenceArray(mEntryValues);
|
||||
dest.writeCharSequenceArray(mSummaries);
|
||||
}
|
||||
|
||||
public SavedState(Parcelable superState) {
|
||||
super(superState);
|
||||
}
|
||||
|
||||
public static final Parcelable.Creator<SavedState> CREATOR =
|
||||
new Parcelable.Creator<SavedState>() {
|
||||
@Override
|
||||
public SavedState createFromParcel(Parcel in) {
|
||||
return new SavedState(in);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SavedState[] newArray(int size) {
|
||||
return new SavedState[size];
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -82,8 +82,8 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
|
||||
//UI objects
|
||||
private SwitchBar mSwitchBar;
|
||||
private Switch mSwitch;
|
||||
private ListPreference mButtonWfcMode;
|
||||
private ListPreference mButtonWfcRoamingMode;
|
||||
private ListWithEntrySummaryPreference mButtonWfcMode;
|
||||
private ListWithEntrySummaryPreference mButtonWfcRoamingMode;
|
||||
private Preference mUpdateAddress;
|
||||
private TextView mEmptyView;
|
||||
|
||||
@@ -264,10 +264,11 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
|
||||
mTelephonyManager = ((TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE))
|
||||
.createForSubscriptionId(mSubId);
|
||||
|
||||
mButtonWfcMode = (ListPreference) findPreference(BUTTON_WFC_MODE);
|
||||
mButtonWfcMode = (ListWithEntrySummaryPreference) findPreference(BUTTON_WFC_MODE);
|
||||
mButtonWfcMode.setOnPreferenceChangeListener(this);
|
||||
|
||||
mButtonWfcRoamingMode = (ListPreference) findPreference(BUTTON_WFC_ROAMING_MODE);
|
||||
mButtonWfcRoamingMode = (ListWithEntrySummaryPreference) findPreference(
|
||||
BUTTON_WFC_ROAMING_MODE);
|
||||
mButtonWfcRoamingMode.setOnPreferenceChangeListener(this);
|
||||
|
||||
mUpdateAddress = (Preference) findPreference(PREFERENCE_EMERGENCY_ADDRESS);
|
||||
@@ -325,10 +326,14 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
|
||||
if (!isWifiOnlySupported) {
|
||||
mButtonWfcMode.setEntries(R.array.wifi_calling_mode_choices_without_wifi_only);
|
||||
mButtonWfcMode.setEntryValues(R.array.wifi_calling_mode_values_without_wifi_only);
|
||||
mButtonWfcMode.setEntrySummaries(R.array.wifi_calling_mode_summaries_without_wifi_only);
|
||||
|
||||
mButtonWfcRoamingMode.setEntries(
|
||||
R.array.wifi_calling_mode_choices_v2_without_wifi_only);
|
||||
mButtonWfcRoamingMode.setEntryValues(
|
||||
R.array.wifi_calling_mode_values_without_wifi_only);
|
||||
mButtonWfcRoamingMode.setEntrySummaries(
|
||||
R.array.wifi_calling_mode_summaries_without_wifi_only);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user