diff options
author | lookshe <github@lookshe.org> | 2015-08-12 21:43:04 +0200 |
---|---|---|
committer | lookshe <github@lookshe.org> | 2015-08-12 21:43:04 +0200 |
commit | 4bb806585f6ccb02a1f25a69dafd57f17f1c7411 (patch) | |
tree | 29dcf543b7a7c1869411b838816cc6a2f4b85b84 /libs/emojicon/src/main/res/layout/emojicon_item.xml | |
parent | 0ee1992da2014d51e42c008b2ae39a6e1e033d0b (diff) |
merged latest version from https://github.com/firexel/emojicon/trz/emojicon-merge
but only seems to work with lollipop, so switch back to the old pictures
Diffstat (limited to 'libs/emojicon/src/main/res/layout/emojicon_item.xml')
-rw-r--r-- | libs/emojicon/src/main/res/layout/emojicon_item.xml | 51 |
1 files changed, 22 insertions, 29 deletions
diff --git a/libs/emojicon/src/main/res/layout/emojicon_item.xml b/libs/emojicon/src/main/res/layout/emojicon_item.xml index ed11041a..c5e765cb 100644 --- a/libs/emojicon/src/main/res/layout/emojicon_item.xml +++ b/libs/emojicon/src/main/res/layout/emojicon_item.xml @@ -1,32 +1,25 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright 2014 Ankush Sachdeva - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> -<FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:emojicon="http://schemas.android.com/apk/res-auto" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + style="?emojicon_grid_item_style" + android:layout_width="64dp" + android:layout_height="64dp"> + + <TextView + android:id="@+id/emojiId" + style="?emojicon_id_style" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + tools:text="A68" /> + + <TextView + android:id="@+id/emojiContainer" + style="?emojicon_item_style" android:layout_width="wrap_content" - android:layout_height="wrap_content"> - <github.ankushsachdeva.emojicon.EmojiconTextView - android:layout_gravity="center" - android:id="@+id/emojicon_icon" - android:layout_width="36dip" - android:layout_height="36dip" - emojicon:emojiconSize="30dip" - android:focusable="false" - android:focusableInTouchMode="false" - android:gravity="center"/> -</FrameLayout>
\ No newline at end of file + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:layout_gravity="center" + tools:text=";)" /> + +</RelativeLayout>
\ No newline at end of file |