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

Commit 9bda9ead authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix QS footer on small screens" into oc-dev

parents 4d73fd57 6ca9732e
Loading
Loading
Loading
Loading
+66 −65
Original line number Diff line number Diff line
@@ -37,10 +37,10 @@
        android:layout_width="wrap_content"
        android:layout_height="match_parent" />

    <Space
        android:layout_width="0dp"
        android:layout_height="0dp"
        android:layout_weight="1" />
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:gravity="end">

        <com.android.systemui.statusbar.phone.MultiUserSwitch
            android:id="@+id/multi_user_switch"
@@ -110,5 +110,6 @@
            android:background="?android:attr/selectableItemBackgroundBorderless"
            android:contentDescription="@string/accessibility_quick_settings_expand"
            android:padding="14dp" />
    </LinearLayout>

</com.android.systemui.qs.QSFooter>
+2 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.support.annotation.VisibleForTesting;
import android.util.AttributeSet;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -63,7 +64,7 @@ import com.android.systemui.statusbar.policy.UserInfoController;
import com.android.systemui.statusbar.policy.UserInfoController.OnUserInfoChangedListener;
import com.android.systemui.tuner.TunerService;

public class QSFooter extends LinearLayout implements
public class QSFooter extends FrameLayout implements
        NextAlarmChangeCallback, OnClickListener, OnUserInfoChangedListener, EmergencyListener,
        SignalCallback {
    private static final float EXPAND_INDICATOR_THRESHOLD = .93f;