Rollback theming context menu text. Crashing in KitKat.
PiperOrigin-RevId: 243321752
Change-Id: I651b26a120415ecd8b0a7fd9abda34329a9e2049
diff --git a/src/main/java/com/google/android/libraries/feed/sharedstream/ui/res/layout/feed_simple_list_item.xml b/src/main/java/com/google/android/libraries/feed/sharedstream/ui/res/layout/feed_simple_list_item.xml
index c6091fd..eceeb5f 100644
--- a/src/main/java/com/google/android/libraries/feed/sharedstream/ui/res/layout/feed_simple_list_item.xml
+++ b/src/main/java/com/google/android/libraries/feed/sharedstream/ui/res/layout/feed_simple_list_item.xml
@@ -22,6 +22,6 @@
android:gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
- android:textColor="?feedContextMenuTextColor"
+ android:textColor="@color/black_alpha_87"
style="@style/FeedMenuTextPaddingStyle"
/>
diff --git a/src/main/java/com/google/android/libraries/feed/sharedstream/ui/res/values/attr.xml b/src/main/java/com/google/android/libraries/feed/sharedstream/ui/res/values/attr.xml
index b318cfb..ca2e3ce 100644
--- a/src/main/java/com/google/android/libraries/feed/sharedstream/ui/res/values/attr.xml
+++ b/src/main/java/com/google/android/libraries/feed/sharedstream/ui/res/values/attr.xml
@@ -19,6 +19,4 @@
<attr name="feedMoreButtonRipple" format="reference" />
<!-- Sets the color of the more button when not pressed. -->
<attr name="feedTouchNonPressed" format="reference" />
- <!-- Sets the color of the context menu text. -->
- <attr name="feedContextMenuTextColor" format="reference" />
</resources>
diff --git a/src/main/java/com/google/android/libraries/feed/sharedstream/ui/res/values/colors.xml b/src/main/java/com/google/android/libraries/feed/sharedstream/ui/res/values/colors.xml
index 03ae326..b1178ef 100644
--- a/src/main/java/com/google/android/libraries/feed/sharedstream/ui/res/values/colors.xml
+++ b/src/main/java/com/google/android/libraries/feed/sharedstream/ui/res/values/colors.xml
@@ -31,7 +31,6 @@
<color name="feed_default_text_color_secondary">@color/feed_modern_grey_700</color>
<!-- Modern color palette -->
- <color name="feed_modern_grey_500">#9AA0A6</color>
<color name="feed_modern_grey_700">#5F6368</color>
<color name="feed_modern_grey_900">#202124</color>
<color name="feed_modern_grey_900_white_alpha_4">#28292C</color>
diff --git a/src/main/java/com/google/android/libraries/feed/sharedstream/ui/res/values/themes.xml b/src/main/java/com/google/android/libraries/feed/sharedstream/ui/res/values/themes.xml
index 04b4bc6..648791a 100644
--- a/src/main/java/com/google/android/libraries/feed/sharedstream/ui/res/values/themes.xml
+++ b/src/main/java/com/google/android/libraries/feed/sharedstream/ui/res/values/themes.xml
@@ -20,14 +20,12 @@
<item name="feedBlueTitleColor">@color/feed_modern_blue_600</item>
<item name="feedMoreButtonRipple">@color/feed_alpha_10_modern_blue_600</item>
<item name="feedTouchNonPressed">@android:color/white</item>
- <item name="feedContextMenuTextColor">@color/black_alpha_87</item>
</style>
<style name="Dark">
<item name="feedBlueTitleColor">@color/feed_modern_blue_300</item>
<item name="feedMoreButtonRipple">@color/feed_alpha_10_modern_blue_300</item>
<item name="feedTouchNonPressed">@color/feed_modern_grey_900_white_alpha_4</item>
- <item name="feedContextMenuTextColor">@color/feed_modern_grey_500</item>
</style>
</resources>
diff --git a/src/test/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/ContextMenuManagerImplTest.java b/src/test/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/ContextMenuManagerImplTest.java
index 92c6e42..31f8cda 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/ContextMenuManagerImplTest.java
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/ContextMenuManagerImplTest.java
@@ -63,7 +63,6 @@
initMocks(this);
context = Robolectric.buildActivity(Activity.class).get();
- context.setTheme(R.style.Light);
parentView = new FrameLayout(context);
anchorView = new View(context);
parentView.addView(anchorView);
diff --git a/src/test/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/FloatingContextMenuManagerTest.java b/src/test/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/FloatingContextMenuManagerTest.java
index 08f8275..d83a172 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/FloatingContextMenuManagerTest.java
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/FloatingContextMenuManagerTest.java
@@ -52,7 +52,6 @@
public void createContextMenuManager() {
initMocks(this);
context = Robolectric.buildActivity(Activity.class).get();
- context.setTheme(R.style.Light);
contextMenuManager = new FloatingContextMenuManager(context);
anchorView = new View(context);
}