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

Merge "Align empty views for quicksetting center in detail panel." into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-07-15 19:08:10 +00:00
committed by Android (Google) Code Review
parent ca5c7da9d0 3bfda445f7
commit 7703ce2d21
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/res/layout/qs_detail.xml
View File

@@ -47,11 +47,12 @@
<com.android.systemui.qs.NonInterceptingScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
android:layout_weight="1"
android:fillViewport="true">
<FrameLayout
android:id="@android:id/content"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="match_parent"/>
</com.android.systemui.qs.NonInterceptingScrollView>
<include layout="@layout/qs_detail_buttons" />

17
packages/SystemUI/res/layout/qs_detail_items.xml
View File

@@ -15,7 +15,8 @@
limitations under the License.
-->
<!-- extends FrameLayout -->
<com.android.systemui.qs.QSDetailItems xmlns:android="http://schemas.android.com/apk/res/android"
<com.android.systemui.qs.QSDetailItems
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:sysui="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -28,26 +29,26 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
sysui:itemHeight="@dimen/qs_detail_item_height" />
sysui:itemHeight="@dimen/qs_detail_item_height"/>
<LinearLayout
android:id="@android:id/empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:gravity="center_horizontal"
android:orientation="vertical" >
android:gravity="center"
android:orientation="vertical">
<ImageView
android:id="@android:id/icon"
android:layout_width="56dp"
android:layout_height="56dp" />
android:layout_height="56dp"/>
<TextView
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:textAppearance="@style/TextAppearance.QS.DetailEmpty" />
android:textAppearance="@style/TextAppearance.QS.DetailEmpty"/>
</LinearLayout>
</com.android.systemui.qs.QSDetailItems>

2
packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
View File

@@ -368,5 +368,5 @@ public class WifiTile extends QSTile<QSTile.SignalState> {
}
mItems.setItems(items);
}
};
}
}