Brion VIBBER has uploaded a new change for review. https://gerrit.wikimedia.org/r/122546
Change subject: [Gingerbread] Can't use ?attr/selectableItemBackground until v11 ...................................................................... [Gingerbread] Can't use ?attr/selectableItemBackground until v11 Moving it to a 'SelectableItem' style which can be used on any item Change-Id: Ia251d9792deeb546a54bb72283b03875308f07e7 --- M wikipedia/res/layout/fragment_navdrawer.xml M wikipedia/res/layout/fragment_search.xml M wikipedia/res/layout/group_load_more.xml M wikipedia/res/values/styles.xml 4 files changed, 16 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/46/122546/1 diff --git a/wikipedia/res/layout/fragment_navdrawer.xml b/wikipedia/res/layout/fragment_navdrawer.xml index ab35118..4b913cc 100644 --- a/wikipedia/res/layout/fragment_navdrawer.xml +++ b/wikipedia/res/layout/fragment_navdrawer.xml @@ -14,7 +14,7 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:id="@+id/nav_item_login" - android:background="?android:attr/selectableItemBackground" + style="SelectableItem" android:paddingTop="8dp" android:paddingBottom="8dp" android:paddingRight="8dp" @@ -88,7 +88,7 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:id="@+id/nav_item_my_contributions" - android:background="?android:attr/selectableItemBackground" + style="SelectableItem" > <ImageView android:layout_width="24dp" android:layout_height="24dp" android:layout_margin="12dp" @@ -108,7 +108,7 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:id="@+id/nav_item_history" - android:background="?android:attr/selectableItemBackground" + style="SelectableItem" > <ImageView android:layout_width="24dp" android:layout_height="24dp" android:layout_margin="12dp" @@ -128,7 +128,7 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:id="@+id/nav_item_saved_pages" - android:background="?android:attr/selectableItemBackground" + style="SelectableItem" > <ImageView android:layout_width="24dp" android:layout_height="24dp" android:layout_margin="12dp" @@ -148,7 +148,7 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:id="@+id/nav_item_random" - android:background="?android:attr/selectableItemBackground" + style="SelectableItem" > <ImageView android:layout_width="24dp" android:layout_height="24dp" android:layout_margin="12dp" @@ -192,7 +192,7 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:id="@+id/nav_item_settings" - android:background="?android:attr/selectableItemBackground" + style="SelectableItem" > <ImageView android:layout_width="24dp" android:layout_height="24dp" android:layout_margin="12dp" @@ -212,7 +212,7 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:id="@+id/nav_item_send_feedback" - android:background="?android:attr/selectableItemBackground" + style="SelectableItem" > <ImageView android:layout_width="24dp" android:layout_height="24dp" android:layout_margin="12dp" @@ -231,7 +231,7 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:id="@+id/nav_item_logout" - android:background="?android:attr/selectableItemBackground" + style="SelectableItem" > <ImageView android:layout_width="24dp" android:layout_height="24dp" android:layout_margin="12dp" diff --git a/wikipedia/res/layout/fragment_search.xml b/wikipedia/res/layout/fragment_search.xml index 013b4f4..612f4a3 100644 --- a/wikipedia/res/layout/fragment_search.xml +++ b/wikipedia/res/layout/fragment_search.xml @@ -16,7 +16,7 @@ <LinearLayout android:id="@+id/search_bar_icon" android:layout_width="wrap_content" - android:background="?android:attr/selectableItemBackground" + style="@style/SelectableItem" android:layout_height="wrap_content"> <ImageView android:id="@+id/search_drawer_indicator" @@ -75,7 +75,7 @@ android:layout_height="48dp" android:padding="8dp" android:src="@drawable/ic_menu_moreoverflow_normal_holo_light" - android:background="?android:attr/selectableItemBackground" + style="@style/SelectableItem" /> </LinearLayout> <!-- Android has no easy way to give us a light border --> @@ -96,9 +96,8 @@ android:layout_height="48dp" android:gravity="center" android:text="@string/search_network_error" - style="?android:textAppearanceMedium" + style="@style/SelectableItem" android:visibility="gone" - android:background="?android:attr/selectableItemBackground" /> <ListView android:id="@+id/search_results_list" diff --git a/wikipedia/res/layout/group_load_more.xml b/wikipedia/res/layout/group_load_more.xml index debf472..064f2ba 100644 --- a/wikipedia/res/layout/group_load_more.xml +++ b/wikipedia/res/layout/group_load_more.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="8dp" - android:background="?android:selectableItemBackground" + style="SelectableItem" android:id="@+id/load_more_container" > <org.wikipedia.styledviews.StyledTextView diff --git a/wikipedia/res/values/styles.xml b/wikipedia/res/values/styles.xml index bc105ba..367113b 100644 --- a/wikipedia/res/values/styles.xml +++ b/wikipedia/res/values/styles.xml @@ -7,4 +7,8 @@ <item name="android:windowTitleSize">0dp</item> </style> + <!-- Can't use ?android:attr/selectableItemBackground until API level 11 --> + <style name="SelectableItem" parent="AppTheme"> + <!--<item name="android:background">#ff00ff</item>--><!-- fixme better default --> + </style> </resources> \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/122546 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia251d9792deeb546a54bb72283b03875308f07e7 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Brion VIBBER <br...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits