commit b6f6bbf4de119badbcf155956703e206faab5e7d
author Ihab Awad <ihab@google.com> Thu Dec 18 16:39:34 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 18 16:39:34 2014 +0000
tree d9a26e1586f7282b8f8ec6444abd95288c679093
parent 0a7d8edcd8b2a2972f19f38e6f92bfe7186353d4
parent 22f63740d602688d0dc2153b7610dfee5a07c5e4

am 22f63740: am f2c50041: Merge "Improve Talkback for "Speed dial" user interface" into lmp-mr1-dev

* commit '22f63740d602688d0dc2153b7610dfee5a07c5e4':
  Improve Talkback for "Speed dial" user interface

src/com/android/dialer/list/SpeedDialFragment.java

diff --git a/src/com/android/dialer/list/SpeedDialFragment.java b/src/com/android/dialer/list/SpeedDialFragment.java
index 2ca16b7..a420316 100644
--- a/src/com/android/dialer/list/SpeedDialFragment.java
+++ b/src/com/android/dialer/list/SpeedDialFragment.java
@@ -235,14 +235,16 @@
 
     /* 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);
         }
     }
 

src/com/android/dialer/util/DialerUtils.java

diff --git a/src/com/android/dialer/util/DialerUtils.java b/src/com/android/dialer/util/DialerUtils.java
index 153f762..d59deb4 100644
--- a/src/com/android/dialer/util/DialerUtils.java
+++ b/src/com/android/dialer/util/DialerUtils.java
@@ -125,7 +125,7 @@
                 (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);