diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable-hdpi/ic_holo_light_navigation_drawer.png | bin | 0 -> 97 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/ic_holo_light_navigation_drawer.png | bin | 0 -> 88 bytes | |||
| -rw-r--r-- | res/drawable-nodpi/theme_preview.png | bin | 66556 -> 62470 bytes | |||
| -rw-r--r-- | res/drawable-xhdpi/ic_holo_light_navigation_drawer.png | bin | 0 -> 107 bytes | |||
| -rw-r--r-- | res/drawable-xxhdpi/ic_holo_light_navigation_drawer.png | bin | 0 -> 120 bytes | |||
| -rw-r--r-- | res/layout/bookmarks.xml | 36 | ||||
| -rw-r--r-- | res/layout/bookmarks_item.xml | 94 | ||||
| -rw-r--r-- | res/layout/history.xml | 56 | ||||
| -rw-r--r-- | res/layout/history_item.xml | 99 | ||||
| -rw-r--r-- | res/layout/navigation.xml | 68 | ||||
| -rw-r--r-- | res/layout/navigation_drawer.xml | 62 | ||||
| -rw-r--r-- | res/layout/navigation_view_statusbar.xml | 20 | ||||
| -rw-r--r-- | res/menu/drawer.xml | 41 | ||||
| -rw-r--r-- | res/menu/navigation.xml | 8 | ||||
| -rw-r--r-- | res/raw/changelog | 4 | ||||
| -rw-r--r-- | res/values/strings.xml | 4 | ||||
| -rw-r--r-- | res/values/styles.xml | 22 | ||||
| -rw-r--r-- | res/values/theme.xml | 6 |
18 files changed, 263 insertions, 257 deletions
diff --git a/res/drawable-hdpi/ic_holo_light_navigation_drawer.png b/res/drawable-hdpi/ic_holo_light_navigation_drawer.png Binary files differnew file mode 100644 index 00000000..3f1933b0 --- /dev/null +++ b/res/drawable-hdpi/ic_holo_light_navigation_drawer.png diff --git a/res/drawable-mdpi/ic_holo_light_navigation_drawer.png b/res/drawable-mdpi/ic_holo_light_navigation_drawer.png Binary files differnew file mode 100644 index 00000000..93e1d5e3 --- /dev/null +++ b/res/drawable-mdpi/ic_holo_light_navigation_drawer.png diff --git a/res/drawable-nodpi/theme_preview.png b/res/drawable-nodpi/theme_preview.png Binary files differindex f385813a..ba98ce0b 100644 --- a/res/drawable-nodpi/theme_preview.png +++ b/res/drawable-nodpi/theme_preview.png diff --git a/res/drawable-xhdpi/ic_holo_light_navigation_drawer.png b/res/drawable-xhdpi/ic_holo_light_navigation_drawer.png Binary files differnew file mode 100644 index 00000000..b9529d04 --- /dev/null +++ b/res/drawable-xhdpi/ic_holo_light_navigation_drawer.png diff --git a/res/drawable-xxhdpi/ic_holo_light_navigation_drawer.png b/res/drawable-xxhdpi/ic_holo_light_navigation_drawer.png Binary files differnew file mode 100644 index 00000000..a4bf10dd --- /dev/null +++ b/res/drawable-xxhdpi/ic_holo_light_navigation_drawer.png diff --git a/res/layout/bookmarks.xml b/res/layout/bookmarks.xml deleted file mode 100644 index 5ae41a9c..00000000 --- a/res/layout/bookmarks.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The CyanogenMod Project - - 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. - --> - -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <com.cyanogenmod.filemanager.ui.widgets.FlingerListView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/bookmarks_listview" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - - <ProgressBar - android:id="@+id/bookmarks_waiting" - android:layout_width="@dimen/default_row_height" - android:layout_height="@dimen/default_row_height" - android:layout_centerInParent="true" - android:indeterminate="true" - android:indeterminateOnly="true" - android:visibility="gone" /> - -</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/bookmarks_item.xml b/res/layout/bookmarks_item.xml index fc8e4be5..2070494a 100644 --- a/res/layout/bookmarks_item.xml +++ b/res/layout/bookmarks_item.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The CyanogenMod Project +<!-- + Copyright (C) 2012 The CyanogenMod Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -12,58 +13,53 @@ 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. - --> +--> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="@dimen/default_row_height" - android:background="@drawable/holo_list_selector_deselected" > +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="48dp" + android:background="@drawable/holo_list_selector_deselected" + android:orientation="horizontal" + android:focusable="true" + android:clickable="true" > - <ImageView - android:id="@+id/bookmarks_item_icon" - android:layout_width="@dimen/default_row_height" - android:layout_height="match_parent" - android:contentDescription="@null" - android:gravity="center_horizontal|center_vertical" - android:paddingLeft="@dimen/extra_margin" - android:src="@null" /> + <ImageView + android:id="@+id/bookmarks_item_icon" + android:layout_width="48dp" + android:layout_height="match_parent" + android:layout_marginRight="2dp" + android:contentDescription="@null" + android:padding="8dp" + android:src="@null" /> - <com.cyanogenmod.filemanager.ui.widgets.NonFocusableButtonItem - android:id="@+id/bookmarks_item_action" - android:layout_width="@dimen/default_buttom_width" - android:layout_height="match_parent" - android:layout_alignParentRight="true" - android:contentDescription="@null" - android:gravity="center_horizontal|center_vertical" - android:src="@null" /> + <LinearLayout + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:gravity="center" + android:orientation="vertical" > - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_toLeftOf="@id/bookmarks_item_action" - android:layout_toRightOf="@id/bookmarks_item_icon" > + <TextView + android:id="@+id/bookmarks_item_name" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:singleLine="true" + android:textAppearance="@style/primary_text_appearance" /> - <TextView - android:id="@+id/bookmarks_item_name" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentTop="true" - android:layout_marginLeft="@dimen/default_margin" - android:layout_marginTop="@dimen/default_margin" - android:singleLine="true" - android:textAppearance="@style/primary_text_appearance" /> + <TextView + android:id="@+id/bookmarks_item_path" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:singleLine="true" + android:textAppearance="@style/secondary_text_appearance" /> + </LinearLayout> - <TextView - android:id="@+id/bookmarks_item_path" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" - android:layout_marginBottom="@dimen/default_margin" - android:layout_marginLeft="@dimen/default_margin" - android:singleLine="true" - android:textAppearance="@style/secondary_text_appearance" /> - </RelativeLayout> + <com.cyanogenmod.filemanager.ui.widgets.NonFocusableButtonItem + android:id="@+id/bookmarks_item_action" + android:layout_width="@dimen/default_buttom_width" + android:layout_height="match_parent" + android:contentDescription="@null" + android:gravity="center_horizontal|center_vertical" + android:src="@null" /> -</RelativeLayout>
\ No newline at end of file +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/history.xml b/res/layout/history.xml deleted file mode 100644 index 45a2993b..00000000 --- a/res/layout/history.xml +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The CyanogenMod Project - - 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. - --> - -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <TextView - android:id="@+id/history_empty_msg" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_alignParentTop="true" - android:layout_alignParentBottom="true" - android:layout_margin="@dimen/extra_margin" - android:gravity="center_horizontal|center_vertical" - android:text="@string/msgs_history_empty" - android:textAppearance="@style/primary_text_appearance_nohighlight" - android:textSize="@dimen/title_text_size" - android:visibility="gone" /> - - <ListView - android:id="@+id/history_listview" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_alignParentTop="true" /> - - <View - android:id="@+id/history_status" - android:layout_width="match_parent" - android:layout_height="1dp" - android:layout_alignParentBottom="true" - android:visibility="invisible"/> - - <ProgressBar - android:id="@+id/history_waiting" - android:layout_width="@dimen/default_row_height" - android:layout_height="@dimen/default_row_height" - android:layout_centerInParent="true" - android:indeterminate="true" - android:indeterminateOnly="true" - android:visibility="gone" /> - -</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/history_item.xml b/res/layout/history_item.xml index 2ef5fe97..ad987140 100644 --- a/res/layout/history_item.xml +++ b/res/layout/history_item.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The CyanogenMod Project +<!-- + Copyright (C) 2012 The CyanogenMod Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -12,62 +13,56 @@ 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. - --> +--> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="@dimen/default_row_height" - android:background="@drawable/holo_list_selector_deselected" > +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="48dp" + android:background="@drawable/holo_list_selector_deselected" + android:clickable="true" + android:focusable="true" + android:orientation="horizontal" > - <ImageView - android:id="@+id/history_item_icon" - android:layout_width="@dimen/default_row_height" - android:layout_height="match_parent" - android:contentDescription="@null" - android:gravity="center_horizontal|center_vertical" - android:paddingLeft="@dimen/extra_margin" - android:src="@null" /> + <ImageView + android:id="@+id/history_item_icon" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_marginRight="2dp" + android:contentDescription="@null" + android:padding="8dp" + android:src="@null" /> - <TextView - android:id="@+id/history_item_position" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_centerVertical="true" - android:layout_marginLeft="@dimen/default_margin" - android:layout_marginTop="@dimen/default_margin" - android:paddingRight="@dimen/extra_margin" - android:singleLine="true" - android:textAppearance="@style/primary_text_appearance" - android:textStyle="normal" /> + <LinearLayout + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:gravity="center" + android:orientation="vertical" > - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_toLeftOf="@id/history_item_position" - android:layout_toRightOf="@id/history_item_icon" > + <TextView + android:id="@+id/history_item_name" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:singleLine="true" + android:textAppearance="@style/primary_text_appearance" /> - <TextView - android:id="@+id/history_item_name" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentTop="true" - android:layout_marginLeft="@dimen/default_margin" - android:layout_marginTop="@dimen/default_margin" - android:singleLine="true" - android:textAppearance="@style/primary_text_appearance" /> + <TextView + android:id="@+id/history_item_directory" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:singleLine="true" + android:textAppearance="@style/secondary_text_appearance" /> + </LinearLayout> <TextView - android:id="@+id/history_item_directory" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" - android:layout_marginBottom="@dimen/default_margin" - android:layout_marginLeft="@dimen/default_margin" - android:singleLine="true" - android:textAppearance="@style/secondary_text_appearance" /> - </RelativeLayout> + android:id="@+id/history_item_position" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginLeft="@dimen/default_margin" + android:paddingRight="@dimen/extra_margin" + android:singleLine="true" + android:textAppearance="@style/primary_text_appearance" + android:textStyle="normal" /> -</RelativeLayout>
\ No newline at end of file +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/navigation.xml b/res/layout/navigation.xml index 68df9c4f..051f35d6 100644 --- a/res/layout/navigation.xml +++ b/res/layout/navigation.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The CyanogenMod Project +<!-- + Copyright (C) 2012 The CyanogenMod Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -12,33 +13,42 @@ 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. - --> - -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:filemanager="http://schemas.android.com/apk/res/com.cyanogenmod.filemanager" - android:id="@+id/navigation_layout" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <!-- Navigation View --> - <com.cyanogenmod.filemanager.ui.widgets.NavigationView - android:id="@+id/navigation_view" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - filemanager:navigation="browsable" /> +--> - <!-- SelectionBar --> - <com.cyanogenmod.filemanager.ui.widgets.SelectionView - android:id="@+id/navigation_selectionbar" +<com.cyanogenmod.filemanager.ui.widgets.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:filemanager="http://schemas.android.com/apk/res/com.cyanogenmod.filemanager" + android:id="@+id/drawer_layout" android:layout_width="match_parent" - android:layout_height="@dimen/small_row_height" - android:background="@drawable/bg_holo_selectionbar" - android:visibility="invisible" /> - - <!-- StatusBar --> - <include layout="@layout/navigation_view_statusbar" /> - -</LinearLayout> + android:layout_height="match_parent" > + + <!-- The main content view --> + <LinearLayout + android:id="@+id/navigation_layout" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" > + + <!-- Navigation View --> + <com.cyanogenmod.filemanager.ui.widgets.NavigationView + android:id="@+id/navigation_view" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + filemanager:navigation="browsable" /> + + <!-- SelectionBar --> + <com.cyanogenmod.filemanager.ui.widgets.SelectionView + android:id="@+id/navigation_selectionbar" + android:layout_width="match_parent" + android:layout_height="@dimen/small_row_height" + android:background="@drawable/bg_holo_selectionbar" + android:visibility="invisible" /> + + <!-- StatusBar --> + <include layout="@layout/navigation_view_statusbar" /> + </LinearLayout> + + <!-- The navigation drawer --> + <include layout="@layout/navigation_drawer" /> + +</com.cyanogenmod.filemanager.ui.widgets.DrawerLayout>
\ No newline at end of file diff --git a/res/layout/navigation_drawer.xml b/res/layout/navigation_drawer.xml new file mode 100644 index 00000000..9398ede5 --- /dev/null +++ b/res/layout/navigation_drawer.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8"?> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/drawer" + android:layout_width="240dp" + android:layout_height="match_parent" + android:layout_gravity="start" + android:background="@android:color/background_light" > + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" > + + <TextView + android:id="@+id/bookmarks_header" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/bookmarks" + style="@style/drawer_header" /> + + <ProgressBar + android:id="@+id/bookmarks_loading" + android:layout_width="@dimen/default_row_height" + android:layout_height="@dimen/default_row_height" + android:indeterminate="true" + android:indeterminateOnly="true" + android:visibility="gone" /> + + <LinearLayout + android:id="@+id/bookmarks_list" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/extra_margin" + android:orientation="vertical" > + + </LinearLayout> + + <TextView + android:id="@+id/history_header" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/history" + style="@style/drawer_header" /> + + <TextView + android:id="@+id/history_empty" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/msgs_history_empty" + android:paddingLeft="@dimen/extra_margin" + style="@style/secondary_text_appearance" /> + + <LinearLayout + android:id="@+id/history_list" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/extra_margin" + android:orientation="vertical" > + </LinearLayout> + </LinearLayout> + +</ScrollView>
\ No newline at end of file diff --git a/res/layout/navigation_view_statusbar.xml b/res/layout/navigation_view_statusbar.xml index 3474265c..47ba2ac9 100644 --- a/res/layout/navigation_view_statusbar.xml +++ b/res/layout/navigation_view_statusbar.xml @@ -60,26 +60,6 @@ android:src="@drawable/ic_holo_light_search" android:visibility="invisible" /> - <com.cyanogenmod.filemanager.ui.widgets.ButtonItem - android:id="@+id/ab_bookmarks" - android:layout_width="@dimen/default_buttom_width" - android:layout_height="match_parent" - android:layout_toLeftOf="@id/ab_search" - android:contentDescription="@string/actionbar_button_bookmarks_cd" - android:onClick="onActionBarItemClick" - android:src="@drawable/ic_holo_light_bookmarks" - android:visibility="invisible" /> - - <com.cyanogenmod.filemanager.ui.widgets.ButtonItem - android:id="@+id/ab_history" - android:layout_width="@dimen/default_buttom_width" - android:layout_height="match_parent" - android:layout_toLeftOf="@id/ab_bookmarks" - android:contentDescription="@string/actionbar_button_history_cd" - android:onClick="onActionBarItemClick" - android:src="@drawable/ic_holo_light_history" - android:visibility="invisible" /> - </RelativeLayout> </RelativeLayout> diff --git a/res/menu/drawer.xml b/res/menu/drawer.xml new file mode 100644 index 00000000..7a5ef1d5 --- /dev/null +++ b/res/menu/drawer.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ** Copyright (C) 2012 The CyanogenMod Project + ** + ** 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. +--> +<menu xmlns:android="http://schemas.android.com/apk/res/android" > + + <!-- + set android:visible="false" for every item as it should + not be visible until the drawer gets opened + --> + + <!-- TODO: add functionality to set bookmark in NavigationActivity.java + <item + android:id="@+id/mnu_actions_add_to_bookmarks_current_folder" + android:showAsAction="never" + android:title="@string/actions_menu_add_to_bookmarks" + android:visible="false"/>--> + <item + android:id="@+id/mnu_clear_history" + android:showAsAction="never" + android:title="@string/menu_clear_history" + android:visible="false"/> + <item + android:id="@+id/mnu_settings" + android:showAsAction="never" + android:title="@string/menu_settings" + android:visible="false"/> + +</menu>
\ No newline at end of file diff --git a/res/menu/navigation.xml b/res/menu/navigation.xml index 9aef8541..5111c94f 100644 --- a/res/menu/navigation.xml +++ b/res/menu/navigation.xml @@ -18,14 +18,6 @@ <!-- Actions --> <item - android:id="@+id/mnu_history" - android:showAsAction="ifRoom" - android:title="@string/menu_history"/> - <item - android:id="@+id/mnu_bookmarks" - android:showAsAction="ifRoom" - android:title="@string/menu_bookmarks"/> - <item android:id="@+id/mnu_search" android:showAsAction="ifRoom" android:title="@string/menu_search"/> diff --git a/res/raw/changelog b/res/raw/changelog index c64271e6..447938cc 100644 --- a/res/raw/changelog +++ b/res/raw/changelog @@ -1,6 +1,10 @@ CyanogenMod File Manager ======================== +Version 1.0.2 +------------- +* move bookmarks and history into a navigation drawer (by Florian Edelmann) + Version 1.0.1 ------------- * NFC support diff --git a/res/values/strings.xml b/res/values/strings.xml index 54bcb787..77fea1ef 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -722,6 +722,10 @@ <!-- Themes - Default theme author --> <string name="themes_author">CyanogenMod</string> + <!-- Navigation drawer --> + <string name="drawer_open">Open navigation drawer</string> + <string name="drawer_close">Close navigation drawer</string> + <!-- ColorPickerDialog --> <!-- The text of the alpha slider control --> <string name="color_picker_alpha_slider_text">Alpha</string> diff --git a/res/values/styles.xml b/res/values/styles.xml index b6cd4a32..81b80a6a 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -15,16 +15,14 @@ limitations under the License. --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:android="http://schemas.android.com/apk/res/android"> + <!-- Base themes --> <style name="FileManager.Theme.Holo.Light" parent="@android:style/Theme.Holo.Light"> <item name="android:windowBackground">@color/default_background</item> <item name="android:actionBarStyle">@style/FileManager.Widget.ActionBar.White</item> - <item name="android:homeAsUpIndicator">@drawable/ic_ab_back_holo_light</item> - </style> - <style name="FileManager.Theme.Holo" parent="@android:style/Theme.Holo"> - <item name="android:homeAsUpIndicator">@drawable/ic_ab_back_holo_light</item> </style> + <style name="FileManager.Theme.Holo" parent="@android:style/Theme.Holo"></style> <!-- A theme with overlay --> <style name="FileManager.Theme.Holo.Light.Overlay" parent="@style/FileManager.Theme.Holo.Light"> @@ -113,7 +111,7 @@ <item name="android:minWidth">@dimen/breadcrumb_item_min_size</item> </style> - <!-- Breadcrumb ActionBar buttom --> + <!-- Breadcrumb ActionBar buttom --> <style name="breadcrumb_actionbar_buttom"> <item name="android:paddingLeft">@dimen/extra_margin</item> <item name="android:paddingRight">@dimen/default_margin</item> @@ -140,4 +138,14 @@ <item name="android:layout_marginRight">@dimen/default_margin</item> <item name="android:background">@color/divider_color</item> </style> -</resources> + + <!-- Navigation drawer --> + <style name="drawer_header"> + <item name="android:padding">@dimen/default_margin</item> + <item name="android:textAllCaps">true</item> + <item name="android:textSize">@dimen/primary_text_size</item> + <item name="android:textColor">@color/black_transparent</item> + <item name="android:textStyle">bold</item> + </style> + +</resources>
\ No newline at end of file diff --git a/res/values/theme.xml b/res/values/theme.xml index f6f4006d..d5128c91 100644 --- a/res/values/theme.xml +++ b/res/values/theme.xml @@ -83,6 +83,12 @@ <!-- The highlight color for terms found in the search result --> <color name="search_highlight_color">@color/search_highlight</color> + <!-- The background color of the navigation drawer --> + <color name="drawer_color">#ffffffff</color> + + <!-- The drawer icon --> + <drawable name="drawer_icon">@drawable/ic_holo_light_navigation_drawer</drawable> + <!-- The breadcrumb divider drawable --> <drawable name="breadcrumb_divider_drawable">@drawable/ic_holo_light_breadcrumb_divider</drawable> |
