diff options
author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2012-09-17 09:57:09 +0200 |
---|---|---|
committer | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2012-09-17 09:58:19 +0200 |
commit | ee181f82aa0de60c0d468dc81b028d4917a2fa3c (patch) | |
tree | 3402036d258aeff7761f5d6ef073630b9d38e34a /android | |
parent | fdo#54858: fix UNO service conversion (diff) | |
download | core-ee181f82aa0de60c0d468dc81b028d4917a2fa3c.tar.gz core-ee181f82aa0de60c0d468dc81b028d4917a2fa3c.zip |
Styling and icons for Selector Activity complete.
Change-Id: I11e26c9c97c4e9aea465c0d9f6b7863a260a3577
Diffstat (limited to 'android')
-rw-r--r-- | android/sdremote/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | android/sdremote/res/drawable/actionbar_icon_computer.png | bin | 0 -> 451 bytes | |||
-rw-r--r-- | android/sdremote/res/layout/activity_selector.xml | 4 | ||||
-rw-r--r-- | android/sdremote/res/values-v10/styles.xml | 18 | ||||
-rw-r--r-- | android/sdremote/res/values/strings.xml | 1 | ||||
-rw-r--r-- | android/sdremote/res/values/styles.xml | 5 |
6 files changed, 28 insertions, 2 deletions
diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml index 6572366f7062..7ccc1f0ce16d 100644 --- a/android/sdremote/AndroidManifest.xml +++ b/android/sdremote/AndroidManifest.xml @@ -17,6 +17,8 @@ android:theme="@style/Theme.ImpressRemote" > <activity android:name=".SelectorActivity" + android:icon="@drawable/actionbar_icon_computer" + android:label="@string/selector_choose_a_computer" android:uiOptions="splitActionBarWhenNarrow" > <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/android/sdremote/res/drawable/actionbar_icon_computer.png b/android/sdremote/res/drawable/actionbar_icon_computer.png Binary files differnew file mode 100644 index 000000000000..ce764710b1ea --- /dev/null +++ b/android/sdremote/res/drawable/actionbar_icon_computer.png diff --git a/android/sdremote/res/layout/activity_selector.xml b/android/sdremote/res/layout/activity_selector.xml index c5c734b78daf..2c16abe80fed 100644 --- a/android/sdremote/res/layout/activity_selector.xml +++ b/android/sdremote/res/layout/activity_selector.xml @@ -6,8 +6,8 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="10dip" - android:orientation="vertical" > + android:orientation="vertical" + android:padding="10dip" > <TextView android:id="@+id/selector_label_none" diff --git a/android/sdremote/res/values-v10/styles.xml b/android/sdremote/res/values-v10/styles.xml new file mode 100644 index 000000000000..c43c00d9a638 --- /dev/null +++ b/android/sdremote/res/values-v10/styles.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources xmlns:android="http://schemas.android.com/apk/res/android"> + + <style name="Theme.ImpressRemote.Dialog" parent="@android:style/Theme.Dialog"> + <item name="android:windowBackground">@color/light_grey</item> + <item name="android:topDark">@color/grey</item> + <item name="android:topBright">@color/grey</item> + <item name="android:centerDark">@color/light_grey</item> + <item name="android:bottomDark">@color/light_grey</item> + <item name="android:fullBright">@color/light_grey</item> + <item name="android:centerBright">@color/light_grey</item> + <item name="android:bottomBright">@color/light_grey</item> + <item name="android:bottomMedium">@color/light_grey</item> + <item name="android:centerMedium">@color/light_grey</item> + <item name="android:textColor">@color/grey</item> + </style> + +</resources>
\ No newline at end of file diff --git a/android/sdremote/res/values/strings.xml b/android/sdremote/res/values/strings.xml index 8e2f62938844..3a5fbb58ed3f 100644 --- a/android/sdremote/res/values/strings.xml +++ b/android/sdremote/res/values/strings.xml @@ -24,6 +24,7 @@ <string name="wifi">WI-FI</string> <string name="selector_noservers">Searching for computers…</string> <string name="selector_delete">Remove server</string> + <string name="selector_choose_a_computer">Choose a Computer</string> <string name="pairing_instructions_1">In Impress, click on the "Slideshow" menu and select "Impress Remote".</string> <string name="pairing_instructions_2_deviceName">Choose \"{0}\" as your device.</string> <string name="pairing_instructions_3">Then input this PIN:</string> diff --git a/android/sdremote/res/values/styles.xml b/android/sdremote/res/values/styles.xml index eb71393becd3..80a4b4ae73ef 100644 --- a/android/sdremote/res/values/styles.xml +++ b/android/sdremote/res/values/styles.xml @@ -59,6 +59,10 @@ <item name="android:textColor">@color/grey</item> </style> + <style name="Theme.ImpressRemote.Dialog.Title" parent="@android:style/Theme.Dialog"> + <item name="android:textColor">@color/grey</item> + </style> + <style name="Theme.ImpressRemote" parent="Theme.Sherlock.Light.DarkActionBar"> <item name="android:actionBarStyle">@style/Theme.ImpressRemote.ActionBar</item> <item name="actionBarStyle">@style/Theme.ImpressRemote.ActionBar</item> @@ -70,6 +74,7 @@ <item name="android:homeAsUpIndicator">@drawable/up_indicator_white</item> <item name="android:textColor">@color/text_grey</item> <item name="android:alertDialogStyle">@style/Theme.ImpressRemote.Dialog</item> + </style> </resources>
\ No newline at end of file |