diff options
17 files changed, 231 insertions, 51 deletions
diff --git a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml index 61870707882b..cc35c51c3ee8 100644 --- a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml @@ -35,18 +35,22 @@ <com.android.systemui.qs.QuickQSPanel android:id="@+id/quick_qs_panel" android:background="#0000" - android:layout_width="142dp" + android:layout_width="144dp" android:layout_height="match_parent" - android:layout_alignParentEnd="true" /> + android:layout_alignParentEnd="true" + android:layout_marginEnd="12dp" /> <LinearLayout android:id="@+id/expanded_group" android:layout_width="wrap_content" android:layout_height="match_parent" + android:gravity="center" android:clipChildren="false" android:clipToPadding="false" android:orientation="horizontal" - android:layout_alignParentEnd="true"> + android:layout_alignParentEnd="true" + android:layout_marginEnd="10dp"> + <com.android.systemui.statusbar.AlphaOptimizedFrameLayout android:id="@+id/settings_button_container" android:layout_width="48dp" @@ -74,7 +78,8 @@ <ImageView android:layout_width="48dp" - android:layout_height="match_parent" + android:layout_height="48dp" + android:padding="12dp" android:src="@drawable/ic_expand_less" android:tint="@android:color/white" /> </LinearLayout> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index cbc92f2d985b..00f484d3cc76 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -128,6 +128,8 @@ <dimen name="qs_new_tile_height">100dp</dimen> <dimen name="qs_quick_actions_height">88dp</dimen> <dimen name="qs_quick_actions_padding">25dp</dimen> + <dimen name="qs_quick_tile_size">48dp</dimen> + <dimen name="qs_quick_tile_padding">12dp</dimen> <dimen name="qs_page_indicator_size">12dp</dimen> <dimen name="qs_tile_icon_size">24dp</dimen> <dimen name="qs_tile_text_size">12sp</dimen> diff --git a/packages/SystemUI/src/com/android/systemui/QSQuickTileView.java b/packages/SystemUI/src/com/android/systemui/QSQuickTileView.java new file mode 100644 index 000000000000..33626505ff79 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/QSQuickTileView.java @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui; + +import android.content.Context; +import android.view.View; +import android.widget.ImageView; +import com.android.systemui.qs.QSTile; +import com.android.systemui.qs.QSTileBaseView; + +public class QSQuickTileView extends QSTileBaseView { + + private final int mPadding; + private final ImageView mIcon; + + public QSQuickTileView(Context context) { + super(context); + mPadding = context.getResources().getDimensionPixelSize(R.dimen.qs_quick_tile_padding); + mIcon = createIcon(); + addView(mIcon); + } + + protected ImageView createIcon() { + final ImageView icon = new ImageView(mContext); + icon.setId(android.R.id.icon); + icon.setScaleType(ImageView.ScaleType.CENTER_INSIDE); + return icon; + } + + @Override + public void init(OnClickListener click, OnClickListener clickSecondary, + OnLongClickListener longClick) { + setClickable(true); + setOnClickListener(click); + } + + @Override + protected void handleStateChanged(QSTile.State state) { + mIcon.setImageDrawable(state.icon.getDrawable(getContext())); + setContentDescription(state.contentDescription); + } + + @Override + public boolean setType(int type) { + return false; + } + + @Override + public View updateAccessibilityOrder(View previousView) { + return this; + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + mIcon.measure(exactly(getMeasuredWidth() - 2 * mPadding), + exactly(getMeasuredHeight() - 2 * mPadding)); + } + + @Override + protected void onLayout(boolean changed, int l, int t, int r, int b) { + layout(mIcon, mPadding, mPadding); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java index c6bcfc4b1a85..794e9005fa31 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java @@ -566,7 +566,7 @@ public class QSPanel extends FrameLayout implements Tunable { public static final class TileRecord extends Record { public QSTile<?> tile; - public QSTileView tileView; + public QSTileBaseView tileView; public int row; public int col; public boolean scanState; diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java index 61cb224f5df2..5d928d6c3ade 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java @@ -98,7 +98,7 @@ public abstract class QSTile<TState extends State> implements Listenable { return mHost; } - public QSTileView createTileView(Context context) { + public QSTileBaseView createTileView(Context context) { return new QSTileView(context); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTileBaseView.java b/packages/SystemUI/src/com/android/systemui/qs/QSTileBaseView.java new file mode 100644 index 000000000000..72fc88de11ea --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/QSTileBaseView.java @@ -0,0 +1,70 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + */ + +package com.android.systemui.qs; + +import android.content.Context; +import android.os.Handler; +import android.os.Looper; +import android.os.Message; +import android.util.AttributeSet; +import android.view.View; +import android.view.ViewGroup; + +public abstract class QSTileBaseView extends ViewGroup { + + public static final int QS_TYPE_NORMAL = 0; + public static final int QS_TYPE_DUAL = 1; + public static final int QS_TYPE_QUICK = 2; + + private final H mHandler = new H(); + + public QSTileBaseView(Context context) { + super(context); + } + + public QSTileBaseView(Context context, AttributeSet attrs) { + super(context, attrs); + } + + + public void onStateChanged(QSTile.State state) { + mHandler.obtainMessage(H.STATE_CHANGED, state).sendToTarget(); + } + + public abstract void init(OnClickListener click, OnClickListener clickSecondary, + OnLongClickListener longClick); + public abstract View updateAccessibilityOrder(View previousView); + public abstract boolean setType(int type); + + protected abstract void handleStateChanged(QSTile.State state); + + protected static int exactly(int size) { + return MeasureSpec.makeMeasureSpec(size, MeasureSpec.EXACTLY); + } + + protected static void layout(View child, int left, int top) { + child.layout(left, top, left + child.getMeasuredWidth(), top + child.getMeasuredHeight()); + } + + private class H extends Handler { + private static final int STATE_CHANGED = 1; + public H() { + super(Looper.getMainLooper()); + } + + @Override + public void handleMessage(Message msg) { + if (msg.what == STATE_CHANGED) { + handleStateChanged((QSTile.State) msg.obj); + } + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java b/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java index d914beb4e3de..cc264a00776d 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java @@ -44,18 +44,13 @@ import com.android.systemui.qs.QSTile.State; import java.util.Objects; /** View that represents a standard quick settings tile. **/ -public class QSTileView extends ViewGroup { +public class QSTileView extends QSTileBaseView { private static final Typeface CONDENSED = Typeface.create("sans-serif-condensed", Typeface.NORMAL); - public static final int QS_TYPE_NORMAL = 0; - public static final int QS_TYPE_DUAL = 1; - public static final int QS_TYPE_QUICK = 2; - protected final Context mContext; private final View mIcon; private final View mDivider; - private final H mHandler = new H(); private final int mIconSizePx; private final int mTileSpacingPx; private int mTilePaddingTopPx; @@ -291,10 +286,6 @@ public class QSTileView extends ViewGroup { return MeasureSpec.EXACTLY; } - private static int exactly(int size) { - return MeasureSpec.makeMeasureSpec(size, MeasureSpec.EXACTLY); - } - @Override protected void onLayout(boolean changed, int l, int t, int r, int b) { final int w = getMeasuredWidth(); @@ -334,10 +325,6 @@ public class QSTileView extends ViewGroup { mRipple.setHotspotBounds(cx - rad, cy - rad, cx + rad, cy + rad); } - private static void layout(View child, int left, int top) { - child.layout(left, top, left + child.getMeasuredWidth(), top + child.getMeasuredHeight()); - } - protected void handleStateChanged(QSTile.State state) { if (mIcon instanceof ImageView) { setIcon((ImageView) mIcon, state); @@ -369,10 +356,6 @@ public class QSTileView extends ViewGroup { } } - public void onStateChanged(QSTile.State state) { - mHandler.obtainMessage(H.STATE_CHANGED, state).sendToTarget(); - } - /** * Update the accessibility order for this view. * @@ -392,17 +375,4 @@ public class QSTileView extends ViewGroup { firstView.setAccessibilityTraversalAfter(previousView.getId()); return lastView; } - - private class H extends Handler { - private static final int STATE_CHANGED = 1; - public H() { - super(Looper.getMainLooper()); - } - @Override - public void handleMessage(Message msg) { - if (msg.what == STATE_CHANGED) { - handleStateChanged((State) msg.obj); - } - } - } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java index a2d9ef020985..6a053bee36cd 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java @@ -19,6 +19,8 @@ package com.android.systemui.qs; import android.content.Context; import android.content.res.ColorStateList; import android.util.AttributeSet; +import android.util.Log; +import android.view.Gravity; import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; @@ -58,6 +60,7 @@ public class QuickQSPanel extends QSPanel { ArrayList<QSTile<?>> quickTiles = new ArrayList<>(); for (QSTile<?> tile : tiles) { if (tile.getTileType() == QSTileView.QS_TYPE_QUICK) { + Log.d("QSPanel", "Adding " + tile.getTileSpec()); quickTiles.add(tile); } if (quickTiles.size() == 2) { @@ -71,16 +74,17 @@ public class QuickQSPanel extends QSPanel { public HeaderTileLayout(Context context) { super(context); + setGravity(Gravity.CENTER_VERTICAL); setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); - int qsCompensation = (int) - context.getResources().getDimension(R.dimen.qs_header_neg_padding); - setPadding(0, qsCompensation, 0, 0); + + int padding = + mContext.getResources().getDimensionPixelSize(R.dimen.qs_quick_tile_padding); ImageView downArrow = new ImageView(context); downArrow.setImageResource(R.drawable.ic_expand_more); downArrow.setImageTintList(ColorStateList.valueOf(context.getResources().getColor( android.R.color.white, null))); downArrow.setLayoutParams(generateLayoutParams()); - downArrow.setPadding(0, -qsCompensation, 0, 0); + downArrow.setPadding(padding, padding, padding, padding); addView(downArrow); setOrientation(LinearLayout.HORIZONTAL); } @@ -95,7 +99,9 @@ public class QuickQSPanel extends QSPanel { } private LayoutParams generateLayoutParams() { - LayoutParams lp = new LayoutParams(0, LayoutParams.MATCH_PARENT); + int size = + mContext.getResources().getDimensionPixelSize(R.dimen.qs_quick_tile_size); + LayoutParams lp = new LayoutParams(0, size); lp.weight = 1; return lp; } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java index f3ad9d803394..e2d2ffbebf93 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java @@ -27,13 +27,12 @@ import android.view.ViewGroup; import com.android.internal.logging.MetricsLogger; import com.android.systemui.R; import com.android.systemui.qs.QSTile; -import com.android.systemui.qs.QSTileView; +import com.android.systemui.qs.QSTileBaseView; import com.android.systemui.qs.SignalTileView; import com.android.systemui.statusbar.policy.NetworkController; import com.android.systemui.statusbar.policy.NetworkController.IconState; import com.android.systemui.statusbar.policy.NetworkController.MobileDataController; import com.android.systemui.statusbar.policy.NetworkController.MobileDataController.DataUsageInfo; -import com.android.systemui.statusbar.policy.NetworkController.SignalCallback; import com.android.systemui.statusbar.policy.SignalCallbackAdapter; /** Quick settings tile: Cellular **/ @@ -74,7 +73,7 @@ public class CellularTile extends QSTile<QSTile.SignalState> { } @Override - public QSTileView createTileView(Context context) { + public QSTileBaseView createTileView(Context context) { return new SignalTileView(context); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/QAirplaneTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/QAirplaneTile.java index 13ccaaade1cf..b77191eeb83c 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/QAirplaneTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/QAirplaneTile.java @@ -16,9 +16,12 @@ package com.android.systemui.qs.tiles; +import android.content.Context; +import com.android.systemui.QSQuickTileView; +import com.android.systemui.qs.QSTileBaseView; import com.android.systemui.qs.QSTileView; -/** Quick settings tile: Wifi **/ +/** Quick settings tile: Airplane mode **/ public class QAirplaneTile extends AirplaneModeTile { public QAirplaneTile(Host host) { @@ -26,6 +29,11 @@ public class QAirplaneTile extends AirplaneModeTile { } @Override + public QSTileBaseView createTileView(Context context) { + return new QSQuickTileView(context); + } + + @Override public int getTileType() { return QSTileView.QS_TYPE_QUICK; } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/QBluetoothTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/QBluetoothTile.java index 02975cbace07..4fe7e45846a3 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/QBluetoothTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/QBluetoothTile.java @@ -16,6 +16,9 @@ package com.android.systemui.qs.tiles; +import android.content.Context; +import com.android.systemui.QSQuickTileView; +import com.android.systemui.qs.QSTileBaseView; import com.android.systemui.qs.QSTileView; /** Quick settings tile: Bluetooth **/ @@ -26,6 +29,11 @@ public class QBluetoothTile extends BluetoothTile { } @Override + public QSTileBaseView createTileView(Context context) { + return new QSQuickTileView(context); + } + + @Override public int getTileType() { return QSTileView.QS_TYPE_QUICK; } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/QFlashlightTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/QFlashlightTile.java index 31035cdb5b25..e115755e98ed 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/QFlashlightTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/QFlashlightTile.java @@ -16,9 +16,12 @@ package com.android.systemui.qs.tiles; +import android.content.Context; +import com.android.systemui.QSQuickTileView; +import com.android.systemui.qs.QSTileBaseView; import com.android.systemui.qs.QSTileView; -/** Quick settings tile: Wifi **/ +/** Quick settings tile: Flashlight **/ public class QFlashlightTile extends FlashlightTile { public QFlashlightTile(Host host) { @@ -26,6 +29,11 @@ public class QFlashlightTile extends FlashlightTile { } @Override + public QSTileBaseView createTileView(Context context) { + return new QSQuickTileView(context); + } + + @Override public int getTileType() { return QSTileView.QS_TYPE_QUICK; } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/QLockTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/QLockTile.java index 3675f02b9dee..8b3013a96f9c 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/QLockTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/QLockTile.java @@ -15,11 +15,14 @@ */ package com.android.systemui.qs.tiles; +import android.content.Context; import com.android.internal.logging.MetricsLogger; +import com.android.systemui.QSQuickTileView; +import com.android.systemui.R; import com.android.systemui.qs.QSTile; +import com.android.systemui.qs.QSTileBaseView; import com.android.systemui.qs.QSTileView; import com.android.systemui.statusbar.policy.KeyguardMonitor; -import com.android.systemui.R; public class QLockTile extends QSTile<QSTile.State> implements KeyguardMonitor.Callback { @@ -31,6 +34,11 @@ public class QLockTile extends QSTile<QSTile.State> implements KeyguardMonitor.C } @Override + public QSTileBaseView createTileView(Context context) { + return new QSQuickTileView(context); + } + + @Override public int getTileType() { return QSTileView.QS_TYPE_QUICK; } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/QRotationLockTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/QRotationLockTile.java index e066bab04b32..5f5cab503d4a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/QRotationLockTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/QRotationLockTile.java @@ -16,6 +16,9 @@ package com.android.systemui.qs.tiles; +import android.content.Context; +import com.android.systemui.QSQuickTileView; +import com.android.systemui.qs.QSTileBaseView; import com.android.systemui.qs.QSTileView; /** Quick settings tile: Rotation **/ @@ -26,6 +29,11 @@ public class QRotationLockTile extends RotationLockTile { } @Override + public QSTileBaseView createTileView(Context context) { + return new QSQuickTileView(context); + } + + @Override public int getTileType() { return QSTileView.QS_TYPE_QUICK; } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/QWifiTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/QWifiTile.java index b1572754fb6b..f0fe87d2261f 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/QWifiTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/QWifiTile.java @@ -16,6 +16,9 @@ package com.android.systemui.qs.tiles; +import android.content.Context; +import com.android.systemui.QSQuickTileView; +import com.android.systemui.qs.QSTileBaseView; import com.android.systemui.qs.QSTileView; import com.android.systemui.statusbar.policy.WifiIcons; @@ -27,6 +30,11 @@ public class QWifiTile extends WifiTile { } @Override + public QSTileBaseView createTileView(Context context) { + return new QSQuickTileView(context); + } + + @Override public int getTileType() { return QSTileView.QS_TYPE_QUICK; } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java index 91e02183818f..3763618bae21 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java @@ -30,6 +30,7 @@ import com.android.systemui.R; import com.android.systemui.qs.QSDetailItems; import com.android.systemui.qs.QSDetailItems.Item; import com.android.systemui.qs.QSTile; +import com.android.systemui.qs.QSTileBaseView; import com.android.systemui.qs.QSTileView; import com.android.systemui.qs.SignalTileView; import com.android.systemui.statusbar.policy.NetworkController; @@ -94,7 +95,7 @@ public class WifiTile extends QSTile<QSTile.SignalState> { } @Override - public QSTileView createTileView(Context context) { + public QSTileBaseView createTileView(Context context) { return new SignalTileView(context); } diff --git a/packages/SystemUI/src/com/android/systemui/tuner/QsTuner.java b/packages/SystemUI/src/com/android/systemui/tuner/QsTuner.java index 4ce0933e36ec..05e3fd50a9f5 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/QsTuner.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/QsTuner.java @@ -46,6 +46,7 @@ import com.android.systemui.qs.QSPanel; import com.android.systemui.qs.QSTile; import com.android.systemui.qs.QSTile.Host.Callback; import com.android.systemui.qs.QSTile.ResourceIcon; +import com.android.systemui.qs.QSTileBaseView; import com.android.systemui.qs.QSTileView; import com.android.systemui.qs.tiles.IntentTile; import com.android.systemui.statusbar.phone.QSTileHost; @@ -381,7 +382,7 @@ public class QsTuner extends Fragment implements Callback { private static class DraggableTile extends QSTile<QSTile.State> implements DropListener { private String mSpec; - private QSTileView mView; + private QSTileBaseView mView; protected DraggableTile(QSTile.Host host, String tileSpec) { super(host); @@ -390,7 +391,7 @@ public class QsTuner extends Fragment implements Callback { } @Override - public QSTileView createTileView(Context context) { + public QSTileBaseView createTileView(Context context) { mView = super.createTileView(context); return mView; } |