commit 6428cb03fa07a7bdfb020e18384214fe3df56664
author Makoto Onuki <omakoto@google.com> Thu Nov 29 12:48:53 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 29 12:48:53 2012 -0800
tree d6b28b15600bb353bd6f64b66a6a0129bf10eed9
parent 7d98eb5067ec805aa4c05343b6320197b7632854
parent 4e7d3d5552e6d344c10c1d8dd1890e7d580c8390

am 4e7d3d55: am 3a4f4664: am b7a1da62: Let talkback read People app name on launch

* commit '4e7d3d5552e6d344c10c1d8dd1890e7d580c8390':
  Let talkback read People app name on launch

src/com/android/contacts/activities/ContactSelectionActivity.java

diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java
index 6822494..4fe99f8 100644
--- a/src/com/android/contacts/activities/ContactSelectionActivity.java
+++ b/src/com/android/contacts/activities/ContactSelectionActivity.java
@@ -250,7 +250,7 @@
     }
 
     private void configureActivityTitle() {
-        if (mRequest.getActivityTitle() != null) {
+        if (!TextUtils.isEmpty(mRequest.getActivityTitle())) {
             setTitle(mRequest.getActivityTitle());
             return;
         }

src/com/android/contacts/activities/PeopleActivity.java

diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 9ad21e8..927e429 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -323,7 +323,6 @@
             startActivity(redirect);
             return false;
         }
-        setTitle(mRequest.getActivityTitle());
         return true;
     }