Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
3e124daeb1
2 changed files with 2 additions and 2 deletions
|
@ -19,11 +19,11 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="200dp" />
|
||||
|
||||
<!-- android:background="@drawable/quick_action_controls_background" -->
|
||||
<LinearLayout
|
||||
android:id="@+id/controls"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="24dp"
|
||||
android:background="@drawable/quick_action_controls_background"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageButton
|
||||
|
|
|
@ -19,11 +19,11 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="200dp" />
|
||||
|
||||
<!-- android:background="@drawable/quick_action_controls_background" -->
|
||||
<LinearLayout
|
||||
android:id="@+id/controls"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="48dp"
|
||||
android:background="@drawable/quick_action_controls_background"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageButton
|
||||
|
|
Loading…
Reference in a new issue