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

Commit c3891aa3 authored by Matt Pietal's avatar Matt Pietal Committed by Android (Google) Code Review
Browse files

Merge "Flag cleanup - removing code" into main

parents f0f68f46 88ab546a

packages/SystemUI/aconfig/systemui.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -1748,14 +1748,6 @@ flag { 
    bug: "390204943"

}



flag {

    name: "lockscreen_font"

    namespace: "systemui"

    description: "Read-only flag for lockscreen font"

    bug: "393610165"

    is_fixed_read_only: true

}



flag {

    name: "move_transition_animation_layer"

    namespace: "systemui"

packages/SystemUI/res-keyguard/values/styles.xml

+2 −9
Original line number Diff line number Diff line
@@ -137,12 +137,7 @@ 
        <item name="android:gravity">start</item>

        <item name="android:ellipsize">end</item>

        <item name="android:maxLines">2</item>

        <item name="android:fontFamily" android:featureFlag="!com.android.systemui.lockscreen_font">

          @*android:string/config_headlineFontFamily

        </item>

        <item name="android:fontFamily" android:featureFlag="com.android.systemui.lockscreen_font">

          variable-title-small

        </item>

        <item name="android:fontFamily">variable-title-small</item>

        <item name="android:fontFamily"></item>

        <item name="android:shadowColor">@color/keyguard_shadow_color</item>

        <item name="android:shadowRadius">?attr/shadowRadius</item>
@@ -198,9 +193,7 @@ 
    </style>



    <style name="Bouncer.UserSwitcher.Spinner.Item">

      <item name="android:fontFamily" android:featureFlag="com.android.systemui.lockscreen_font">

        variable-title-medium

      </item>

      <item name="android:fontFamily">variable-title-medium</item>

      <item name="android:textSize">@dimen/bouncer_user_switcher_item_text_size</item>

    </style>

packages/SystemUI/res/layout/user_switcher_fullscreen.xml

+0 −30
Original line number Diff line number Diff line
@@ -64,20 +64,6 @@ 


    <TextView

        android:id="@+id/cancel"

        android:featureFlag="!com.android.systemui.lockscreen_font"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:gravity="center"

        android:minHeight="48dp"

        android:paddingHorizontal="@dimen/user_switcher_fullscreen_button_padding"

        android:textSize="@dimen/user_switcher_fullscreen_button_text_size"

        android:textColor="?androidprv:attr/colorAccentPrimary"

        android:text="@string/cancel" />



    <TextView

        android:id="@+id/cancel"

        android:featureFlag="com.android.systemui.lockscreen_font"

        android:fontFamily="variable-title-small"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"
@@ -96,22 +82,6 @@ 


    <TextView

        android:id="@+id/add"

        android:featureFlag="!com.android.systemui.lockscreen_font"

        android:background="@drawable/user_switcher_fullscreen_button_bg"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:gravity="center"

        android:paddingHorizontal="@dimen/user_switcher_fullscreen_button_padding"

        android:text="@string/add"

        android:textColor="?androidprv:attr/colorAccentPrimary"

        android:textSize="@dimen/user_switcher_fullscreen_button_text_size"

        android:visibility="gone"

        android:minHeight="48dp" />



    <TextView

        android:id="@+id/add"

        android:featureFlag="com.android.systemui.lockscreen_font"

        android:fontFamily="variable-title-small"

        android:background="@drawable/user_switcher_fullscreen_button_bg"

        android:layout_width="wrap_content"

packages/SystemUI/res/layout/user_switcher_fullscreen_popup_item.xml

+0 −10
Original line number Diff line number Diff line
@@ -39,16 +39,6 @@ 


    <TextView

        android:id="@+id/text"

        android:featureFlag="!com.android.systemui.lockscreen_font"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textColor="@color/user_switcher_fullscreen_popup_item_tint"

        android:textSize="14sp"

        android:layout_gravity="start" />



    <TextView

        android:id="@+id/text"

        android:featureFlag="com.android.systemui.lockscreen_font"

        android:fontFamily="variable-title-small"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"