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

Commit 07537696 authored by Joshua Mokut's avatar Joshua Mokut
Browse files

Fixed Brightness dialog UI dimensions 

Brightness slider dimensions no longer takes the full width of the screen without any paddings. Added horizontal and vertical margins. Brightness slider will now take half width when in landscape mode and full width with paddings when in potrait.

Test: Trigger brightness dialog using keyboard shortcut, check that when in landscape mode the brightness dialog is on the left top corner of the screen and when in potrait mode its in the top center and takes full width except for the margins.
Fixes: 268460896
Change-Id: Iffb940c8af628c8184a82aaba7f931e01be3fa22
parent 3418ac93

packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessDialog.java

+33 −5
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; 
import static android.view.WindowManagerPolicyConstants.EXTRA_FROM_BRIGHTNESS_KEY;



import android.app.Activity;

import android.content.res.Configuration;

import android.graphics.Rect;

import android.os.Bundle;

import android.view.Gravity;
@@ -35,8 +36,8 @@ import android.widget.FrameLayout; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.systemui.res.R;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.res.R;

import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper;

import com.android.systemui.util.concurrency.DelayableExecutor;
@@ -74,21 +75,26 @@ public class BrightnessDialog extends Activity { 
    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        setWindowAttributes();

        setContentView(R.layout.brightness_mirror_container);

        setBrightnessDialogViewAttributes();

    }



    private void setWindowAttributes() {

        final Window window = getWindow();



        window.setGravity(Gravity.TOP | Gravity.CENTER_HORIZONTAL);

        window.setGravity(Gravity.TOP | Gravity.LEFT);

        window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);

        window.requestFeature(Window.FEATURE_NO_TITLE);



        // Calling this creates the decor View, so setLayout takes proper effect

        // (see Dialog#onWindowAttributesChanged)

        window.getDecorView();

        window.setLayout(

                WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT);

        window.setLayout(WRAP_CONTENT, WRAP_CONTENT);

        getTheme().applyStyle(R.style.Theme_SystemUI_QuickSettings, false);

    }



        setContentView(R.layout.brightness_mirror_container);

    void setBrightnessDialogViewAttributes() {

        FrameLayout frame = findViewById(R.id.brightness_mirror_container);

        // The brightness mirror container is INVISIBLE by default.

        frame.setVisibility(View.VISIBLE);
@@ -97,6 +103,14 @@ public class BrightnessDialog extends Activity { 
                getResources().getDimensionPixelSize(R.dimen.notification_side_paddings);

        lp.leftMargin = horizontalMargin;

        lp.rightMargin = horizontalMargin;



        int verticalMargin =

                getResources().getDimensionPixelSize(

                        R.dimen.notification_guts_option_vertical_padding);



        lp.topMargin = verticalMargin;

        lp.bottomMargin = verticalMargin;



        frame.setLayoutParams(lp);

        Rect bounds = new Rect();

        frame.addOnLayoutChangeListener(
@@ -113,6 +127,20 @@ public class BrightnessDialog extends Activity { 
        frame.addView(controller.getRootView(), MATCH_PARENT, WRAP_CONTENT);



        mBrightnessController = mBrightnessControllerFactory.create(controller);



        Configuration configuration = getResources().getConfiguration();

        int orientation = configuration.orientation;



        if (orientation == Configuration.ORIENTATION_LANDSCAPE) {

            lp.width = getWindowManager().getDefaultDisplay().getWidth() / 2

                    - lp.leftMargin * 2;

        } else if (orientation == Configuration.ORIENTATION_PORTRAIT) {

            lp.width = getWindowManager().getDefaultDisplay().getWidth()

                    - lp.leftMargin * 2;

        }



        frame.setLayoutParams(lp);



    }



    @Override