Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d27bc29 authored by Jose Lima's avatar Jose Lima Committed by Android Git Automerger
Browse files

am 56e0d6b8: Merge "Allow configuration of Toast gravity settings" into klp-dev 

* commit '56e0d6b8':
  Allow configuration of Toast gravity settings
parents 8810a0c3 56e0d6b8

core/java/android/widget/Toast.java

+4 −2
Original line number Diff line number Diff line
@@ -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,7 +384,7 @@ 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;

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -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>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -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" />