summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-03-16 02:45:59 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2015-03-16 02:45:59 -0700
commit671dc54ae926af660add045e6fcc9f41a7920371 (patch)
tree93ab55ca5feb5a0d274c53fe2481d1f7074d3585
parent7f23bdf626864595649d5deabca6cd4204473536 (diff)
parent85091aee657db8ae6f26679cd569642b1234ed26 (diff)
downloadandroid_packages_apps_Dialer-671dc54ae926af660add045e6fcc9f41a7920371.tar.gz
android_packages_apps_Dialer-671dc54ae926af660add045e6fcc9f41a7920371.tar.bz2
android_packages_apps_Dialer-671dc54ae926af660add045e6fcc9f41a7920371.zip
Merge "Improve Talkback for "Speed dial" user interface"
-rw-r--r--src/com/android/dialer/list/SpeedDialFragment.java8
-rw-r--r--src/com/android/dialer/util/DialerUtils.java2
2 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/dialer/list/SpeedDialFragment.java b/src/com/android/dialer/list/SpeedDialFragment.java
index c02c3d7f9..4572404fc 100644
--- a/src/com/android/dialer/list/SpeedDialFragment.java
+++ b/src/com/android/dialer/list/SpeedDialFragment.java
@@ -240,14 +240,16 @@ public class SpeedDialFragment extends AnalyticsFragment implements OnItemClickL
/* package */ void setEmptyViewVisibility(final boolean visible) {
final int previousVisibility = mEmptyView.getVisibility();
- final int newVisibility = visible ? View.VISIBLE : View.GONE;
+ final int emptyViewVisibility = visible ? View.VISIBLE : View.GONE;
+ final int listViewVisibility = visible ? View.GONE : View.VISIBLE;
- if (previousVisibility != newVisibility) {
+ if (previousVisibility != emptyViewVisibility) {
final RelativeLayout.LayoutParams params = (LayoutParams) mContactTileFrame
.getLayoutParams();
params.height = visible ? LayoutParams.WRAP_CONTENT : LayoutParams.MATCH_PARENT;
mContactTileFrame.setLayoutParams(params);
- mEmptyView.setVisibility(newVisibility);
+ mEmptyView.setVisibility(emptyViewVisibility);
+ mListView.setVisibility(listViewVisibility);
}
}
diff --git a/src/com/android/dialer/util/DialerUtils.java b/src/com/android/dialer/util/DialerUtils.java
index a747c74aa..48d969904 100644
--- a/src/com/android/dialer/util/DialerUtils.java
+++ b/src/com/android/dialer/util/DialerUtils.java
@@ -124,7 +124,7 @@ public class DialerUtils {
(ImageView) emptyListView.findViewById(R.id.emptyListViewImage);
emptyListViewImage.setImageDrawable(res.getDrawable(imageResId));
- emptyListViewImage.setContentDescription(res.getString(strResId));
+ emptyListViewImage.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
TextView emptyListViewMessage =
(TextView) emptyListView.findViewById(R.id.emptyListViewMessage);