diff options
| author | Harsh Shandilya <me@msfjarvis.dev> | 2020-10-09 17:21:18 +0530 |
|---|---|---|
| committer | Harsh Shandilya <me@msfjarvis.dev> | 2020-10-10 12:25:07 +0530 |
| commit | e139e65a6e4d7b87455e512d23fde0d9c8de6035 (patch) | |
| tree | c7cc817b3bae41a3a9cd90ca46fda9478e303abc | |
| parent | 419a49088537aa7311ae8e1d02775d8aa0715809 (diff) | |
res: merge unneeded override into base file
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
| -rw-r--r-- | app/src/main/res/values-v23/colors.xml | 8 | ||||
| -rw-r--r-- | app/src/main/res/values/colors.xml | 2 |
2 files changed, 1 insertions, 9 deletions
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> |