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

Commit b83f5bf3 authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "Fix touch feedback and areas for status bar date & time actions" into cm-11.0

parents 150bf578 7884fdb9

packages/SystemUI/res/layout/status_bar_expanded_header.xml

+8 −10
Original line number Diff line number Diff line
@@ -30,32 +30,30 @@ 
        android:id="@+id/datetime"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:paddingStart="8dp"

        android:paddingEnd="8dp"

        android:background="@drawable/ic_notify_button_bg"

        android:enabled="false"

        >

        <com.android.systemui.statusbar.policy.Clock

            android:id="@+id/clock"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginEnd="8dp"

            android:layout_height="match_parent"

            android:paddingStart="8dp"

            android:paddingEnd="4dp"

            android:singleLine="true"

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

            android:background="@drawable/ic_notify_button_bg"

            android:layout_centerVertical="true"

            android:gravity="center_vertical"

            android:clickable="true"

            />



        <com.android.systemui.statusbar.policy.DateView android:id="@+id/date"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_height="match_parent"

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

            android:layout_toEndOf="@id/clock"

            android:background="@drawable/ic_notify_button_bg"

            android:paddingTop="8dp"

            android:paddingBottom="8dp"

            android:layout_centerVertical="true"

            android:gravity="center_vertical"

            android:paddingStart="4dp"

            android:paddingEnd="8dp"

            />

    </RelativeLayout>

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

+0 −11
Original line number Diff line number Diff line
@@ -622,10 +622,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 
        mHasFlipSettings = res.getBoolean(R.bool.config_hasFlipSettingsPanel);



        mDateTimeView = mNotificationPanelHeader.findViewById(R.id.datetime);

        if (mDateTimeView != null) {

            mDateTimeView.setOnClickListener(mClockClickListener);

            mDateTimeView.setEnabled(true);

        }



        mSettingsButton = (ImageView) mStatusBarWindow.findViewById(R.id.settings_button);

        if (mSettingsButton != null) {
@@ -2780,13 +2776,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 
        }

    };



    private View.OnClickListener mClockClickListener = new View.OnClickListener() {

        public void onClick(View v) {

            startActivityDismissingKeyguard(

                    new Intent(Intent.ACTION_QUICK_CLOCK), true); // have fun, everyone

        }

    };



    private View.OnClickListener mNotificationButtonListener = new View.OnClickListener() {

        public void onClick(View v) {

            animateExpandNotificationsPanel();