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

Commit 62e22440 authored by Matt Pietal's avatar Matt Pietal
Browse files

Legacy smartspace alignment fixes 

If newer smartspace content is not enabled, the title alignment and
burn-in placement of legacy smartspace is incorrect. Align to the
start.

Fixes: 210090859
Test: manual, play music and disable new smartspace

Change-Id: Id038290100b9bc254d6060cb163b0fe772518018
parent 6a63b739

packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml

+0 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ 
              android:id="@+id/title"

              android:layout_width="match_parent"

              android:layout_height="wrap_content"

              android:paddingStart="44dp"

              android:paddingEnd="44dp"

              android:visibility="gone"

              android:textColor="?attr/wallpaperTextColor"

              android:theme="@style/TextAppearance.Keyguard"

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

+2 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ 
    <style name="TextAppearance.Keyguard">

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

        <item name="android:lineHeight">@dimen/widget_title_line_height</item>

        <item name="android:gravity">center</item>

        <item name="android:gravity">start</item>

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

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

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
@@ -131,6 +131,7 @@ 
    <style name="TextAppearance.Keyguard.BottomArea">

        <item name="android:textSize">14sp</item>

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

        <item name="android:gravity">center</item>

        <item name="android:textColor">?attr/wallpaperTextColor</item>

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

        <item name="android:shadowRadius">?attr/shadowRadius</item>

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java

+0 −2
Original line number Diff line number Diff line
@@ -354,8 +354,6 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
                mKeyguardUnlockAnimationController.updateLockscreenSmartSpacePosition();

            }

        }



        mKeyguardSliceViewController.updatePosition(x, props, animate);

    }



    /** Sets an alpha value on every child view except for the smartspace. */

packages/SystemUI/src/com/android/keyguard/KeyguardSliceViewController.java

+0 −10
Original line number Diff line number Diff line
@@ -43,9 +43,6 @@ import com.android.systemui.Dumpable; 
import com.android.systemui.dump.DumpManager;

import com.android.systemui.keyguard.KeyguardSliceProvider;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.statusbar.notification.AnimatableProperty;

import com.android.systemui.statusbar.notification.PropertyAnimator;

import com.android.systemui.statusbar.notification.stack.AnimationProperties;

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

import com.android.systemui.tuner.TunerService;

import com.android.systemui.util.ViewController;
@@ -203,13 +200,6 @@ public class KeyguardSliceViewController extends ViewController<KeyguardSliceVie 
        Trace.endSection();

    }



    /**

     * Update position of the view, with optional animation

     */

    void updatePosition(int x, AnimationProperties props, boolean animate) {

        PropertyAnimator.setProperty(mView, AnimatableProperty.TRANSLATION_X, x, props, animate);

    }



    void showSlice(Slice slice) {

        Trace.beginSection("KeyguardSliceViewController#showSlice");

        if (slice == null) {