openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Get the view to be used as qsb bar from the launcher directly." into jb-ub-gel-agar

This commit is contained in:
Adam Copp 2013-08-23 13:47:27 +00:00 committed by Android (Google) Code Review
parent 8b0405888f 476493bcc3
commit eed7aa422f
5 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
res/layout/qsb_bar.xml
View File

@ -20,13 +20,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<!-- Search buttons container -->
<include android:id="@+id/qsb_search_bar"
layout="@layout/search_bar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center" />
<!-- Drag specific targets container -->
<LinearLayout
style="@style/SearchDropTargetBar"

6
src/com/android/launcher3/DrawableStateProxyView.java
View File

@ -58,8 +58,10 @@ public class DrawableStateProxyView extends LinearLayout {
View parent = (View) getParent();
mView = parent.findViewById(mViewId);
}
mView.setPressed(isPressed());
mView.setHovered(isHovered());
if (mView != null) {
mView.setPressed(isPressed());
mView.setHovered(isHovered());
}
}
@Override

2
src/com/android/launcher3/DynamicGrid.java
View File

@ -321,7 +321,7 @@ class DeviceProfile {
searchBarSpace.setLayoutParams(lp);
// Layout the search bar
View searchBar = searchBarSpace.findViewById(R.id.qsb_search_bar);
View searchBar = launcher.getQsbBar();
lp = (FrameLayout.LayoutParams) searchBar.getLayoutParams();
lp.width = LayoutParams.MATCH_PARENT;
lp.height = LayoutParams.MATCH_PARENT;

18
src/com/android/launcher3/Launcher.java
View File

@ -240,6 +240,7 @@ public class Launcher extends Activity
private AppsCustomizeTabHost mAppsCustomizeTabHost;
private AppsCustomizePagedView mAppsCustomizeContent;
private boolean mAutoAdvanceRunning = false;
private View mQsbBar;
private Bundle mSavedState;
// We set the state in both onCreate and then onNewIntent in some cases, which causes both
@ -408,8 +409,8 @@ public class Launcher extends Activity
checkForLocaleChange();
setContentView(R.layout.launcher);
grid.layout(this);
setupViews();
grid.layout(this);
showFirstRunWorkspaceCling();
registerContentObservers();
@ -3229,7 +3230,14 @@ public class Launcher extends Activity
}
}
private boolean updateGlobalSearchIcon() {
public View getQsbBar() {
if (mQsbBar == null) {
mQsbBar = mInflater.inflate(R.layout.qsb_bar, mSearchDropTargetBar);
}
return mQsbBar;
}
protected boolean updateGlobalSearchIcon() {
final View searchButtonContainer = findViewById(R.id.search_button_container);
final ImageView searchButton = (ImageView) findViewById(R.id.search_button);
final View voiceButtonContainer = findViewById(R.id.voice_button_container);
@ -3264,14 +3272,14 @@ public class Launcher extends Activity
}
}
private void updateGlobalSearchIcon(Drawable.ConstantState d) {
protected void updateGlobalSearchIcon(Drawable.ConstantState d) {
final View searchButtonContainer = findViewById(R.id.search_button_container);
final View searchButton = (ImageView) findViewById(R.id.search_button);
updateButtonWithDrawable(R.id.search_button, d);
invalidatePressedFocusedStates(searchButtonContainer, searchButton);
}
private boolean updateVoiceSearchIcon(boolean searchVisible) {
protected boolean updateVoiceSearchIcon(boolean searchVisible) {
final View voiceButtonContainer = findViewById(R.id.voice_button_container);
final View voiceButton = findViewById(R.id.voice_button);
@ -3317,7 +3325,7 @@ public class Launcher extends Activity
}
}
private void updateVoiceSearchIcon(Drawable.ConstantState d) {
protected void updateVoiceSearchIcon(Drawable.ConstantState d) {
final View voiceButtonContainer = findViewById(R.id.voice_button_container);
final View voiceButton = findViewById(R.id.voice_button);
updateButtonWithDrawable(R.id.voice_button, d);

15
src/com/android/launcher3/SearchDropTargetBar.java
View File

@ -23,6 +23,7 @@ import android.content.Context;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
import android.view.animation.AccelerateInterpolator;
import android.widget.FrameLayout;
@ -71,6 +72,14 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D
dragController.setFlingToDeleteDropTarget(mDeleteDropTarget);
mInfoDropTarget.setLauncher(launcher);
mDeleteDropTarget.setLauncher(launcher);
mQSBSearchBar = launcher.getQsbBar();
if (mEnableDropDownDropTargets) {
mQSBSearchBarAnim = LauncherAnimUtils.ofFloat(mQSBSearchBar, "translationY", 0,
-mBarHeight);
} else {
mQSBSearchBarAnim = LauncherAnimUtils.ofFloat(mQSBSearchBar, "alpha", 1f, 0f);
}
setupAnimation(mQSBSearchBarAnim, mQSBSearchBar);
}
private void prepareStartAnimation(View v) {
@ -95,7 +104,6 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D
super.onFinishInflate();
// Get the individual components
mQSBSearchBar = findViewById(R.id.qsb_search_bar);
mDropTargetBar = findViewById(R.id.drag_target_bar);
mInfoDropTarget = (ButtonDropTarget) mDropTargetBar.findViewById(R.id.info_target_text);
mDeleteDropTarget = (ButtonDropTarget) mDropTargetBar.findViewById(R.id.delete_target_text);
@ -114,15 +122,12 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D
mDropTargetBar.setTranslationY(-mBarHeight);
mDropTargetBarAnim = LauncherAnimUtils.ofFloat(mDropTargetBar, "translationY",
-mBarHeight, 0f);
mQSBSearchBarAnim = LauncherAnimUtils.ofFloat(mQSBSearchBar, "translationY", 0,
-mBarHeight);
} else {
mDropTargetBar.setAlpha(0f);
mDropTargetBarAnim = LauncherAnimUtils.ofFloat(mDropTargetBar, "alpha", 0f, 1f);
mQSBSearchBarAnim = LauncherAnimUtils.ofFloat(mQSBSearchBar, "alpha", 1f, 0f);
}
setupAnimation(mDropTargetBarAnim, mDropTargetBar);
setupAnimation(mQSBSearchBarAnim, mQSBSearchBar);
}
public void finishAnimations() {