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

Merge "Fix settings icon row consuming the click when tapping the notification" into nyc-dev

Browse Source 
am: 6e64423c19

* commit '6e64423c196ff0160facb3e83b1481248ce38cb1':
  Fix settings icon row consuming the click when tapping the notification
This commit is contained in:
Mady Mellor
2016-03-01 02:32:10 +00:00
committed by android-build-merger
parent 0d76bd7078 6e64423c19
commit b67005b6a4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/layout/notification_settings_icon_row.xml
View File

@@ -19,6 +19,7 @@
xmlns:systemui="http://schemas.android.com/apk/res-auto" xmlns:systemui="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="invisible"
> >
<com.android.systemui.statusbar.AlphaOptimizedImageView <com.android.systemui.statusbar.AlphaOptimizedImageView
@@ -31,7 +32,6 @@
android:paddingBottom="@dimen/notification_gear_padding" android:paddingBottom="@dimen/notification_gear_padding"
android:src="@drawable/ic_settings" android:src="@drawable/ic_settings"
android:tint="@color/notification_gear_color" android:tint="@color/notification_gear_color"
android:visibility="invisible"
android:alpha="0" android:alpha="0"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
/> />

4
packages/SystemUI/src/com/android/systemui/statusbar/NotificationSettingsIconRow.java
View File

@@ -97,12 +97,12 @@ public class NotificationSettingsIconRow extends FrameLayout implements View.OnC
private void setGearAlpha(float alpha) { private void setGearAlpha(float alpha) {
if (alpha == 0) { if (alpha == 0) {
mSettingsFadedIn = false; // Can fade in again once it's gone. mSettingsFadedIn = false; // Can fade in again once it's gone.
mGearIcon.setVisibility(View.INVISIBLE); setVisibility(View.INVISIBLE);
} else { } else {
if (alpha == 1) { if (alpha == 1) {
mSettingsFadedIn = true; mSettingsFadedIn = true;
} }
mGearIcon.setVisibility(View.VISIBLE); setVisibility(View.VISIBLE);
} }
mGearIcon.setAlpha(alpha); mGearIcon.setAlpha(alpha);
} }