Merge "Remove redundant wifi-display notification." into lmp-dev
diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java
index ace5eab..bbb0b50 100644
--- a/graphics/java/android/graphics/drawable/VectorDrawable.java
+++ b/graphics/java/android/graphics/drawable/VectorDrawable.java
@@ -1456,12 +1456,12 @@
/* Setters and Getters, used by animator from AnimatedVectorDrawable. */
@SuppressWarnings("unused")
- int getStroke() {
+ int getStrokeColor() {
return mStrokeColor;
}
@SuppressWarnings("unused")
- void setStroke(int strokeColor) {
+ void setStrokeColor(int strokeColor) {
mStrokeColor = strokeColor;
}
@@ -1476,32 +1476,32 @@
}
@SuppressWarnings("unused")
- float getstrokeAlpha() {
+ float getStrokeAlpha() {
return mStrokeAlpha;
}
@SuppressWarnings("unused")
- void setstrokeAlpha(float strokeAlpha) {
+ void setStrokeAlpha(float strokeAlpha) {
mStrokeAlpha = strokeAlpha;
}
@SuppressWarnings("unused")
- int getFill() {
+ int getFillColor() {
return mFillColor;
}
@SuppressWarnings("unused")
- void setFill(int fillColor) {
+ void setFillColor(int fillColor) {
mFillColor = fillColor;
}
@SuppressWarnings("unused")
- float getfillAlpha() {
+ float getFillAlpha() {
return mFillAlpha;
}
@SuppressWarnings("unused")
- void setfillAlpha(float fillAlpha) {
+ void setFillAlpha(float fillAlpha) {
mFillAlpha = fillAlpha;
}
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index bddd691..1d629fd 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -48,6 +48,7 @@
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+ <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
index 67c7723..95c5020 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
@@ -317,7 +317,7 @@
}
mJustPeeked = false;
}
- if (-h >= mUnlockFalsingThreshold) {
+ if (-h >= getFalsingThreshold()) {
mTouchAboveFalsingThreshold = true;
}
if (!mJustPeeked && (!waitForTouchSlop || mTracking) && !isTrackingBlocked()) {
@@ -370,6 +370,11 @@
return !waitForTouchSlop || mTracking;
}
+ private int getFalsingThreshold() {
+ float factor = mStatusBar.isScreenOnComingFromTouch() ? 1.5f : 1.0f;
+ return (int) (mUnlockFalsingThreshold * factor);
+ }
+
protected abstract boolean hasConflictingGestures();
protected void onTrackingStopped(boolean expand) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index dd947f0..71fef65 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -262,6 +262,7 @@
private StatusBarWindowManager mStatusBarWindowManager;
private UnlockMethodCache mUnlockMethodCache;
private DozeServiceHost mDozeServiceHost;
+ private boolean mScreenOnComingFromTouch;
int mPixelFormat;
Object mQueueLock = new Object();
@@ -2118,10 +2119,14 @@
return mNotificationPanel.isQsExpanded();
}
+ public boolean isScreenOnComingFromTouch() {
+ return mScreenOnComingFromTouch;
+ }
+
public boolean isFalsingThresholdNeeded() {
boolean onKeyguard = getBarState() == StatusBarState.KEYGUARD;
boolean isMethodInsecure = mUnlockMethodCache.isMethodInsecure();
- return onKeyguard && (isMethodInsecure || mDozing);
+ return onKeyguard && (isMethodInsecure || mDozing || mScreenOnComingFromTouch);
}
@Override // NotificationData.Environment
@@ -3909,6 +3914,7 @@
public void onScreenTurnedOff() {
mScreenOnFromKeyguard = false;
+ mScreenOnComingFromTouch = false;
mStackScroller.setAnimationsEnabled(false);
}
@@ -4011,10 +4017,13 @@
return !mNotificationData.getActiveNotifications().isEmpty();
}
- public void wakeUpIfDozing(long time) {
+ public void wakeUpIfDozing(long time, boolean fromTouch) {
if (mDozing && mScrimController.isPulsing()) {
PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
pm.wakeUp(time);
+ if (fromTouch) {
+ mScreenOnComingFromTouch = true;
+ }
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
index 89ce257..4c86990 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java
@@ -132,7 +132,7 @@
case KeyEvent.KEYCODE_VOLUME_DOWN:
case KeyEvent.KEYCODE_VOLUME_UP:
if (down) {
- mService.wakeUpIfDozing(event.getEventTime());
+ mService.wakeUpIfDozing(event.getEventTime(), false);
}
}
if (mService.interceptMediaKey(event)) {
@@ -164,7 +164,7 @@
intercept = mDragDownHelper.onInterceptTouchEvent(ev);
// wake up on a touch down event, if dozing
if (ev.getActionMasked() == MotionEvent.ACTION_DOWN) {
- mService.wakeUpIfDozing(ev.getEventTime());
+ mService.wakeUpIfDozing(ev.getEventTime(), true);
}
}
if (!intercept) {
diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java
index 73c9783..4dfd23b 100644
--- a/services/core/java/com/android/server/am/TaskRecord.java
+++ b/services/core/java/com/android/server/am/TaskRecord.java
@@ -783,7 +783,7 @@
int findEffectiveRootIndex() {
int effectiveNdx = 0;
final int topActivityNdx = mActivities.size() - 1;
- for (int activityNdx = 0; activityNdx < topActivityNdx; ++activityNdx) {
+ for (int activityNdx = 0; activityNdx <= topActivityNdx; ++activityNdx) {
final ActivityRecord r = mActivities.get(activityNdx);
if (r.finishing) {
continue;
diff --git a/tests/VectorDrawableTest/res/anim/animation_favorite.xml b/tests/VectorDrawableTest/res/anim/animation_favorite.xml
index c81ba40..2e2d9bb 100644
--- a/tests/VectorDrawableTest/res/anim/animation_favorite.xml
+++ b/tests/VectorDrawableTest/res/anim/animation_favorite.xml
@@ -25,5 +25,35 @@
android:valueFrom="@string/round_box"
android:valueTo="@string/heart"
android:valueType="pathType" />
+ <objectAnimator
+ android:duration="8000"
+ android:propertyName="fillAlpha"
+ android:repeatCount="-1"
+ android:valueFrom="1.0"
+ android:valueTo="0.0" />
+ <objectAnimator
+ android:duration="8000"
+ android:propertyName="strokeAlpha"
+ android:repeatCount="-1"
+ android:valueFrom="1.0"
+ android:valueTo="0.0" />
+ <objectAnimator
+ android:duration="8000"
+ android:propertyName="strokeColor"
+ android:repeatCount="-1"
+ android:valueFrom="#FF0000FF"
+ android:valueTo="#FF00FF00" />
+ <objectAnimator
+ android:duration="8000"
+ android:propertyName="strokeWidth"
+ android:repeatCount="-1"
+ android:valueFrom="5"
+ android:valueTo="20" />
+ <objectAnimator
+ android:duration="8000"
+ android:propertyName="fillColor"
+ android:repeatCount="-1"
+ android:valueFrom="#FFFF0000"
+ android:valueTo="#FF00FF00" />
</set>
\ No newline at end of file
diff --git a/tests/VectorDrawableTest/res/anim/trim_path_animation02.xml b/tests/VectorDrawableTest/res/anim/trim_path_animation02.xml
index 3bf2865..5d688cf 100644
--- a/tests/VectorDrawableTest/res/anim/trim_path_animation02.xml
+++ b/tests/VectorDrawableTest/res/anim/trim_path_animation02.xml
@@ -19,7 +19,7 @@
<objectAnimator
android:duration="5000"
- android:propertyName="fill"
+ android:propertyName="fillColor"
android:valueFrom="#FF000000"
android:valueTo="#FFFF0000"/>