diff options
| author | Andrew Dolgov <[email protected]> | 2014-10-15 12:26:16 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2014-10-15 12:26:16 +0400 |
| commit | a2e8246a4e087e6394eb20860aa10dec77b071ab (patch) | |
| tree | 708aaf28ac74ca7b39a3a0585080d7a931840436 /res | |
| parent | 4384b802c88293568fa72e128b3b03725c6631cb (diff) | |
update support library
switch to actionbarcompat/themecompat stuff from actionbarsherlock
Diffstat (limited to 'res')
| -rw-r--r-- | res/menu/activity_main.xml | 7 | ||||
| -rw-r--r-- | res/menu/activity_view_comic.xml | 13 | ||||
| -rw-r--r-- | res/values/styles.xml | 4 |
3 files changed, 13 insertions, 11 deletions
diff --git a/res/menu/activity_main.xml b/res/menu/activity_main.xml index f89f77a..bb07f5b 100644 --- a/res/menu/activity_main.xml +++ b/res/menu/activity_main.xml @@ -1,14 +1,15 @@ -<menu xmlns:android="http://schemas.android.com/apk/res/android"> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:ugh="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_donate" android:title="@string/menu_donate" - android:showAsAction="ifRoom" + ugh:showAsAction="ifRoom" android:icon="@drawable/ic_action_good" /> <item android:id="@+id/menu_rescan" android:title="@string/menu_rescan" android:icon="@drawable/ic_refresh_light" - android:showAsAction="ifRoom" /> + ugh:showAsAction="ifRoom" /> <item android:id="@+id/menu_settings" android:title="@string/menu_settings" diff --git a/res/menu/activity_view_comic.xml b/res/menu/activity_view_comic.xml index 4288f01..45d0473 100644 --- a/res/menu/activity_view_comic.xml +++ b/res/menu/activity_view_comic.xml @@ -1,25 +1,26 @@ -<menu xmlns:android="http://schemas.android.com/apk/res/android"> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:ugh="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/menu_settings" android:title="@string/menu_settings" android:icon="@drawable/ic_settings" android:orderInCategory="100" - android:showAsAction="never" /> + ugh:showAsAction="never" /> <item android:id="@+id/menu_share" android:title="@string/menu_share" android:icon="@drawable/ic_share_light" - android:showAsAction="ifRoom" /> + ugh:showAsAction="ifRoom" /> <item android:id="@+id/menu_go_location" android:title="@string/menu_go_location" - android:showAsAction="never" /> + ugh:showAsAction="never" /> <item android:id="@+id/menu_sync_location" android:title="@string/menu_sync_location" - android:showAsAction="never" /> + ugh:showAsAction="never" /> <item android:id="@+id/menu_toggle_orientation_lock" android:title="@string/menu_toggle_orientation_lock" - android:showAsAction="never" /> + ugh:showAsAction="never" /> </menu> diff --git a/res/values/styles.xml b/res/values/styles.xml index 84df662..e1f02d6 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -1,6 +1,6 @@ <resources>
- <style name="AppTheme" parent="Theme.Sherlock.Light.DarkActionBar" />
- <style name="DarkTheme" parent="Theme.Sherlock" />
+ <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar" />
+ <style name="DarkTheme" parent="Theme.AppCompat" />
</resources>
\ No newline at end of file |