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

Merge "Revert "Add scroll indicators to resolver list layouts"" into nyc-dev

Browse Source 
am: 76961cc

* commit '76961ccc52c5cb9d73336782be2d74c23600c5a3':
  Revert "Add scroll indicators to resolver list layouts"

Change-Id: If7517611b7130e1c0995f14ffb0fff052d23a2e1
This commit is contained in:
Alan Viverette
2016-04-11 18:07:09 +00:00
committed by android-build-merger
parent 53622b4023 76961ccc52
commit 435d55e66b
3 changed files with 135 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
core/java/com/android/internal/widget/ResolverDrawerLayout.java
View File

@@ -17,14 +17,9 @@
package com.android.internal.widget; package com.android.internal.widget;
import android.annotation.NonNull;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
@@ -90,10 +85,6 @@ public class ResolverDrawerLayout extends ViewGroup {
private final float mMinFlingVelocity; private final float mMinFlingVelocity;
private final OverScroller mScroller; private final OverScroller mScroller;
private final VelocityTracker mVelocityTracker; private final VelocityTracker mVelocityTracker;
private final Drawable mScrollIndicatorDrawable;
private final Drawable mFakeForeground;
private View mButtonBar;
private OnDismissedListener mOnDismissedListener; private OnDismissedListener mOnDismissedListener;
private RunOnDismissedListener mRunOnDismissedListener; private RunOnDismissedListener mRunOnDismissedListener;
@@ -115,8 +106,6 @@ public class ResolverDrawerLayout extends ViewGroup {
} }
}; };
private final int[] mTempOffset = new int[2];
public ResolverDrawerLayout(Context context) { public ResolverDrawerLayout(Context context) {
this(context, null); this(context, null);
} }
@@ -138,9 +127,6 @@ public class ResolverDrawerLayout extends ViewGroup {
mMaxCollapsedHeight); mMaxCollapsedHeight);
a.recycle(); a.recycle();
mScrollIndicatorDrawable = mContext.getDrawable(R.drawable.scroll_indicator_material);
mFakeForeground = new ColorDrawable(Color.TRANSPARENT);
mScroller = new OverScroller(context, AnimationUtils.loadInterpolator(context, mScroller = new OverScroller(context, AnimationUtils.loadInterpolator(context,
android.R.interpolator.decelerate_quint)); android.R.interpolator.decelerate_quint));
mVelocityTracker = VelocityTracker.obtain(); mVelocityTracker = VelocityTracker.obtain();
@@ -152,13 +138,6 @@ public class ResolverDrawerLayout extends ViewGroup {
setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES); setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);
} }
@Override
protected void onFinishInflate() {
super.onFinishInflate();
mButtonBar = findViewById(R.id.button_bar);
}
public void setSmallCollapsed(boolean smallCollapsed) { public void setSmallCollapsed(boolean smallCollapsed) {
mSmallCollapsed = smallCollapsed; mSmallCollapsed = smallCollapsed;
requestLayout(); requestLayout();
@@ -223,7 +202,8 @@ public class ResolverDrawerLayout extends ViewGroup {
} }
final boolean isCollapsedNew = mCollapseOffset != 0; final boolean isCollapsedNew = mCollapseOffset != 0;
if (isCollapsedOld != isCollapsedNew) { if (isCollapsedOld != isCollapsedNew) {
onCollapsedChanged(isCollapsedNew); notifyViewAccessibilityStateChangedIfNeeded(
AccessibilityEvent.CONTENT_CHANGE_TYPE_UNDEFINED);
} }
} else { } else {
// Start out collapsed at first unless we restored state for otherwise // Start out collapsed at first unless we restored state for otherwise
@@ -462,7 +442,8 @@ public class ResolverDrawerLayout extends ViewGroup {
mTopOffset += dy; mTopOffset += dy;
final boolean isCollapsedNew = newPos != 0; final boolean isCollapsedNew = newPos != 0;
if (isCollapsedOld != isCollapsedNew) { if (isCollapsedOld != isCollapsedNew) {
onCollapsedChanged(isCollapsedNew); notifyViewAccessibilityStateChangedIfNeeded(
AccessibilityEvent.CONTENT_CHANGE_TYPE_UNDEFINED);
} }
postInvalidateOnAnimation(); postInvalidateOnAnimation();
return dy; return dy;
@@ -470,14 +451,6 @@ public class ResolverDrawerLayout extends ViewGroup {
return 0; return 0;
} }
private void onCollapsedChanged(boolean isCollapsed) {
notifyViewAccessibilityStateChangedIfNeeded(
AccessibilityEvent.CONTENT_CHANGE_TYPE_UNDEFINED);
// Set a fake foreground so that we receive onDrawForeground().
setForeground(isCollapsed ? mFakeForeground : null);
}
void dispatchOnDismissed() { void dispatchOnDismissed() {
if (mOnDismissedListener != null) { if (mOnDismissedListener != null) {
mOnDismissedListener.onDismissed(); mOnDismissedListener.onDismissed();
@@ -735,23 +708,6 @@ public class ResolverDrawerLayout extends ViewGroup {
return false; return false;
} }
@Override
public void onDrawForeground(Canvas canvas) {
if (isCollapsed() && mButtonBar != null) {
// Draw the scroll indicator directly above the button bar.
final int height = mScrollIndicatorDrawable.getIntrinsicHeight();
mButtonBar.getLocationInWindow(mTempOffset);
final int barTop = mTempOffset[1];
getLocationInWindow(mTempOffset);
final int myTop = mTempOffset[1];
final int top = (barTop - myTop) - height;
mScrollIndicatorDrawable.setBounds(0, top, getWidth(), top + height);
mScrollIndicatorDrawable.draw(canvas);
}
super.onDrawForeground(canvas);
}
@Override @Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
final int sourceWidth = MeasureSpec.getSize(widthMeasureSpec); final int sourceWidth = MeasureSpec.getSize(widthMeasureSpec);

122
core/res/res/layout/resolver_list.xml
View File

@@ -30,37 +30,33 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alwaysShow="true" android:layout_alwaysShow="true"
android:elevation="8dp" android:elevation="8dp"
android:background="@color/white"> android:background="@color/white" >
<TextView android:id="@+id/profile_button"
<TextView android:layout_width="wrap_content"
android:id="@+id/profile_button" android:layout_height="48dp"
android:layout_width="wrap_content" android:layout_marginEnd="8dp"
android:layout_height="48dp" android:paddingStart="8dp"
android:layout_marginEnd="8dp" android:paddingEnd="8dp"
android:paddingStart="8dp" android:visibility="gone"
android:paddingEnd="8dp" style="?attr/borderlessButtonStyle"
android:visibility="gone" android:textAppearance="?attr/textAppearanceButton"
style="?attr/borderlessButtonStyle" android:textColor="@color/material_deep_teal_500"
android:textAppearance="?attr/textAppearanceButton" android:gravity="center_vertical"
android:textColor="@color/material_deep_teal_500" android:layout_alignParentTop="true"
android:gravity="center_vertical" android:layout_alignParentRight="true"
android:layout_alignParentTop="true" android:singleLine="true"/>
android:layout_alignParentRight="true" <TextView android:id="@+id/title"
android:singleLine="true" /> android:layout_width="wrap_content"
android:layout_height="wrap_content"
<TextView android:minHeight="56dp"
android:id="@+id/title" android:textAppearance="?attr/textAppearanceMedium"
android:layout_width="wrap_content" android:gravity="start|center_vertical"
android:layout_height="wrap_content" android:paddingStart="?attr/dialogPreferredPadding"
android:minHeight="56dp" android:paddingEnd="?attr/dialogPreferredPadding"
android:textAppearance="?attr/textAppearanceMedium" android:paddingTop="8dp"
android:gravity="start|center_vertical" android:layout_below="@id/profile_button"
android:paddingStart="?attr/dialogPreferredPadding" android:layout_alignParentLeft="true"
android:paddingEnd="?attr/dialogPreferredPadding" android:paddingBottom="8dp" />
android:paddingTop="8dp"
android:layout_below="@id/profile_button"
android:layout_alignParentLeft="true"
android:paddingBottom="8dp" />
</RelativeLayout> </RelativeLayout>
<ListView <ListView
@@ -72,23 +68,21 @@
android:background="@color/white" android:background="@color/white"
android:elevation="8dp" android:elevation="8dp"
android:nestedScrollingEnabled="true" android:nestedScrollingEnabled="true"
android:scrollIndicators="top|bottom"
android:divider="@null" /> android:divider="@null" />
<TextView <TextView android:id="@+id/empty"
android:id="@+id/empty" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="match_parent"
android:layout_height="match_parent" android:layout_alwaysShow="true"
android:layout_alwaysShow="true" android:text="@string/noApplications"
android:text="@string/noApplications" android:padding="32dp"
android:padding="32dp" android:gravity="center"
android:gravity="center" android:visibility="gone" />
android:visibility="gone" />
<LinearLayout <LinearLayout
android:id="@+id/button_bar" android:id="@+id/button_bar"
android:visibility="gone" android:visibility="gone"
style="?attr/buttonBarStyle" style="?android:attr/buttonBarStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_ignoreOffset="true" android:layout_ignoreOffset="true"
@@ -103,30 +97,26 @@
android:paddingStart="12dp" android:paddingStart="12dp"
android:paddingEnd="12dp" android:paddingEnd="12dp"
android:elevation="8dp"> android:elevation="8dp">
<Button android:id="@+id/button_once"
<Button android:layout_width="wrap_content"
android:id="@+id/button_once" android:layout_gravity="start"
android:layout_width="wrap_content" android:maxLines="2"
android:layout_gravity="start" style="?android:attr/buttonBarNegativeButtonStyle"
android:maxLines="2" android:minHeight="@dimen/alert_dialog_button_bar_height"
style="?attr/buttonBarNegativeButtonStyle" android:layout_height="wrap_content"
android:minHeight="@dimen/alert_dialog_button_bar_height" android:enabled="false"
android:layout_height="wrap_content" android:text="@string/activity_resolver_use_once"
android:enabled="false" android:onClick="onButtonClick" />
android:text="@string/activity_resolver_use_once" <Button android:id="@+id/button_always"
android:onClick="onButtonClick" /> android:layout_width="wrap_content"
android:layout_gravity="end"
<Button android:maxLines="2"
android:id="@+id/button_always" android:minHeight="@dimen/alert_dialog_button_bar_height"
android:layout_width="wrap_content" style="?android:attr/buttonBarPositiveButtonStyle"
android:layout_gravity="end" android:layout_height="wrap_content"
android:maxLines="2" android:enabled="false"
android:minHeight="@dimen/alert_dialog_button_bar_height" android:text="@string/activity_resolver_use_always"
style="?attr/buttonBarPositiveButtonStyle" android:onClick="onButtonClick" />
android:layout_height="wrap_content"
android:enabled="false"
android:text="@string/activity_resolver_use_always"
android:onClick="onButtonClick" />
</LinearLayout> </LinearLayout>
</com.android.internal.widget.ResolverDrawerLayout> </com.android.internal.widget.ResolverDrawerLayout>

164
core/res/res/layout/resolver_list_with_default.xml
View File

@@ -22,7 +22,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:maxWidth="@dimen/resolver_max_width" android:maxWidth="@dimen/resolver_max_width"
android:maxCollapsedHeight="144dp" android:maxCollapsedHeight="144dp"
android:id="@id/contentPanel"> android:id="@id/contentPanel"
>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -30,75 +31,66 @@
android:layout_alwaysShow="true" android:layout_alwaysShow="true"
android:orientation="vertical" android:orientation="vertical"
android:background="@color/white" android:background="@color/white"
android:elevation="8dp"> android:elevation="8dp" >
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="64dp" android:layout_height="64dp"
android:orientation="horizontal"> android:orientation="horizontal" >
<ImageView <ImageView android:id="@+id/icon"
android:id="@+id/icon" android:layout_width="24dp"
android:layout_width="24dp" android:layout_height="24dp"
android:layout_height="24dp" android:layout_gravity="start|top"
android:layout_gravity="start|top" android:layout_marginStart="16dp"
android:layout_marginStart="16dp" android:layout_marginEnd="16dp"
android:layout_marginEnd="16dp" android:layout_marginTop="20dp"
android:layout_marginTop="20dp" android:scaleType="fitCenter" />
android:scaleType="fitCenter" /> <TextView android:id="@+id/title"
android:layout_width="0dp"
<TextView android:layout_weight="1"
android:id="@+id/title" android:layout_height="?android:attr/listPreferredItemHeight"
android:layout_width="0dp" android:layout_marginStart="16dp"
android:layout_weight="1" android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_height="?attr/listPreferredItemHeight" android:gravity="start|center_vertical"
android:layout_marginStart="16dp" android:paddingEnd="16dp" />
android:textAppearance="?attr/textAppearanceMedium" <LinearLayout android:id="@+id/profile_button"
android:gravity="start|center_vertical" android:layout_width="wrap_content"
android:paddingEnd="16dp" /> android:layout_height="48dp"
android:layout_marginTop="4dp"
<LinearLayout android:layout_marginEnd="4dp"
android:id="@+id/profile_button" android:paddingStart="8dp"
android:layout_width="wrap_content" android:paddingEnd="8dp"
android:layout_height="48dp" android:paddingTop="4dp"
android:layout_marginTop="4dp" android:paddingBottom="4dp"
android:layout_marginEnd="4dp" android:focusable="true"
android:paddingStart="8dp" android:visibility="gone"
android:paddingEnd="8dp" style="?attr/borderlessButtonStyle">
android:paddingTop="4dp" <ImageView android:id="@+id/icon"
android:paddingBottom="4dp" android:layout_width="24dp"
android:focusable="true" android:layout_height="24dp"
android:visibility="gone" android:layout_gravity="start|center_vertical"
style="?attr/borderlessButtonStyle"> android:layout_marginEnd="?attr/listPreferredItemPaddingEnd"
android:layout_marginTop="12dp"
<ImageView android:layout_marginBottom="12dp"
android:id="@+id/icon" android:scaleType="fitCenter" />
android:layout_width="24dp" <TextView android:id="@id/text1"
android:layout_height="24dp" android:layout_width="wrap_content"
android:layout_gravity="start|center_vertical" android:layout_height="wrap_content"
android:layout_marginEnd="?attr/listPreferredItemPaddingEnd" android:layout_gravity="start|center_vertical"
android:layout_marginTop="12dp" android:layout_marginEnd="?attr/listPreferredItemPaddingEnd"
android:layout_marginBottom="12dp" android:textAppearance="?attr/textAppearanceButton"
android:scaleType="fitCenter" /> android:textColor="?attr/textColorPrimary"
android:minLines="1"
<TextView android:maxLines="1"
android:id="@id/text1" android:ellipsize="marquee" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical"
android:layout_marginEnd="?attr/listPreferredItemPaddingEnd"
android:textAppearance="?attr/textAppearanceButton"
android:textColor="?attr/textColorPrimary"
android:minLines="1"
android:maxLines="1"
android:ellipsize="marquee" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/button_bar" android:id="@+id/button_bar"
android:visibility="gone" android:visibility="gone"
style="?attr/buttonBarStyle" style="?android:attr/buttonBarStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alwaysShow="true" android:layout_alwaysShow="true"
@@ -112,36 +104,30 @@
android:paddingEnd="12dp" android:paddingEnd="12dp"
android:background="@color/white" android:background="@color/white"
android:elevation="8dp"> android:elevation="8dp">
<Button android:id="@+id/button_once"
<Button android:layout_width="wrap_content"
android:id="@+id/button_once" android:layout_gravity="start"
android:layout_width="wrap_content" android:maxLines="2"
android:layout_gravity="start" style="?android:attr/buttonBarNegativeButtonStyle"
android:maxLines="2" android:minHeight="@dimen/alert_dialog_button_bar_height"
style="?attr/buttonBarNegativeButtonStyle" android:layout_height="wrap_content"
android:minHeight="@dimen/alert_dialog_button_bar_height" android:enabled="false"
android:layout_height="wrap_content" android:text="@string/activity_resolver_use_once"
android:enabled="false" android:onClick="onButtonClick" />
android:text="@string/activity_resolver_use_once" <Button android:id="@+id/button_always"
android:onClick="onButtonClick" /> android:layout_width="wrap_content"
android:layout_gravity="end"
<Button android:maxLines="2"
android:id="@+id/button_always" android:minHeight="@dimen/alert_dialog_button_bar_height"
android:layout_width="wrap_content" style="?android:attr/buttonBarPositiveButtonStyle"
android:layout_gravity="end" android:layout_height="wrap_content"
android:maxLines="2" android:enabled="false"
android:minHeight="@dimen/alert_dialog_button_bar_height" android:text="@string/activity_resolver_use_always"
style="?attr/buttonBarPositiveButtonStyle" android:onClick="onButtonClick" />
android:layout_height="wrap_content"
android:enabled="false"
android:text="@string/activity_resolver_use_always"
android:onClick="onButtonClick" />
</LinearLayout> </LinearLayout>
<View android:layout_width="match_parent"
<View android:layout_height="1dp"
android:layout_width="match_parent" android:background="?android:attr/dividerVertical" />
android:layout_height="1dp"
android:background="?attr/dividerVertical" />
</LinearLayout> </LinearLayout>
<ListView <ListView
@@ -154,6 +140,6 @@
android:elevation="8dp" android:elevation="8dp"
android:nestedScrollingEnabled="true" android:nestedScrollingEnabled="true"
android:divider="@null" android:divider="@null"
android:scrollIndicators="top|bottom" /> />
</com.android.internal.widget.ResolverDrawerLayout> </com.android.internal.widget.ResolverDrawerLayout>