From 36975bb1f615968f7692b09d22b3304e5b07bf7b Mon Sep 17 00:00:00 2001
From: Evan Laird <evanlaird@google.com>
Date: Tue, 14 Jul 2020 16:02:00 -0400
Subject: [PATCH] Remove padding_start override from sunfish

Not needed on R+ due to a reworking of how rounded corner content
padding works, so we want the default padding

Test: manual
Bug: 160374368
Change-Id: I2c5a4056f4d1f20ed7d423d62c9142501fd2af24
---
 .../SystemUI/res/values-land/dimens.xml       |  4 ----
 .../SystemUI/res/values-ldrtl/dimens.xml      | 24 -------------------
 .../packages/SystemUI/res/values/dimens.xml   |  3 ---
 3 files changed, 31 deletions(-)
 delete mode 100644 sunfish/overlay/frameworks/base/packages/SystemUI/res/values-ldrtl/dimens.xml

diff --git a/sunfish/overlay/frameworks/base/packages/SystemUI/res/values-land/dimens.xml b/sunfish/overlay/frameworks/base/packages/SystemUI/res/values-land/dimens.xml
index b776e753..aba9ac2c 100644
--- a/sunfish/overlay/frameworks/base/packages/SystemUI/res/values-land/dimens.xml
+++ b/sunfish/overlay/frameworks/base/packages/SystemUI/res/values-land/dimens.xml
@@ -17,10 +17,6 @@
 -->
 
 <resources>
-    <!-- Landscape, just use the regular values -->
-    <dimen name="status_bar_padding_start">8dp</dimen>
-    <dimen name="status_bar_padding_end">8dp</dimen>
-
     <!-- the padding on the top of the statusbar (usually 0) -->
     <dimen name="status_bar_padding_top">0dp</dimen>
 </resources>
diff --git a/sunfish/overlay/frameworks/base/packages/SystemUI/res/values-ldrtl/dimens.xml b/sunfish/overlay/frameworks/base/packages/SystemUI/res/values-ldrtl/dimens.xml
deleted file mode 100644
index 3aaa5bf7..00000000
--- a/sunfish/overlay/frameworks/base/packages/SystemUI/res/values-ldrtl/dimens.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (c) 2020, 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>
-    <!-- For sunfigh, we really just want the regular behavior of padding_left, padding_right
-    but the status bar UI is built around _start _end, so just flip them in RTL -->
-    <dimen name="status_bar_padding_start">8dp</dimen>
-    <dimen name="status_bar_padding_end">0dp</dimen>
-</resources>
diff --git a/sunfish/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/sunfish/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 2e8225df..83a65bc3 100644
--- a/sunfish/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/sunfish/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -17,9 +17,6 @@
 -->
 
 <resources>
-    <!-- Don't need the left side padding due to being inset from the cutout -->
-    <dimen name="status_bar_padding_start">0dp</dimen>
-
     <dimen name="config_rounded_mask_size">146px</dimen>
     <dimen name="config_rounded_mask_size_top">146px</dimen>
     <dimen name="config_rounded_mask_size_bottom">146px</dimen>