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

Commit 965b40cb authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-20.0' into v1-t

parents 9bd773f4 6ea6d1a7

packages/SystemUI/res/layout-land/volume_dialog.xml

+12 −0
Original line number Diff line number Diff line
@@ -133,6 +133,18 @@ 
                        android:padding="10dp"

                        android:rotation="90" />

                </FrameLayout>

                <FrameLayout

                    android:id="@+id/rounded_border_bottom"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:background="@drawable/volume_background_bottom"

                    android:paddingLeft="@dimen/volume_dialog_ringer_rows_padding"

                    android:paddingRight="@dimen/volume_dialog_ringer_rows_padding">

                    <View

                        android:layout_width="0dp"

                        android:layout_height="32dp"

                        android:background="@drawable/ripple_drawable_20dp"/>

                </FrameLayout>

            </LinearLayout>



        </LinearLayout>

packages/SystemUI/res/layout/volume_dialog.xml

+12 −0
Original line number Diff line number Diff line
@@ -132,6 +132,18 @@ 
                        android:padding="10dp"

                        android:rotation="90" />

                </FrameLayout>

                <FrameLayout

                    android:id="@+id/rounded_border_bottom"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:background="@drawable/volume_background_bottom"

                    android:paddingLeft="@dimen/volume_dialog_ringer_rows_padding"

                    android:paddingRight="@dimen/volume_dialog_ringer_rows_padding">

                    <View

                        android:layout_width="0dp"

                        android:layout_height="32dp"

                        android:background="@drawable/ripple_drawable_20dp"/>

                </FrameLayout>

            </LinearLayout>



        </LinearLayout>

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

+9 −0
Original line number Diff line number Diff line
@@ -300,6 +300,8 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable, 
    // Variable to track the default row with which the panel is initially shown

    private VolumeRow mDefaultRow = null;



    private FrameLayout mRoundedBorderBottom;



    // Volume panel expand state

    private boolean mExpanded;
@@ -650,6 +652,8 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable, 
        mSettingsView = mDialog.findViewById(R.id.settings_container);

        mSettingsIcon = mDialog.findViewById(R.id.settings);



        mRoundedBorderBottom = mDialog.findViewById(R.id.rounded_border_bottom);



        mExpandRowsView = mDialog.findViewById(R.id.expandable_indicator_container);

        mExpandRows = mDialog.findViewById(R.id.expandable_indicator);
@@ -1270,6 +1274,11 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable, 
    }



    private void initSettingsH(int lockTaskModeState) {

        if (mRoundedBorderBottom != null) {

            mRoundedBorderBottom.setVisibility(!mDeviceProvisionedController.isCurrentUserSetup() ||

                    mActivityManager.getLockTaskModeState() != LOCK_TASK_MODE_NONE

                    ? VISIBLE : GONE);

        }

        if (mSettingsView != null) {

            mSettingsView.setVisibility(

                    mDeviceProvisionedController.isCurrentUserSetup() &&