summaryrefslogtreecommitdiffstats
path: root/policy/src
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2013-09-10 18:37:01 -0700
committerJim Miller <jaggies@google.com>2013-09-19 17:14:59 -0700
commitcaf24fc2c4bb9747eb80138bf3ce0be067851749 (patch)
treea81859dd75a9ca17e752c32f1ecf0b40a62df1bd /policy/src
parentf429247867ac524cf63bc01499ac47a90ebcaca9 (diff)
downloadframeworks_base-caf24fc2c4bb9747eb80138bf3ce0be067851749.zip
frameworks_base-caf24fc2c4bb9747eb80138bf3ce0be067851749.tar.gz
frameworks_base-caf24fc2c4bb9747eb80138bf3ce0be067851749.tar.bz2
Add camera affordance to navigation bar on phones
This adds a camera button on phones that can be used to show and launch the camera. - Minor refactoring of touch event dispatch in PagedView. - Disables usability hints when keyguard loads. - Only add a touch handler for camera icon once during layout. - Update after review. - Updated with latest UX camera and camera background assets Change-Id: I09cd5cb0e501fd0f4659bea96d00c92b07f805c4
Diffstat (limited to 'policy/src')
-rw-r--r--policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java6
-rw-r--r--policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceWrapper.java5
2 files changed, 9 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java
index 874076a..56a282b 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java
@@ -29,8 +29,10 @@ import com.android.internal.widget.LockPatternUtils;
* local or remote instances of keyguard.
*/
public class KeyguardServiceDelegate {
- private static final String KEYGUARD_PACKAGE = "com.android.keyguard";
- private static final String KEYGUARD_CLASS = "com.android.keyguard.KeyguardService";
+ // TODO: propagate changes to these to {@link KeyguardTouchDelegate}
+ public static final String KEYGUARD_PACKAGE = "com.android.keyguard";
+ public static final String KEYGUARD_CLASS = "com.android.keyguard.KeyguardService";
+
private static final String TAG = "KeyguardServiceDelegate";
private static final boolean DEBUG = true;
protected KeyguardServiceWrapper mKeyguardService;
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceWrapper.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceWrapper.java
index 6b9c7df..b27584d 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceWrapper.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceWrapper.java
@@ -20,6 +20,7 @@ import android.os.Bundle;
import android.os.IBinder;
import android.os.RemoteException;
import android.util.Slog;
+import android.view.MotionEvent;
import com.android.internal.policy.IKeyguardShowCallback;
import com.android.internal.policy.IKeyguardExitCallback;
@@ -187,6 +188,10 @@ public class KeyguardServiceWrapper implements IKeyguardService {
}
}
+ public void dispatch(MotionEvent event) {
+ // Not used by PhoneWindowManager. See code in {@link NavigationBarView}
+ }
+
@Override
public IBinder asBinder() {
return mService.asBinder();