Merge heads

2013-06-08 13:12:39 +08:00
parent 7a09e89041
commit d1055ef5ee
48 changed files with 374 additions and 411 deletions
@@ -34,7 +34,7 @@ limitations under the License.
    <item name="android:measureWithLargestChild">true</item>
  </style>
  <style name="ListItem">
-    <item name="android:background">@drawable/activated_background_mytracks</item>
+    <item name="android:background">?android:attr/activatedBackgroundIndicator</item>
  </style>
  <style name="ThemeSelector" parent="android:Theme.Holo">
    <item name="android:actionBarStyle">@style/ActionBarStyle.MyTracks</item>