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

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

Merge changes If96c0146,I0d68ad60 into oc-dev 

* changes:
  Improved accessibility behavior of the notification shelf
  Fixed a bug where the indeterminate progressbar janky
parents 31fcda57 aca84c0b

core/java/android/app/Notification.java

+0 −1
Original line number Diff line number Diff line
@@ -3667,7 +3667,6 @@ public class Notification implements Parcelable 
            contentView.setTextViewText(R.id.text, null);

            contentView.setViewVisibility(R.id.text_line_1, View.GONE);

            contentView.setTextViewText(R.id.text_line_1, null);

            contentView.setViewVisibility(R.id.progress, View.GONE);

        }



        /**

packages/SystemUI/res/layout/status_bar_notification_shelf.xml

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="@dimen/notification_shelf_height"

    android:contentDescription="@string/notification_shelf_content_description"

    android:focusable="true"

    android:clickable="true"

    >

packages/SystemUI/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ 
    <string name="accessibility_notifications_button">Notifications.</string>



    <!-- Content description of overflow icon container of the notifications for accessibility (not shown on the screen)[CHAR LIMIT=NONE] -->

    <string name="notification_shelf_content_description">Notification overflow container</string>

    <string name="accessibility_overflow_action">See all notifications</string>



    <!-- Content description of the button for removing a notification in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_remove_notification">Clear notification.</string>

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java

+15 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.os.SystemProperties; 
import android.util.AttributeSet;

import android.view.View;

import android.view.ViewGroup;

import android.view.accessibility.AccessibilityNodeInfo;



import com.android.systemui.Interpolators;

import com.android.systemui.R;
@@ -577,7 +578,7 @@ public class NotificationShelf extends ActivatableNotificationView implements 
        setClickable(mInteractive);

        setFocusable(mInteractive);

        setImportantForAccessibility(mInteractive ? View.IMPORTANT_FOR_ACCESSIBILITY_YES

                : View.IMPORTANT_FOR_ACCESSIBILITY_NO);

                : View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);

    }



    @Override
@@ -603,6 +604,19 @@ public class NotificationShelf extends ActivatableNotificationView implements 
        return false;  // Shelf only uses alpha for transitions where the difference can't be seen.

    }



    @Override

    public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {

        super.onInitializeAccessibilityNodeInfo(info);

        if (mInteractive) {

            info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_EXPAND);

            AccessibilityNodeInfo.AccessibilityAction unlock

                    = new AccessibilityNodeInfo.AccessibilityAction(

                    AccessibilityNodeInfo.ACTION_CLICK,

                    getContext().getString(R.string.accessibility_overflow_action));

            info.addAction(unlock);

        }

    }



    @Override

    public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft,

            int oldTop, int oldRight, int oldBottom) {