diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2012-11-26 17:21:17 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2012-11-27 12:29:02 +0000 |
| commit | 554163f2fe0cde5990bf323a13e5c04de4b7b30b (patch) | |
| tree | 0eddde386dee58f7fc47bac44df66cb0689fcd00 /android/res | |
| parent | 08fa32c5cc5bb1a2ea1468a3bfc81c49d4704593 (diff) | |
| download | mupdf-554163f2fe0cde5990bf323a13e5c04de4b7b30b.tar.xz | |
android: Re-enable highlight button and use tinting for button states.
Diffstat (limited to 'android/res')
| -rw-r--r-- | android/res/drawable-ldpi/ic_hl_link.png | bin | 558 -> 0 bytes | |||
| -rw-r--r-- | android/res/drawable-ldpi/ic_nolink.png | bin | 518 -> 0 bytes | |||
| -rw-r--r-- | android/res/drawable-mdpi/ic_hl_link.png | bin | 601 -> 0 bytes | |||
| -rw-r--r-- | android/res/drawable-mdpi/ic_nolink.png | bin | 690 -> 0 bytes | |||
| -rw-r--r-- | android/res/layout/buttons.xml | 10 |
5 files changed, 7 insertions, 3 deletions
diff --git a/android/res/drawable-ldpi/ic_hl_link.png b/android/res/drawable-ldpi/ic_hl_link.png Binary files differdeleted file mode 100644 index 30a03ea8..00000000 --- a/android/res/drawable-ldpi/ic_hl_link.png +++ /dev/null diff --git a/android/res/drawable-ldpi/ic_nolink.png b/android/res/drawable-ldpi/ic_nolink.png Binary files differdeleted file mode 100644 index 5a8f0051..00000000 --- a/android/res/drawable-ldpi/ic_nolink.png +++ /dev/null diff --git a/android/res/drawable-mdpi/ic_hl_link.png b/android/res/drawable-mdpi/ic_hl_link.png Binary files differdeleted file mode 100644 index d38f945c..00000000 --- a/android/res/drawable-mdpi/ic_hl_link.png +++ /dev/null diff --git a/android/res/drawable-mdpi/ic_nolink.png b/android/res/drawable-mdpi/ic_nolink.png Binary files differdeleted file mode 100644 index f13053cf..00000000 --- a/android/res/drawable-mdpi/ic_nolink.png +++ /dev/null diff --git a/android/res/layout/buttons.xml b/android/res/layout/buttons.xml index a9f46d38..fe6b27f1 100644 --- a/android/res/layout/buttons.xml +++ b/android/res/layout/buttons.xml @@ -37,7 +37,7 @@ android:layout_toLeftOf="@+id/searchButton" android:contentDescription="@string/search_document" android:src="@drawable/ic_list" /> -<!-- + <ImageButton android:id="@+id/linkButton" android:layout_width="wrap_content" @@ -46,17 +46,18 @@ android:layout_toLeftOf="@+id/outlineButton" android:contentDescription="@string/link_control" android:src="@drawable/ic_link" /> ---> + <TextView android:id="@+id/docNameText" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_centerVertical="true" - android:layout_toLeftOf="@+id/outlineButton" + android:layout_toLeftOf="@+id/linkButton" android:paddingLeft="15dp" android:singleLine="true" android:textAppearance="?android:attr/textAppearanceMedium" /> + </RelativeLayout> <RelativeLayout @@ -107,7 +108,9 @@ android:layout_centerVertical="true" android:contentDescription="@string/search_forwards" android:src="@drawable/ic_arrow_right" /> + </RelativeLayout> + </ViewSwitcher> <RelativeLayout @@ -135,6 +138,7 @@ android:layout_marginBottom="10dp" android:background="@drawable/page_num" android:textAppearance="?android:attr/textAppearanceMedium" /> + </RelativeLayout> </RelativeLayout> |
