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

Commit 5b4d5fda authored by Aga Wronska's avatar Aga Wronska Committed by android-build-merger
Browse files

Merge "Revert "Revert "Make status bar translucent. Make drawer appera below... 

Merge "Revert "Revert "Make status bar translucent. Make drawer appera below status bar."" with a fix for cts tests." into nyc-dev am: b85ec6d0
am: 75a85cb4

* commit '75a85cb4':
  Revert "Revert "Make status bar translucent. Make drawer appera below status bar."" with a fix for cts tests.
parents 110514e8 75a85cb4

packages/DocumentsUI/res/layout/dialog_file_name.xml

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:fitsSystemWindows="true"

    android:padding="?android:attr/listPreferredItemPaddingEnd">



    <EditText

packages/DocumentsUI/res/layout/fragment_save.xml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
    android:orientation="horizontal"

    android:baselineAligned="false"

    android:gravity="center_vertical"

    android:fitsSystemWindows="true"

    android:minHeight="?android:attr/listPreferredItemHeightSmall">



    <FrameLayout

packages/DocumentsUI/res/values/styles.xml

+3 −1
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ 
        <item name="android:windowActionBar">false</item>

        <item name="android:windowActionModeOverlay">true</item>

        <item name="android:windowNoTitle">true</item>

        <item name="android:windowTranslucentStatus">true</item>

        <item name="android:fitsSystemWindows">false</item>



        <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>

    </style>

packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ public abstract class BaseActivity extends Activity 
        mSearchManager = new SearchViewManager(this, icicle);



        DocumentsToolbar toolbar = (DocumentsToolbar) findViewById(R.id.toolbar);

        Display.adjustToolbar(toolbar, this);

        setActionBar(toolbar);

        mNavigator = new NavigationView(

                mDrawer,

packages/DocumentsUI/src/com/android/documentsui/Display.java

+36 −5
Original line number Diff line number Diff line
@@ -20,13 +20,15 @@ import android.app.Activity; 
import android.content.Context;

import android.graphics.Point;

import android.util.TypedValue;

import android.view.WindowManager;

import android.widget.Toolbar;



/*

 * Convenience class for getting display related attributes

 */

public final class Display {

    /*

     * Returns the screen width in pixels.

     * Returns the screen width in raw pixels.

     */

    public static float screenWidth(Activity activity) {

        Point size = new Point();
@@ -42,15 +44,44 @@ public final class Display { 
    }



    /*

     * Returns action bar height in pixels.

     * Returns action bar height in raw pixels.

     */

    public static float actionBarHeight(Context context) {

        int actionBarHeight = 0;

        int height = 0;

        TypedValue tv = new TypedValue();

        if (context.getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true)) {

            actionBarHeight = TypedValue.complexToDimensionPixelSize(tv.data,

            height = TypedValue.complexToDimensionPixelSize(tv.data,

                    context.getResources().getDisplayMetrics());

        }

        return actionBarHeight;

        return height;

    }



    /*

     * Returns status bar height in raw pixels.

     */

    private static int statusBarHeight(Context context) {

        int height = 0;

        int resourceId = context.getResources().getIdentifier("status_bar_height", "dimen",

                "android");

        if (resourceId > 0) {

            height = context.getResources().getDimensionPixelSize(resourceId);

        }

        return height;

    }



    /*

     * Adjusts toolbar for the layout with translucent status bar. Increases the

     * height of the toolbar and adds padding at the top to accommodate status bar visible above

     * toolbar.

     */

    public static void adjustToolbar(Toolbar toolbar, Activity activity) {

        if ((activity.getWindow().getAttributes().flags

                & WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS) != 0) {

            int statusBarHeight = Display.statusBarHeight(activity);

            toolbar.getLayoutParams().height = (int) (Display.actionBarHeight(activity)

                    + statusBarHeight);

            toolbar.setPadding(toolbar.getPaddingLeft(), statusBarHeight, toolbar.getPaddingRight(),

                    toolbar.getPaddingBottom());

        }

    }

}