commit | d61702b10fb0ff24ac00b00dc95f6826a591d2f4 | [log] [tgz] |
---|---|---|
author | chelseahao <[email protected]> | Fri Jan 13 14:03:57 2023 +0800 |
committer | chelseahao <[email protected]> | Fri Jan 13 14:22:22 2023 +0800 |
tree | 6c87dc5760a62bb4d2ca063ad9aeccdef3a27259 | |
parent | 43ec6e258f05a132dcf3f2d0288ea736067a0e1c [diff] |
Styles cleanup. Removed used textSize. Test: manual Change-Id: Ib3caed2450fd13a9dc1cf9d11adaa4ee9f2e1ae4
diff --git a/emoji2/emoji2-emojipicker/samples/src/main/AndroidManifest.xml b/emoji2/emoji2-emojipicker/samples/src/main/AndroidManifest.xml index a155641..45e6dbd 100644 --- a/emoji2/emoji2-emojipicker/samples/src/main/AndroidManifest.xml +++ b/emoji2/emoji2-emojipicker/samples/src/main/AndroidManifest.xml
@@ -17,7 +17,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android"> <uses-sdk android:minSdkVersion="21"/> - <application> + <application + android:label="Emoji Picker Sample App" > <activity android:name=".MainActivity" android:exported="true" android:theme="@style/MyPinkTheme"> <!-- Handle Google app icon launch. -->
diff --git a/emoji2/emoji2-emojipicker/samples/src/main/res/values/styles.xml b/emoji2/emoji2-emojipicker/samples/src/main/res/values/styles.xml index 89ce1c3..32ff475 100644 --- a/emoji2/emoji2-emojipicker/samples/src/main/res/values/styles.xml +++ b/emoji2/emoji2-emojipicker/samples/src/main/res/values/styles.xml
@@ -18,12 +18,14 @@ <resources> <style name="MyPinkTheme" parent="Theme.AppCompat.DayNight" > - <!-- The color for selected headers --> + <!-- The color for selected category icons --> <item name="colorAccent">#696969</item> - <!-- The color for unselected headers --> + <!-- The color for unselected category icons --> <item name="colorControlNormal">#FFC0CB</item> <!-- The color for all text --> <item name="android:textColorPrimary">#696969</item> + <!-- The text size for category text --> + <item name="android:textSize">12dp</item> <!-- The color for variant popup background --> <item name="colorButtonNormal">#FFC0CB</item> </style>
diff --git a/emoji2/emoji2-emojipicker/src/main/res/layout/category_text_view.xml b/emoji2/emoji2-emojipicker/src/main/res/layout/category_text_view.xml index c7bc5af..354bc25 100644 --- a/emoji2/emoji2-emojipicker/src/main/res/layout/category_text_view.xml +++ b/emoji2/emoji2-emojipicker/src/main/res/layout/category_text_view.xml
@@ -31,6 +31,5 @@ android:gravity="center_vertical|start" android:letterSpacing="0.1" android:importantForAccessibility="yes" - android:textColor="?android:attr/textColorPrimary" - android:textSize="12dp" /> + android:textColor="?android:attr/textColorPrimary" /> </FrameLayout>
diff --git a/emoji2/emoji2-emojipicker/src/main/res/layout/emoji_view_holder.xml b/emoji2/emoji2-emojipicker/src/main/res/layout/emoji_view_holder.xml index eec343d..e9529a9 100644 --- a/emoji2/emoji2-emojipicker/src/main/res/layout/emoji_view_holder.xml +++ b/emoji2/emoji2-emojipicker/src/main/res/layout/emoji_view_holder.xml
@@ -34,7 +34,6 @@ android:layout_height="match_parent" android:background="@drawable/ripple_emoji_view" android:importantForAccessibility="yes" - android:textSize="30dp" android:layout_margin="1dp" /> </FrameLayout> <ImageView