From 619170f331ece3f469abc8adc539598c20f72866 Mon Sep 17 00:00:00 2001
From: ZVNexus <zvnexus@outlook.com>
Date: Fri, 24 Jan 2020 17:00:41 -0500
Subject: [PATCH] SystemUI: Make tri-state SystemUI dialog dimensions
 conditional

Adjust this based on the left/right config.

@SKULSHADY: Fix dimens for right dialog

Change-Id: I282f1a318bc9bf1cfd20c6b8c41be5f79fab4534
Signed-off-by: Anushek Prasal <anushekprasal@gmail.com>
---
 .../left_dialog_tri_state_down_bg.xml         | 30 +++++++++++++++++++
 ...bg.xml => left_dialog_tri_state_up_bg.xml} | 11 +++----
 .../right_dialog_tri_state_down_bg.xml        | 30 +++++++++++++++++++
 ...g.xml => right_dialog_tri_state_up_bg.xml} | 11 +++----
 packages/SystemUI/res/values/havoc_dimens.xml | 25 +++++++++++-----
 .../tristate/TriStateUiControllerImpl.java    |  6 ++--
 6 files changed, 92 insertions(+), 21 deletions(-)
 create mode 100644 packages/SystemUI/res/drawable/left_dialog_tri_state_down_bg.xml
 rename packages/SystemUI/res/drawable/{dialog_tri_state_down_bg.xml => left_dialog_tri_state_up_bg.xml} (67%)
 create mode 100644 packages/SystemUI/res/drawable/right_dialog_tri_state_down_bg.xml
 rename packages/SystemUI/res/drawable/{dialog_tri_state_up_bg.xml => right_dialog_tri_state_up_bg.xml} (67%)

diff --git a/packages/SystemUI/res/drawable/left_dialog_tri_state_down_bg.xml b/packages/SystemUI/res/drawable/left_dialog_tri_state_down_bg.xml
new file mode 100644
index 000000000000..bdc35775bb5c
--- /dev/null
+++ b/packages/SystemUI/res/drawable/left_dialog_tri_state_down_bg.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2019 CypherOS
+    Copyright (C) 2020 Paranoid Android
+
+    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.
+-->
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="#ff1d1d1d" />
+            <corners
+                android:topLeftRadius="@dimen/left_tri_state_down_top_left_radius"
+                android:topRightRadius="@dimen/left_tri_state_down_top_right_radius"
+                android:bottomLeftRadius="@dimen/left_tri_state_down_bottom_left_radius"
+                android:bottomRightRadius="@dimen/left_tri_state_down_bottom_right_radius" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/packages/SystemUI/res/drawable/dialog_tri_state_down_bg.xml b/packages/SystemUI/res/drawable/left_dialog_tri_state_up_bg.xml
similarity index 67%
rename from packages/SystemUI/res/drawable/dialog_tri_state_down_bg.xml
rename to packages/SystemUI/res/drawable/left_dialog_tri_state_up_bg.xml
index 7dddc9d0e930..64dd96cb5493 100644
--- a/packages/SystemUI/res/drawable/dialog_tri_state_down_bg.xml
+++ b/packages/SystemUI/res/drawable/left_dialog_tri_state_up_bg.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2019 CypherOS
+    Copyright (C) 2020 Paranoid Android
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,10 +21,10 @@
         <shape>
             <solid android:color="#ff1d1d1d" />
             <corners
-                android:topLeftRadius="@dimen/tri_state_down_top_left_radius"
-                android:topRightRadius="@dimen/tri_state_down_top_right_radius"
-                android:bottomLeftRadius="@dimen/tri_state_down_bottom_left_radius"
-                android:bottomRightRadius="@dimen/tri_state_down_bottom_right_radius" />
+                android:topLeftRadius="@dimen/left_tri_state_up_top_left_radius"
+                android:topRightRadius="@dimen/left_tri_state_up_top_right_radius"
+                android:bottomLeftRadius="@dimen/left_tri_state_up_bottom_left_radius"
+                android:bottomRightRadius="@dimen/left_tri_state_up_bottom_right_radius" />
         </shape>
     </item>
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/packages/SystemUI/res/drawable/right_dialog_tri_state_down_bg.xml b/packages/SystemUI/res/drawable/right_dialog_tri_state_down_bg.xml
new file mode 100644
index 000000000000..884974da2e5c
--- /dev/null
+++ b/packages/SystemUI/res/drawable/right_dialog_tri_state_down_bg.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2019 CypherOS
+    Copyright (C) 2020 Paranoid Android
+
+    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.
+-->
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="#ff1d1d1d" />
+            <corners
+                android:topLeftRadius="@dimen/right_tri_state_down_top_left_radius"
+                android:topRightRadius="@dimen/right_tri_state_down_top_right_radius"
+                android:bottomLeftRadius="@dimen/right_tri_state_down_bottom_left_radius"
+                android:bottomRightRadius="@dimen/right_tri_state_down_bottom_right_radius" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/packages/SystemUI/res/drawable/dialog_tri_state_up_bg.xml b/packages/SystemUI/res/drawable/right_dialog_tri_state_up_bg.xml
similarity index 67%
rename from packages/SystemUI/res/drawable/dialog_tri_state_up_bg.xml
rename to packages/SystemUI/res/drawable/right_dialog_tri_state_up_bg.xml
index 69757a77ee86..1c26d6f6ad69 100644
--- a/packages/SystemUI/res/drawable/dialog_tri_state_up_bg.xml
+++ b/packages/SystemUI/res/drawable/right_dialog_tri_state_up_bg.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright (C) 2019 CypherOS
+    Copyright (C) 2020 Paranoid Android
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -20,10 +21,10 @@
         <shape>
             <solid android:color="#ff1d1d1d" />
             <corners
-                android:topLeftRadius="@dimen/tri_state_up_top_left_radius"
-                android:topRightRadius="@dimen/tri_state_up_top_right_radius"
-                android:bottomLeftRadius="@dimen/tri_state_up_bottom_left_radius"
-                android:bottomRightRadius="@dimen/tri_state_up_bottom_right_radius" />
+                android:topLeftRadius="@dimen/right_tri_state_up_top_left_radius"
+                android:topRightRadius="@dimen/right_tri_state_up_top_right_radius"
+                android:bottomLeftRadius="@dimen/right_tri_state_up_bottom_left_radius"
+                android:bottomRightRadius="@dimen/right_tri_state_up_bottom_right_radius" />
         </shape>
     </item>
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/packages/SystemUI/res/values/havoc_dimens.xml b/packages/SystemUI/res/values/havoc_dimens.xml
index 035df2a8e93e..728bb91caad3 100644
--- a/packages/SystemUI/res/values/havoc_dimens.xml
+++ b/packages/SystemUI/res/values/havoc_dimens.xml
@@ -41,17 +41,26 @@
     <dimen name="tri_state_dialog_elevation">4.0dip</dimen>
     <dimen name="tri_state_dialog_icon_size">24.0dip</dimen>
     <dimen name="tri_state_dialog_padding">8.0dip</dimen>
-    <dimen name="tri_state_down_bottom_left_radius">24.0dip</dimen>
-    <dimen name="tri_state_down_bottom_right_radius">24.0dip</dimen>
-    <dimen name="tri_state_down_top_left_radius">24.0dip</dimen>
-    <dimen name="tri_state_down_top_right_radius">0.0dip</dimen>
     <dimen name="tri_state_mid_bottom_left_radius">24.0dip</dimen>
     <dimen name="tri_state_mid_bottom_right_radius">24.0dip</dimen>
     <dimen name="tri_state_mid_top_left_radius">24.0dip</dimen>
     <dimen name="tri_state_mid_top_right_radius">24.0dip</dimen>
-    <dimen name="tri_state_up_bottom_left_radius">24.0dip</dimen>
-    <dimen name="tri_state_up_bottom_right_radius">0.0dip</dimen>
-    <dimen name="tri_state_up_top_left_radius">24.0dip</dimen>
-    <dimen name="tri_state_up_top_right_radius">24.0dip</dimen>
+
+    <dimen name="left_tri_state_down_bottom_left_radius">24.0dip</dimen>
+    <dimen name="left_tri_state_down_bottom_right_radius">24.0dip</dimen>
+    <dimen name="left_tri_state_down_top_left_radius">0.0dip</dimen>
+    <dimen name="left_tri_state_down_top_right_radius">24.0dip</dimen>
+    <dimen name="left_tri_state_up_bottom_left_radius">0.0dip</dimen>
+    <dimen name="left_tri_state_up_bottom_right_radius">24.0dip</dimen>
+    <dimen name="left_tri_state_up_top_left_radius">24.0dip</dimen>
+    <dimen name="left_tri_state_up_top_right_radius">24.0dip</dimen>
+    <dimen name="right_tri_state_down_bottom_left_radius">24.0dip</dimen>
+    <dimen name="right_tri_state_down_bottom_right_radius">24.0dip</dimen>
+    <dimen name="right_tri_state_down_top_left_radius">24.0dip</dimen>
+    <dimen name="right_tri_state_down_top_right_radius">0.0dip</dimen>
+    <dimen name="right_tri_state_up_bottom_left_radius">24.0dip</dimen>
+    <dimen name="right_tri_state_up_bottom_right_radius">0.0dip</dimen>
+    <dimen name="right_tri_state_up_top_left_radius">24.0dip</dimen>
+    <dimen name="right_tri_state_up_top_right_radius">24.0dip</dimen>
 
 </resources>
diff --git a/packages/SystemUI/src/com/android/systemui/tristate/TriStateUiControllerImpl.java b/packages/SystemUI/src/com/android/systemui/tristate/TriStateUiControllerImpl.java
index bac8fa39885e..514cbfbeec21 100644
--- a/packages/SystemUI/src/com/android/systemui/tristate/TriStateUiControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/tristate/TriStateUiControllerImpl.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2019 CypherOS
- * Copyright 2014-2019 Paranoid Android
+ * Copyright (C) 2014-2020 Paranoid Android
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -356,7 +356,7 @@ private void updateTriStateLayout() {
                             if (mTriStateMode != MODE_VIBRATE) {
                                 if (mTriStateMode == MODE_NORMAL) {
                                     positionY2 = res.getDimensionPixelSize(R.dimen.tri_state_down_dialog_position) + res.getDimensionPixelSize(com.android.internal.R.dimen.status_bar_height);
-                                    bg = R.drawable.dialog_tri_state_down_bg;
+                                    bg = isTsKeyRight ? R.drawable.right_dialog_tri_state_down_bg : R.drawable.left_dialog_tri_state_down_bg;
                                     break;
                                 }
                             }
@@ -365,7 +365,7 @@ private void updateTriStateLayout() {
                             break;
                         }
                         positionY2 = res.getDimensionPixelSize(R.dimen.tri_state_up_dialog_position) + res.getDimensionPixelSize(com.android.internal.R.dimen.status_bar_height);
-                        bg = R.drawable.dialog_tri_state_up_bg;
+                        bg = isTsKeyRight ? R.drawable.right_dialog_tri_state_up_bg : R.drawable.left_dialog_tri_state_up_bg;
                         break;
                 }
                 if (mTriStateMode != -1) {