Merge branch 'pie_1923' into 'v1-pie' (54553fee) · Commits · e / os / android_packages_apps_DocumentsUI

res/drawable/ic_doc_folder.xml

+3 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,9 @@ Copyright (C) 2015 The Android Open Source Project
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0">
		android:viewportHeight="24.0"
		android:tint="@color/color_default_blue1"
		>
		<path
		android:fillColor="#FF737373"
		android:pathData="M10 4H4c-1.1 0,-1.99.9,-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2,-.9 2,-2V8c0,-1.1,-.9,-2,-2,-2h-8l-2,-2z"/>

res/drawable/ic_doc_image.xml

+3 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,9 @@ Copyright (C) 2017 The Android Open Source Project
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0">
		android:viewportHeight="24.0"
		android:tint="@color/color_default_blue1"
		>
		<path
		android:fillColor="#FFDB4437"
		android:pathData="M21 19V5c0,-1.1,-.9,-2,-2,-2H5c-1.1 0,-2 .9,-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2,-.9 2,-2zM8.5 13.5l2.5 3.01L14.5 12l4.5 6H5l3.5,-4.5z"/>

res/drawable/ic_hamburger.xml

+1 −1

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
		android:src="@drawable/ic_hamburger_alpha"
		android:tint="?android:attr/colorControlNormal" />
		android:tint="@color/color_default_blue1" />

res/values/colors.xml

+13 −5

Original line number	Diff line number	Diff line
		@@ -24,14 +24,14 @@
		<color name="directory_background">#fff7f7f7</color>
		<color name="menu_search_background">@android:color/transparent</color>

		<color name="primary_dark">#ff254FAE</color>
		<color name="primary_dark">@color/color_default_foreground</color>
		<color name="primary">@color/tool_bar_color</color>
		<!--<color name="accent">@color/tool_bar_color</color>-->
		<color name="accent">@*android:color/accent_device_default</color>
		<color name="accent">@lineageos.platform:color/color_default_accent</color>
		<!-- <color name="colorAccent">@*android:color/accent_device_default</color>-->
		<color name="accent_dark">@*android:color/accent_device_default_dark</color>
		<color name="accent_dark">@lineageos.platform:color/color_default_accent</color>

		<color name="text_cursor">@*android:color/white</color>
		<color name="text_cursor">@color/accent</color>
		<color name="text_handle">#FF82B1FF</color> <!--Blue A100-->
		<color name="text_highlight">#FF82B1FF</color> <!--Blue A100-->

		@@ -50,7 +50,7 @@
		<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>
		<color name="tool_bar_color">#ff1A73E8</color>
		<color name="tool_bar_color">@color/color_default_foreground</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>
		@@ -83,4 +83,12 @@
		<color name="inspector_section_title">#ff939393</color>
		<color name="inspector_section_divider">#E0E0E0</color>
		<color name="inspector_title_background">#40000000</color>

		<color name="color_default_blue1">@lineageos.platform:color/color_default_blue1</color>
		<!--white-->
		<color name="color_default_foreground">@lineageos.platform:color/color_default_foreground</color>
		<!--black 80%-->
		<color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>


		</resources>

res/values/styles.xml

+14 −2

Original line number	Diff line number	Diff line
		@@ -17,16 +17,23 @@
		<resources xmlns:android="http://schemas.android.com/apk/res/android">

		<style name="ActionBarTheme" parent="@*android:style/ThemeOverlay.Material.Dark.ActionBar">
		<item name="android:colorControlNormal">@android:color/white</item>
		<item name="android:colorControlNormal">@color/color_default_primary_text</item>
		<item name="android:textSelectHandle">@drawable/text_select_handle_middle</item>
		<item name="android:textSelectHandleLeft">@drawable/text_select_handle_left</item>
		<item name="android:textSelectHandleRight">@drawable/text_select_handle_right</item>
		<item name="android:textCursorDrawable">@drawable/text_cursor</item>
		<item name="android:textColorHighlight">@color/text_highlight</item>
		<item name="android:textColorPrimary">@android:color/white</item>
		<item name="android:textColorPrimary">@color/color_default_primary_text</item>

		<item name="android:textColorSecondary">@color/color_default_primary_text</item>
		<item name="actionOverflowButtonStyle">@style/MyOverflowButtonStyle</item>
		</style>
		<style name="ActionBarPopupTheme" parent="@style/Theme.AppCompat.DayNight" />

		<style name="MyOverflowButtonStyle" parent="Widget.AppCompat.ActionButton.Overflow">
		<item name="android:tint">@color/color_default_primary_text</item>
		</style>

		<style name="DocumentsTheme" parent="@style/Theme.AppCompat.DayNight.DarkActionBar">
		<item name="actionBarWidgetTheme">@null</item>
		<item name="actionBarTheme">@style/ActionBarTheme</item>
		@@ -46,8 +53,13 @@
		<item name="android:windowNoTitle">true</item>

		<item name="android:windowSoftInputMode">stateUnspecified\|adjustUnspecified</item>
		<!--statusbar icons color-->
		<item name="android:windowLightStatusBar">true</item>

		</style>



		<style name="TrimmedHorizontalProgressBar" parent="android:Widget.Material.ProgressBar.Horizontal">
		<item name="android:indeterminateDrawable">@drawable/progress_indeterminate_horizontal_material_trimmed</item>
		<item name="android:minHeight">3dp</item>