commit 33456a0efa16d7f31ba25f1d1b8c662053104117
author Makoto Onuki <omakoto@google.com> Tue Jul 12 10:27:34 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 12 10:27:34 2011 -0700
tree dc2661bb85b917e91991a30056c341ad3782b944
parent 81d79a8fbed8ab015e760f8c2451d1e66e077066
parent 4959ca3d0093a798859660f2914003d0da777645

Merge "Revert "Set up fragments just after setContentView().""

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

diff --git a/src/com/android/contacts/activities/ActionBarAdapter.java b/src/com/android/contacts/activities/ActionBarAdapter.java
index 51ed1e8..3a183d2 100644
--- a/src/com/android/contacts/activities/ActionBarAdapter.java
+++ b/src/com/android/contacts/activities/ActionBarAdapter.java
@@ -198,7 +198,10 @@
     public void onRestoreInstanceState(Bundle savedState) {
         mSearchMode = savedState.getBoolean(EXTRA_KEY_SEARCH_MODE);
         mQueryString = savedState.getString(EXTRA_KEY_QUERY);
-        mActionBar.setSelectedNavigationItem(savedState.getInt(EXTRA_KEY_SELECTED_TAB));
+        int selectedTab = savedState.getInt(EXTRA_KEY_SELECTED_TAB);
+        if (selectedTab >= 0) {
+            mActionBar.setSelectedNavigationItem(selectedTab);
+        }
     }
 
     private void setFocusOnSearchView() {

src/com/android/contacts/list/ContactTileView.java

diff --git a/src/com/android/contacts/list/ContactTileView.java b/src/com/android/contacts/list/ContactTileView.java
index 279dc93..7981bd1 100644
--- a/src/com/android/contacts/list/ContactTileView.java
+++ b/src/com/android/contacts/list/ContactTileView.java
@@ -43,6 +43,7 @@
 
     public ContactTileView(Context context, AttributeSet attrs) {
         super(context, attrs);
+        setLayerType(View.LAYER_TYPE_HARDWARE, null);
     }
 
     @Override

tests/src/com/android/contacts/ContactLoaderTest.java

diff --git a/tests/src/com/android/contacts/ContactLoaderTest.java b/tests/src/com/android/contacts/ContactLoaderTest.java
index d923bfa..1d3fb20 100644
--- a/tests/src/com/android/contacts/ContactLoaderTest.java
+++ b/tests/src/com/android/contacts/ContactLoaderTest.java
@@ -312,7 +312,7 @@
                         "mockAccountName", "mockAccountType", 0,
                         1, 0, "sync1",
                         "sync2", "sync3", "sync4",
-                        0, 0, 0,
+                        0, 0,
 
                         dataId,