diff options
author | Ihab Awad <ihab@google.com> | 2014-12-18 16:39:34 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-18 16:39:34 +0000 |
commit | b6f6bbf4de119badbcf155956703e206faab5e7d (patch) | |
tree | d9a26e1586f7282b8f8ec6444abd95288c679093 | |
parent | 0a7d8edcd8b2a2972f19f38e6f92bfe7186353d4 (diff) | |
parent | 22f63740d602688d0dc2153b7610dfee5a07c5e4 (diff) |
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
-rw-r--r-- | src/com/android/dialer/list/SpeedDialFragment.java | 8 | ||||
-rw-r--r-- | src/com/android/dialer/util/DialerUtils.java | 2 |
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 2ca16b701..a42031677 100644 --- a/src/com/android/dialer/list/SpeedDialFragment.java +++ b/src/com/android/dialer/list/SpeedDialFragment.java @@ -235,14 +235,16 @@ public class SpeedDialFragment extends Fragment implements OnItemClickListener, /* 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 153f762e7..d59deb4ef 100644 --- a/src/com/android/dialer/util/DialerUtils.java +++ b/src/com/android/dialer/util/DialerUtils.java @@ -125,7 +125,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); |