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

am 12677272: Merge "Have SearchPanel fade camera and search buttons when activated" into klp-dev

Browse Source 
* commit '1267727241c941af42faf19bfc1e21034112e0da':
  Have SearchPanel fade camera and search buttons when activated
This commit is contained in:
Jim Miller
2013-10-09 16:51:20 -07:00
committed by Android Git Automerger
parent 11a3bc702b 1267727241
commit 7de6672943
3 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
View File

@@ -570,12 +570,14 @@ public abstract class BaseStatusBar extends SystemUI implements
if (DEBUG) Log.d(TAG, "opening search panel");
if (mSearchPanelView != null && mSearchPanelView.isAssistantAvailable()) {
mSearchPanelView.show(true, true);
onShowSearchPanel();
}
break;
case MSG_CLOSE_SEARCH_PANEL:
if (DEBUG) Log.d(TAG, "closing search panel");
if (mSearchPanelView != null && mSearchPanelView.isShowing()) {
mSearchPanelView.show(false, true);
onHideSearchPanel();
}
break;
}
@@ -607,6 +609,12 @@ public abstract class BaseStatusBar extends SystemUI implements
protected void workAroundBadLayerDrawableOpacity(View v) {
}
protected void onHideSearchPanel() {
}
protected void onShowSearchPanel() {
}
public boolean inflateViews(NotificationData.Entry entry, ViewGroup parent) {
int minHeight =
mContext.getResources().getDimensionPixelSize(R.dimen.notification_min_height);

22
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
View File

@@ -92,23 +92,16 @@ public class NavigationBarView extends LinearLayout {
private final OnTouchListener mCameraTouchListener = new OnTouchListener() {
@Override
public boolean onTouch(View cameraButtonView, MotionEvent event) {
View searchLight = getSearchLight();
switch (event.getAction()) {
case MotionEvent.ACTION_DOWN:
// disable search gesture while interacting with camera
mDelegateHelper.setDisabled(true);
cameraButtonView.animate().alpha(0.0f).setDuration(CAMERA_BUTTON_FADE_DURATION);
if (searchLight != null) {
searchLight.animate().alpha(0.0f).setDuration(CAMERA_BUTTON_FADE_DURATION);
}
transitionCameraAndSearchButtonAlpha(0.0f);
break;
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL:
mDelegateHelper.setDisabled(false);
cameraButtonView.animate().alpha(1.0f).setDuration(CAMERA_BUTTON_FADE_DURATION);
if (searchLight != null) {
searchLight.animate().alpha(1.0f).setDuration(CAMERA_BUTTON_FADE_DURATION);
}
transitionCameraAndSearchButtonAlpha(1.0f);
break;
}
return KeyguardTouchDelegate.getInstance(getContext()).dispatch(event);
@@ -158,6 +151,17 @@ public class NavigationBarView extends LinearLayout {
watchForDevicePolicyChanges();
}
protected void transitionCameraAndSearchButtonAlpha(float alpha) {
View cameraButtonView = getCameraButton();
if (cameraButtonView != null) {
cameraButtonView.animate().alpha(alpha).setDuration(CAMERA_BUTTON_FADE_DURATION);
}
View searchLight = getSearchLight();
if (searchLight != null) {
searchLight.animate().alpha(alpha).setDuration(CAMERA_BUTTON_FADE_DURATION);
}
}
private void watchForDevicePolicyChanges() {
final IntentFilter filter = new IntentFilter();
filter.addAction(DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED);

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

@@ -646,6 +646,20 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
return mStatusBarView;
}
@Override
protected void onShowSearchPanel() {
if (mNavigationBarView != null) {
mNavigationBarView.transitionCameraAndSearchButtonAlpha(0.0f);
}
}
@Override
protected void onHideSearchPanel() {
if (mNavigationBarView != null) {
mNavigationBarView.transitionCameraAndSearchButtonAlpha(1.0f);
}
}
@Override
protected View getStatusBarView() {
return mStatusBarView;