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

Commit 4ea2a49f authored by Evan Laird's avatar Evan Laird
Browse files

Bring back the date! 

QS shows the date once more. This time it'll be on the top, just next to
the time. Tapping on the date will bring the user to alarms for now
because there is no public AlarmClock action that will bring the user to
the main clock tab in DeskClock

Test: visual
Change-Id: I4d0eb049e98d4bea0f59ef0a7b7da17907c52b67
Fixes: 71357632
parent 39254d46

packages/SystemUI/res/layout/quick_status_bar_header_system_icons.xml

+11 −0
Original line number Diff line number Diff line
@@ -41,6 +41,17 @@ 
        systemui:showDark="false"

    />



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

        android:id="@+id/date"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:padding="4dp"

        android:singleLine="true"

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

        android:textSize="@dimen/qs_time_collapsed_size"

        android:gravity="center_vertical"

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



    <android.widget.Space

        android:id="@+id/space"

        android:layout_width="0dp"

packages/SystemUI/res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ 
    <style name="TextAppearance.StatusBar.Expanded.Date">

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

        <item name="android:textStyle">normal</item>

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

        <item name="android:textColor">#ffffffff</item>

        <item name="android:fontFamily">sans-serif</item>

    </style>

packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java

+16 −1
Original line number Diff line number Diff line
@@ -18,10 +18,12 @@ import static android.app.StatusBarManager.DISABLE2_QUICK_SETTINGS; 
import static android.app.StatusBarManager.DISABLE_NONE;



import android.content.Context;

import android.content.Intent;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.graphics.Color;

import android.graphics.Rect;

import android.provider.AlarmClock;

import android.support.annotation.VisibleForTesting;

import android.util.AttributeSet;

import android.view.View;
@@ -41,7 +43,8 @@ import com.android.systemui.statusbar.SignalClusterView; 
import com.android.systemui.statusbar.policy.DarkIconDispatcher;

import com.android.systemui.statusbar.policy.DarkIconDispatcher.DarkReceiver;



public class QuickStatusBarHeader extends RelativeLayout implements CommandQueue.Callbacks {

public class QuickStatusBarHeader extends RelativeLayout

        implements CommandQueue.Callbacks, View.OnClickListener {



    private ActivityStarter mActivityStarter;
@@ -54,6 +57,8 @@ public class QuickStatusBarHeader extends RelativeLayout implements CommandQueue 
    protected QuickQSPanel mHeaderQsPanel;

    protected QSTileHost mHost;



    private View mDate;



    public QuickStatusBarHeader(Context context, AttributeSet attrs) {

        super(context, attrs);

    }
@@ -64,6 +69,8 @@ public class QuickStatusBarHeader extends RelativeLayout implements CommandQueue 
        Resources res = getResources();



        mHeaderQsPanel = findViewById(R.id.quick_qs_panel);

        mDate = findViewById(R.id.date);

        mDate.setOnClickListener(this);



        // RenderThread is doing more harm than good when touching the header (to expand quick

        // settings), so disable it for this view
@@ -145,6 +152,14 @@ public class QuickStatusBarHeader extends RelativeLayout implements CommandQueue 
        super.onDetachedFromWindow();

    }



    @Override

    public void onClick(View v) {

        if (v == mDate) {

            Dependency.get(ActivityStarter.class).postStartActivityDismissingKeyguard(new Intent(

                    AlarmClock.ACTION_SHOW_ALARMS), 0);

        }

    }



    public void setListening(boolean listening) {

        if (listening == mListening) {

            return;