Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \"Temp fix to split header and position count behaviour for watches.\" into nyc-mr1-dev

Browse Source 
am: 5985e3f92f

Change-Id: I2167505e4c71d6f7bc32d3a90c0c94a0d92319ab
This commit is contained in:
Michael Kwan
2016-06-11 00:13:22 +00:00
committed by android-build-merger
parent 23a8292f1c 5985e3f92f
commit 5c30475094
1 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
core/java/com/android/internal/app/AlertController.java
View File

@@ -24,6 +24,7 @@ import android.annotation.Nullable;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.res.Configuration;
import android.content.res.TypedArray;
import android.database.Cursor;
import android.graphics.drawable.Drawable;
@@ -177,6 +178,11 @@ public class AlertController {
return outValue.data != 0;
}
private static boolean isWatch(Context context) {
return (context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_TYPE_WATCH)
== Configuration.UI_MODE_TYPE_WATCH;
}
public static final AlertController create(Context context, DialogInterface di, Window window) {
final TypedArray a = context.obtainStyledAttributes(
null, R.styleable.AlertDialog, R.attr.alertDialogStyle, 0);
@@ -886,8 +892,14 @@ public class AlertController {
listView.setAdapter(mAdapter);
final int checkedItem = mCheckedItem;
if (checkedItem > -1) {
listView.setItemChecked(checkedItem + listView.getHeaderViewsCount(), true);
listView.setSelection(checkedItem + listView.getHeaderViewsCount());
// TODO: Remove temp watch specific code
if (isWatch(mContext)) {
listView.setItemChecked(checkedItem + listView.getHeaderViewsCount(), true);
listView.setSelection(checkedItem + listView.getHeaderViewsCount());
} else {
listView.setItemChecked(checkedItem, true);
listView.setSelection(checkedItem);
}
}
}
}
@@ -1066,8 +1078,13 @@ public class AlertController {
if (mCheckedItems != null) {
boolean isItemChecked = mCheckedItems[position];
if (isItemChecked) {
listView.setItemChecked(
position + listView.getHeaderViewsCount(), true);
// TODO: Remove temp watch specific code
if (isWatch(mContext)) {
listView.setItemChecked(
position + listView.getHeaderViewsCount(), true);
} else {
listView.setItemChecked(position, true);
}
}
}
return view;
@@ -1088,9 +1105,16 @@ public class AlertController {
public void bindView(View view, Context context, Cursor cursor) {
CheckedTextView text = (CheckedTextView) view.findViewById(R.id.text1);
text.setText(cursor.getString(mLabelIndex));
listView.setItemChecked(
cursor.getPosition() + listView.getHeaderViewsCount(),
cursor.getInt(mIsCheckedIndex) == 1);
// TODO: Remove temp watch specific code
if (isWatch(mContext)) {
listView.setItemChecked(
cursor.getPosition() + listView.getHeaderViewsCount(),
cursor.getInt(mIsCheckedIndex) == 1);
} else {
listView.setItemChecked(
cursor.getPosition(),
cursor.getInt(mIsCheckedIndex) == 1);
}
}
@Override
@@ -1133,7 +1157,10 @@ public class AlertController {
listView.setOnItemClickListener(new OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
position -= listView.getHeaderViewsCount();
// TODO: Remove temp watch specific code
if (isWatch(mContext)) {
position -= listView.getHeaderViewsCount();
}
mOnClickListener.onClick(dialog.mDialogInterface, position);
if (!mIsSingleChoice) {
dialog.mDialogInterface.dismiss();
@@ -1144,7 +1171,10 @@ public class AlertController {
listView.setOnItemClickListener(new OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
position -= listView.getHeaderViewsCount();
// TODO: Remove temp watch specific code
if (isWatch(mContext)) {
position -= listView.getHeaderViewsCount();
}
if (mCheckedItems != null) {
mCheckedItems[position] = listView.isItemChecked(position);
}