Commit 35677d78 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '4376-Q-Update_icon_colors' into 'v1-q'

4376-Q-Update_icon_colors

See merge request !48
parents 8862d7f4 9232faec
......@@ -5,6 +5,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@color/theme_accent"
android:fillColor="@color/theme_primary_text"
android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
</vector>
......@@ -6,7 +6,7 @@
<group android:translateX="24.363636"
android:translateY="24.363636">
<path
android:fillColor="@color/theme_accent"
android:fillColor="#FAFAFA"
android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14zM16,13h-3L13,8h-2v5L8,13l4,4 4,-4z"/>
</group>
</vector>
......
......@@ -6,6 +6,6 @@
android:viewportHeight="24">
<path
android:fillColor="@color/theme_accent"
android:fillColor="@color/theme_primary_text"
android:pathData="M17.65 6.35C16.2 4.9 14.21 4 12 4c-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99 8c3.73 0 6.84-2.55 7.73-6h-2.08c-.82 2.33-3.04 4-5.65 4-3.31 0-6-2.69-6-6s2.69-6 6-6c1.66 0 3.14.69 4.22 1.78L13 11h7V4l-2.35 2.35z" />
</vector>
......@@ -4,6 +4,6 @@
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="@color/theme_accent"
android:fillColor="@color/theme_primary_text"
android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z" />
</vector>
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@color/theme_primary_text"
android:pathData="M8,5v14l11,-7z"/>
</vector>
\ No newline at end of file
......@@ -5,6 +5,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/theme_accent"
android:fillColor="@color/theme_primary_text"
android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14zM16,13h-3L13,8h-2v5L8,13l4,4 4,-4z"/>
</vector>
......@@ -20,7 +20,7 @@
android:layout_height="match_parent"
android:theme="@style/AppTheme.AppBarOverlay"
app:collapsedTitleTextAppearance="@style/TextAppearanceInverted"
app:contentScrim="?attr/colorPrimary"
app:contentScrim="?attr/colorPrimaryDark"
app:expandedTitleTextAppearance="@style/TextAppearanceTransparent"
app:layout_scrollFlags="scroll|exitUntilCollapsed">
......@@ -80,6 +80,7 @@
android:id="@+id/no_new_updates_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/theme_background"
android:padding="46dp"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
......@@ -95,6 +96,7 @@
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/theme_background"
android:clipToPadding="false"
android:paddingBottom="5dp"
android:scrollbars="vertical"
......
......@@ -14,7 +14,7 @@
limitations under the License.
-->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/theme_background"/>
<background android:drawable="@color/ic_background"/>
<foreground android:drawable="@drawable/ic_foreground"/>
</adaptive-icon>
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_background">#333333</color>
<color name="theme_primary">@lineageos.platform:color/color_default_primary</color>
<color name="theme_primary_dark">@lineageos.platform:color/color_default_primary_dark</color>
<color name="theme_accent">@lineageos.platform:color/color_default_accent</color>
......
......@@ -40,7 +40,7 @@
<style name="customOverFlow">
<item name="android:src">@lineageos.platform:drawable/ic_menu</item>
<item name="tint">@color/theme_accent</item>
<item name="tint">@color/theme_primary_text</item>
<item name="android:paddingRight">10dp</item>
<item name="android:foreground">?android:attr/selectableItemBackground</item>
</style>
......
......@@ -299,7 +299,7 @@ public class UpdaterService extends Service {
mNotificationStyle.bigText(text);
mNotificationBuilder.setStyle(mNotificationStyle);
mNotificationBuilder.setSmallIcon(R.drawable.ic_pause);
mNotificationBuilder.addAction(android.R.drawable.ic_media_play,
mNotificationBuilder.addAction(R.drawable.ic_play,
getString(R.string.resume_button),
getResumePendingIntent(update.getDownloadId()));
mNotificationBuilder.setTicker(text);
......@@ -444,7 +444,7 @@ public class UpdaterService extends Service {
mNotificationStyle.bigText(text);
mNotificationBuilder.setStyle(mNotificationStyle);
mNotificationBuilder.setSmallIcon(R.drawable.ic_pause);
mNotificationBuilder.addAction(android.R.drawable.ic_media_play,
mNotificationBuilder.addAction(R.drawable.ic_play,
getString(R.string.resume_button),
getResumeInstallationPendingIntent());
mNotificationBuilder.setTicker(text);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment