Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes If96c0146,I0d68ad60 into oc-dev

Browse Source 
am: 5393a0e2d9

Change-Id: Ic70d9eb07b53ccda5fafb8c37177e130d4b279de
This commit is contained in:
Selim Cinek
2017-04-07 16:08:26 +00:00
committed by android-build-merger
parent 6fd0d2b37f 5393a0e2d9
commit e1fcf8edd6
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/app/Notification.java
View File

@@ -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);
}
/**

1
packages/SystemUI/res/layout/status_bar_notification_shelf.xml
View File

@@ -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"
>

2
packages/SystemUI/res/values/strings.xml
View File

@@ -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>

16
packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
View File

@@ -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) {