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

Commit ec9af01d authored by Jason Monk's avatar Jason Monk
Browse files

Fix default QS tiles 

Also add emergency only to header.

Bug: 26124044
Change-Id: If39fa2cca052b711516bd5a92a91f541ad00e62a
parent bda01cc5

packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml

+50 −33
Original line number Diff line number Diff line
@@ -78,15 +78,35 @@ 
            android:tint="@android:color/white" />

    </LinearLayout>



    <TextView

        android:id="@+id/header_emergency_calls_only"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:layout_alignParentStart="true"

        android:layout_alignParentTop="true"

        android:paddingStart="16dp"

        android:paddingEnd="16dp"

        android:paddingTop="8dp"

        android:visibility="gone"

        android:textAppearance="@style/TextAppearance.StatusBar.Expanded.EmergencyCallsOnly"

        android:text="@*android:string/emergency_calls_only"

        android:singleLine="true"

        android:gravity="center_vertical" />



    <LinearLayout

        android:id="@+id/date_time_group"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentStart="true"

        android:layout_alignParentTop="true"

        android:orientation="horizontal">



        <include layout="@layout/split_clock_view"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="16dp"

            android:layout_marginTop="2dp"

        android:layout_alignParentStart="true"

        android:layout_alignParentTop="true"

        android:id="@+id/clock"

        />

            android:id="@+id/clock" />



        <com.android.systemui.statusbar.policy.DateView

            android:id="@+id/date"
@@ -94,22 +114,19 @@ 
            android:layout_height="wrap_content"

            android:layout_marginStart="6dp"

            android:layout_marginTop="8dp"

        android:layout_toEndOf="@id/clock"

            android:layout_alignParentTop="true"

            android:drawableStart="@drawable/header_dot"

            android:drawablePadding="6dp"

            android:singleLine="true"

            android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Clock"

            android:textSize="@dimen/qs_time_collapsed_size"

        systemui:datePattern="@string/abbrev_wday_month_day_no_year_alarm"

        />

            systemui:datePattern="@string/abbrev_wday_month_day_no_year_alarm" />



        <com.android.systemui.statusbar.AlphaOptimizedButton

            android:id="@+id/alarm_status"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_alignParentTop="true"

        android:layout_toEndOf="@id/date"

            android:drawablePadding="6dp"

            android:drawableStart="@drawable/ic_access_alarms_small"

            android:textColor="#64ffffff"
@@ -117,8 +134,8 @@ 
            android:minHeight="36dp"

            android:paddingStart="6dp"

            android:background="?android:attr/selectableItemBackground"

        android:visibility="gone"

        />

            android:visibility="gone" />

    </LinearLayout>



    <com.android.systemui.qs.QuickQSPanel

        android:id="@+id/quick_qs_panel"

packages/SystemUI/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ 


    <!-- The default tiles to display in QuickSettings -->

    <string name="quick_settings_tiles_default" translatable="false">

        wifi,bt,inversion,dnd,cell,airplane,rotation,flashlight,location,cast,hotspot

        wifi,bt,flashlight,dnd,cell,battery,rotation,airplane,location,cast

    </string>



    <!-- The tiles to display in QuickSettings -->

packages/SystemUI/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ 
    <dimen name="qs_quick_actions_padding">25dp</dimen>

    <dimen name="qs_quick_tile_size">48dp</dimen>

    <dimen name="qs_quick_tile_padding">12dp</dimen>

    <dimen name="qs_date_anim_translation">44.5dp</dimen>

    <dimen name="qs_page_indicator_size">12dp</dimen>

    <dimen name="qs_tile_icon_size">24dp</dimen>

    <dimen name="qs_tile_text_size">12sp</dimen>

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java

+22 −2
Original line number Diff line number Diff line
@@ -62,11 +62,15 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements 


    private boolean mDetailTransitioning;

    private ViewGroup mExpandedGroup;

    private ViewGroup mDateTimeGroup;

    private View mEmergencyOnly;

    private TextView mQsDetailHeaderTitle;

    private boolean mListening;

    private AlarmManager.AlarmClockInfo mNextAlarm;



    private QuickQSPanel mHeaderQsPanel;

    private boolean mShowEmergencyCallsOnly;

    private float mDateTimeTranslation;



    public QuickStatusBarHeader(Context context, AttributeSet attrs) {

        super(context, attrs);
@@ -76,6 +80,10 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements 
    protected void onFinishInflate() {

        super.onFinishInflate();



        mEmergencyOnly = findViewById(R.id.header_emergency_calls_only);

        mDateTimeTranslation = mContext.getResources().getDimension(

                R.dimen.qs_date_anim_translation);

        mDateTimeGroup = (ViewGroup) findViewById(R.id.date_time_group);

        mExpandedGroup = (ViewGroup) findViewById(R.id.expanded_group);



        mHeaderQsPanel = (QuickQSPanel) findViewById(R.id.quick_qs_panel);
@@ -141,6 +149,9 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements 
        mExpandedGroup.setVisibility(headerExpansionFraction > 0 ? View.VISIBLE : View.INVISIBLE);

        mHeaderQsPanel.setAlpha(1 - headerExpansionFraction);

        mHeaderQsPanel.setVisibility(headerExpansionFraction < 1 ? View.VISIBLE : View.INVISIBLE);



        mDateTimeGroup.setTranslationY(headerExpansionFraction * mDateTimeTranslation);

        mEmergencyOnly.setAlpha(headerExpansionFraction);

    }



    public void setListening(boolean listening) {
@@ -160,6 +171,8 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements 
    private void updateVisibilities() {

        mAlarmStatus.setVisibility(mAlarmShowing ? View.VISIBLE : View.GONE);

        mQsDetailHeader.setVisibility(mExpanded && mShowingDetail ? View.VISIBLE : View.INVISIBLE);

        mEmergencyOnly.setVisibility(mExpanded && mShowEmergencyCallsOnly

                ? View.VISIBLE : View.INVISIBLE);

        mSettingsContainer.findViewById(R.id.tuner_icon).setVisibility(

                TunerService.isTunerEnabled(mContext) ? View.VISIBLE : View.INVISIBLE);

    }
@@ -256,8 +269,14 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements 
    }



    @Override

    public void setEmergencyCallsOnly(boolean emergencyOnly) {

        // Don't care.

    public void setEmergencyCallsOnly(boolean show) {

        boolean changed = show != mShowEmergencyCallsOnly;

        if (changed) {

            mShowEmergencyCallsOnly = show;

            if (mExpanded) {

                updateEverything();

            }

        }

    }



    private final QSPanel.Callback mQsPanelCallback = new QSPanel.Callback() {
@@ -314,6 +333,7 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements 


        private void handleShowingDetail(final QSTile.DetailAdapter detail) {

            final boolean showingDetail = detail != null;

            transition(mDateTimeGroup, !showingDetail);

            transition(mExpandedGroup, !showingDetail);

            if (mAlarmShowing) {

                transition(mAlarmStatus, !showingDetail);