Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev

am: 295f106

* commit '295f1060e990299fec7e2aa375064f9f09246e8d':
  Apply policy transparency to HotspotCondition and WiFi settings...

Change-Id: Ia7518fe9369e9f045ca120d1cb91ca81db0a5836
This commit is contained in:
Zoltan Szatmary-Ban
2016-04-19 13:32:20 +00:00
committed by android-build-merger
4 changed files with 58 additions and 9 deletions

View File

@@ -85,11 +85,13 @@
<!-- TODO: Better background -->
<View
android:id="@+id/divider"
android:layout_width="match_parent"
android:layout_height=".25dp"
android:background="@android:color/white" />
<com.android.internal.widget.ButtonBarLayout
android:id="@+id/buttonBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"