From 08bef371fa2bd7839da8a65d8c2e788c647132ae Mon Sep 17 00:00:00 2001
From: Jose Lima <joselima@google.com>
Date: Thu, 8 Aug 2013 11:51:00 -0700
Subject: [PATCH] Allow configuration of Toast gravity settings

  The default gravity value for Gravity was set by the code in Toast.java,
making it impossible to fully customize Toasts systemwide by using overlays.
  Toast.java was changed to read this default value from a resource configuration
file, so we can then override it via an overlay.

Bug: 9799950
Change-Id: I26a914a9aa5e37d3ab0f4cf60b41de5ac14b4a87
---
 core/java/android/widget/Toast.java | 6 ++++--
 core/res/res/values/config.xml      | 3 +++
 core/res/res/values/symbols.xml     | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/java/android/widget/Toast.java b/core/java/android/widget/Toast.java
index aaa1adaa7e639..4b71e36db2a00 100644
--- a/core/java/android/widget/Toast.java
+++ b/core/java/android/widget/Toast.java
@@ -95,6 +95,8 @@ public class Toast {
         mTN = new TN();
         mTN.mY = context.getResources().getDimensionPixelSize(
                 com.android.internal.R.dimen.toast_y_offset);
+        mTN.mGravity = context.getResources().getInteger(
+                com.android.internal.R.integer.config_toastDefaultGravity);
     }
     
     /**
@@ -382,12 +384,12 @@ public class Toast {
         private final WindowManager.LayoutParams mParams = new WindowManager.LayoutParams();
         final Handler mHandler = new Handler();    
 
-        int mGravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM;
+        int mGravity;
         int mX, mY;
         float mHorizontalMargin;
         float mVerticalMargin;
 
-       
+
         View mView;
         View mNextView;
 
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 0908f36ffb654..4a472fc83626d 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1200,4 +1200,7 @@
          from an emulated display within the physical display. -->
     <bool name="config_forceDefaultOrientation">false</bool>
 
+    <!-- Default Gravity setting for the system Toast view. Equivalent to: Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM -->
+    <integer name="config_toastDefaultGravity">0x00000051</integer>
+
 </resources>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 04cdac9552dab..2e05663207345 100755
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -294,6 +294,7 @@
   <java-symbol type="integer" name="config_ntpRetry" />
   <java-symbol type="integer" name="config_ntpThreshold" />
   <java-symbol type="integer" name="config_ntpTimeout" />
+  <java-symbol type="integer" name="config_toastDefaultGravity" />
   <java-symbol type="integer" name="config_wifi_framework_scan_interval" />
   <java-symbol type="integer" name="config_wifi_supplicant_scan_interval" />
   <java-symbol type="integer" name="config_wifi_scan_interval_p2p_connected" />