From e139e65a6e4d7b87455e512d23fde0d9c8de6035 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Fri, 9 Oct 2020 17:21:18 +0530
Subject: res: merge unneeded override into base file

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 app/src/main/res/values-v23/colors.xml | 8 --------
 app/src/main/res/values/colors.xml     | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 app/src/main/res/values-v23/colors.xml

(limited to 'app')

diff --git a/app/src/main/res/values-v23/colors.xml b/app/src/main/res/values-v23/colors.xml
deleted file mode 100644
index 7c3be280..00000000
--- a/app/src/main/res/values-v23/colors.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
-  ~ SPDX-License-Identifier: GPL-3.0-only
-  -->
-
-<resources>
-    <color name="navigation_bar_color">#000000</color>
-</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index bea2e960..b090c761 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -15,7 +15,7 @@
     <!-- Theme variables -->
     <color name="color_control_normal">@color/primary_text_color</color>
     <color name="list_multiselect_background">#668eacbb</color>
-    <color name="navigation_bar_color">@color/primary_color</color>
+    <color name="navigation_bar_color">#000000</color>
     <color name="status_bar_color">@color/primary_color</color>
     <color name="ripple_color">#aa003e5b</color>
     <color name="button_color">#44003e5b</color>
-- 
cgit v1.2.3