diff options
4 files changed, 2 insertions, 15 deletions
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml index 1863d1112947..7c5dbc247428 100644 --- a/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml +++ b/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml @@ -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" diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml index b0bdc72f986a..b8770e831d45 100644 --- a/packages/SystemUI/res-keyguard/values/styles.xml +++ b/packages/SystemUI/res-keyguard/values/styles.xml @@ -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> diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java index 324fae161afc..86b12d3c0c3d 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java @@ -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. */ diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceViewController.java index d05cc4ea8101..2af9244480e7 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceViewController.java @@ -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) { |