Move all internal resource dependencies to respetive values/, and made
values-v24 directory for N devices.
Bug: 34889656
Change-Id: I746d80c48e2b110ee11fc3675502d3778462c1c0
diff --git a/res/color/item_eject_icon.xml b/res/color/item_eject_icon.xml
index ea545a3..2f04978 100644
--- a/res/color/item_eject_icon.xml
+++ b/res/color/item_eject_icon.xml
@@ -15,6 +15,8 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_enabled="false" android:alpha="@*android:dimen/disabled_alpha_material_light" android:color="@color/root_icon_color" />
+ <item android:state_enabled="false"
+ android:alpha="@dimen/root_icon_disabled_alpha"
+ android:color="@color/root_icon_color" />
<item android:color="@color/root_icon_color" />
</selector>
diff --git a/res/color/item_title.xml b/res/color/item_title.xml
index de28025..d1760d0 100644
--- a/res/color/item_title.xml
+++ b/res/color/item_title.xml
@@ -20,5 +20,5 @@
android:color="@color/item_doc_title" />
<item
android:state_enabled="false"
- android:color="@*android:color/secondary_text_default_material_light"/>
+ android:color="@color/item_doc_title_disabled"/>
</selector>
diff --git a/res/color/root_activated.xml b/res/color/root_activated.xml
deleted file mode 100644
index 36a016d..0000000
--- a/res/color/root_activated.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_activated="true" android:color="?android:attr/colorAccent" />
- <item android:color="@*android:color/secondary_text_material_light" />
-</selector>
diff --git a/res/drawable/list_divider.xml b/res/drawable/list_divider.xml
new file mode 100644
index 0000000..5768aff
--- /dev/null
+++ b/res/drawable/list_divider.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source 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.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:tint="?android:attr/colorForeground">
+ <solid android:color="#1f000000" />
+ <size
+ android:height="1dp"
+ android:width="1dp" />
+</shape>
\ No newline at end of file
diff --git a/res/layout/dialog_delete_confirmation.xml b/res/layout/dialog_delete_confirmation.xml
index a1c2910..cd4d537 100644
--- a/res/layout/dialog_delete_confirmation.xml
+++ b/res/layout/dialog_delete_confirmation.xml
@@ -22,5 +22,5 @@
android:paddingStart="24dp"
android:paddingEnd="24dp"
android:textAppearance="@android:style/TextAppearance.Material.Subhead"
- android:textColor="@*android:color/primary_text_default_material_light">
+ android:textColor="@color/dialog_title">
</TextView>
diff --git a/res/layout/drag_shadow_layout.xml b/res/layout/drag_shadow_layout.xml
index 0f06718..1917e25 100644
--- a/res/layout/drag_shadow_layout.xml
+++ b/res/layout/drag_shadow_layout.xml
@@ -20,7 +20,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="8dp"
- android:background="@*android:color/transparent">
+ android:background="@color/item_drag_shadow_container_background">
<LinearLayout
android:layout_width="match_parent"
diff --git a/res/values-v24/colors.xml b/res/values-v24/colors.xml
new file mode 100644
index 0000000..f6d6710
--- /dev/null
+++ b/res/values-v24/colors.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source 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.
+-->
+
+<resources>
+ <color name="item_doc_title_disabled">#8a000000</color>
+ <item name="root_icon_disabled_alpha" format="float" type="dimen">0.26</item>
+ <color name="dialog_title">#de000000</color>
+ <color name="accent_dark">#5E97F6</color>
+</resources>
diff --git a/res/values-v24/styles.xml b/res/values-v24/styles.xml
new file mode 100644
index 0000000..bee5fb7
--- /dev/null
+++ b/res/values-v24/styles.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source 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.
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+ <style name="DocumentsTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
+ <item name="actionBarWidgetTheme">@null</item>
+ <item name="actionBarTheme">@style/ActionBarTheme</item>
+ <item name="actionBarPopupTheme">@style/ActionBarPopupTheme</item>
+
+ <item name="android:windowBackground">@color/window_background</item>
+ <item name="android:colorPrimaryDark">@color/primary_dark</item>
+ <item name="android:colorPrimary">@color/primary</item>
+ <item name="android:colorAccent">@color/accent</item>
+ <item name="android:colorControlActivated">?android:attr/colorAccent</item>
+ <item name="android:queryBackground">@color/menu_search_background</item>
+
+ <item name="android:listDivider">@drawable/list_divider</item>
+
+ <item name="android:windowActionBar">false</item>
+ <item name="android:windowActionModeOverlay">true</item>
+ <item name="android:windowNoTitle">true</item>
+
+ <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
+ </style>
+</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 2f35429..7a21e50 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -24,21 +24,23 @@
<color name="menu_search_background">@android:color/transparent</color>
<color name="primary_dark">#ff254FAE</color>
- <color name="primary">#ff3367D6</color>
- <color name="accent">#ff3367D6</color>
+ <color name="primary">@*android:color/Blue_700</color>
+ <color name="accent">@*android:color/Blue_700</color>
<color name="accent_dark">@*android:color/accent_device_default_dark</color>
<color name="band_select_background">#88ffffff</color>
<color name="band_select_border">#44000000</color>
<color name="root_title_color">#ff5a5a5a</color>
- <color name="root_activated_color">#ff3367D6</color>
+ <color name="root_activated_color">@*android:color/Blue_700</color>
<color name="root_icon_color">#ff5a5a5a</color>
+ <item name="root_icon_disabled_alpha" format="float" type="dimen">@*android:dimen/disabled_alpha_material_light</item>
<color name="doc_icon_color">#ff5a5a5a</color>
<!-- TODO: Would be nice to move this to a color-set, but not sure how to support animation -->
<color name="item_doc_title">#ff333333</color>
+ <color name="item_doc_title_disabled">@*android:color/secondary_text_default_material_light</color>
<color name="item_doc_details">#ff333333</color>
<color name="item_doc_background">@*android:color/white</color>
<color name="item_doc_background_disabled">#fff4f4f4</color>
@@ -46,10 +48,13 @@
<color name="item_breadcrumb_background_hovered">#1affffff</color>
<color name="item_doc_droppable_background">#ffe8f0fb</color>
<color name="item_doc_not_droppable_background">#ffe0e0e0</color>
- <color name="item_grid_tint">#3367d6</color>
+ <color name="item_grid_tint">@*android:color/Blue_700</color>
<color name="item_drag_shadow_background">@*android:color/white</color>
+ <color name="item_drag_shadow_container_background">@*android:color/transparent</color>
<color name="shortcut_background">@*android:color/Blue_700</color>
+ <color name="dialog_title">@*android:color/primary_text_default_material_light</color>
+
</resources>