commit 4e7d3d5552e6d344c10c1d8dd1890e7d580c8390
author Makoto Onuki <omakoto@google.com> Thu Nov 29 12:45:33 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 29 12:45:33 2012 -0800
tree b898560e50967497345afa15452ee4438cfadf6e
parent c08daf55c0ca1f84d0c2a88e8c6e1bd91f5fb181
parent 3a4f4664f6e7490aa7bbb10986f6f66b48e19cea

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

* commit '3a4f4664f6e7490aa7bbb10986f6f66b48e19cea':
  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 c60a228..a874f45 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 b811dd9..12819dc 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -324,7 +324,6 @@
             startActivity(redirect);
             return false;
         }
-        setTitle(mRequest.getActivityTitle());
         return true;
     }