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

am 70917abe: am ff3666ad: Kill flashlight when launching the camera from lockscreen

Browse Source 
* commit '70917abeddb096dca993636020c80a1b2085dcc6':
  Kill flashlight when launching the camera from lockscreen
This commit is contained in:
Adrian Roos
2014-07-22 22:15:17 +00:00
committed by Android Git Automerger
parent 0383c80247 40e917a5aa
commit 18b6790bdc
3 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
View File

@@ -38,6 +38,7 @@ import com.android.internal.widget.LockPatternUtils;
import com.android.keyguard.KeyguardUpdateMonitor;
import com.android.keyguard.KeyguardUpdateMonitorCallback;
import com.android.systemui.R;
import com.android.systemui.statusbar.policy.FlashlightController;
/**
* Implementation for the bottom area of the Keyguard, including camera/phone affordance and status
@@ -63,6 +64,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
private ActivityStarter mActivityStarter;
private UnlockMethodCache mUnlockMethodCache;
private LockPatternUtils mLockPatternUtils;
private FlashlightController mFlashlightController;
public KeyguardBottomAreaView(Context context) {
super(context);
@@ -102,6 +104,10 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
mActivityStarter = activityStarter;
}
public void setFlashlightController(FlashlightController flashlightController) {
mFlashlightController = flashlightController;
}
private Intent getCameraIntent() {
KeyguardUpdateMonitor updateMonitor = KeyguardUpdateMonitor.getInstance(mContext);
boolean currentUserHasTrust = updateMonitor.getUserHasTrust(
@@ -189,6 +195,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
}
public void launchCamera() {
mFlashlightController.killFlashlight();
Intent intent = getCameraIntent();
if (intent == SECURE_CAMERA_INTENT) {
mContext.startActivityAsUser(intent, UserHandle.CURRENT);

1
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -752,6 +752,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
}
mFlashlightController = new FlashlightController(mContext);
mKeyguardBottomArea.setFlashlightController(mFlashlightController);
mUserSwitcherController = new UserSwitcherController(mContext);
mKeyguardMonitor = new KeyguardMonitor();

21
packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightController.java
View File

@@ -94,6 +94,16 @@ public class FlashlightController {
}
}
public void killFlashlight() {
boolean enabled;
synchronized (this) {
enabled = mFlashlightEnabled;
}
if (enabled) {
mHandler.post(mKillFlashlightRunnable);
}
}
public synchronized boolean isAvailable() {
return ENFORCE_AVAILABILITY_LISTENER ? mCameraAvailable : (mCameraId != null);
}
@@ -320,6 +330,17 @@ public class FlashlightController {
}
};
private final Runnable mKillFlashlightRunnable = new Runnable() {
@Override
public void run() {
synchronized (this) {
mFlashlightEnabled = false;
}
updateFlashlight(true /* forceDisable */);
dispatchOff();
}
};
private final CameraManager.AvailabilityListener mAvailabilityListener =
new CameraManager.AvailabilityListener() {
@Override