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

Commit b57578e6 authored by narinder Rana's avatar narinder Rana
Browse files

undo and update system_icon_container

parent 22fff73d

packages/SystemUI/res/layout/keyguard_status_bar.xml

+20 −10
Original line number Diff line number Diff line
@@ -31,16 +31,16 @@ 
        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_alignParentEnd="true"

        android:gravity="center_vertical|end" >

        <FrameLayout android:id="@+id/system_icons_container"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:layout_marginStart="@dimen/system_icons_super_container_margin_start"

            android:gravity="center_vertical|end"

            android:paddingEnd="@dimen/system_icons_keyguard_padding_end" >

            <include layout="@layout/system_icons" />

        </FrameLayout>

        android:gravity="center_vertical|start" >

<!--        <FrameLayout android:id="@+id/system_icons_container"-->

<!--            android:layout_width="0dp"-->

<!--            android:layout_height="match_parent"-->

<!--            android:layout_weight="1"-->

<!--            android:layout_marginStart="@dimen/system_icons_super_container_margin_start"-->

<!--            android:gravity="center_vertical|end"-->

<!--            android:paddingEnd="@dimen/system_icons_keyguard_padding_end" >-->

<!--            <include layout="@layout/system_icons" />-->

<!--        </FrameLayout>-->



        <com.android.systemui.statusbar.phone.MultiUserSwitch android:id="@+id/multi_user_switch"

            android:layout_width="@dimen/multi_user_switch_width_keyguard"
@@ -53,6 +53,16 @@ 
                android:layout_gravity="center"

                android:scaleType="centerInside"/>

        </com.android.systemui.statusbar.phone.MultiUserSwitch>



        <FrameLayout android:id="@+id/system_icons_container"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:layout_marginStart="@dimen/system_icons_super_container_margin_start"

            android:gravity="center_vertical|end"

            android:paddingEnd="@dimen/system_icons_keyguard_padding_end" >

            <include layout="@layout/system_icons" />

        </FrameLayout>

    </LinearLayout>



    <Space

packages/SystemUI/res/layout/status_bar.xml

+12 −25
Original line number Diff line number Diff line
@@ -91,19 +91,6 @@ 
                    android:orientation="horizontal"

                    android:clipChildren="false"/>



                <com.android.keyguard.AlphaOptimizedLinearLayout



                    android:id="@+id/system_icon_area"

                    android:layout_width="0dp"

                    android:layout_height="match_parent"

                    android:layout_weight="1"

                    android:orientation="horizontal"

                    android:gravity="center_vertical|start"

                    >



                    <include layout="@layout/system_icons" />

                </com.android.keyguard.AlphaOptimizedLinearLayout>



            </LinearLayout>

        </FrameLayout>
@@ -131,18 +118,18 @@ 


        </com.android.systemui.statusbar.LineageStatusBarItemHolder>



<!--        <com.android.keyguard.AlphaOptimizedLinearLayout -->

<!--            -->

<!--            android:id="@+id/system_icon_area"-->

<!--            android:layout_width="0dp"-->

<!--            android:layout_height="match_parent"-->

<!--            android:layout_weight="1"-->

<!--            android:orientation="horizontal"-->

<!--            android:gravity="center_vertical|end"-->

<!--            >-->



<!--            <include layout="@layout/system_icons" />-->

<!--        </com.android.keyguard.AlphaOptimizedLinearLayout>-->

        <com.android.keyguard.AlphaOptimizedLinearLayout



            android:id="@+id/system_icon_area"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:orientation="horizontal"

            android:gravity="center_vertical|end"

            >



            <include layout="@layout/system_icons" />

        </com.android.keyguard.AlphaOptimizedLinearLayout>

    </LinearLayout>



    <com.android.keyguard.AlphaOptimizedLinearLayout