PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove second_button from condition tile. It's never used."

Browse Source
This commit is contained in:
Fan Zhang
2018-10-16 21:42:05 +00:00
committed by Android (Google) Code Review
parent 1bd1e69f3c e3e7387105
commit 9c072cd621
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
res/layout/condition_tile.xml
View File

@@ -15,7 +15,8 @@
limitations under the License. limitations under the License.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/content" android:id="@+id/content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -35,7 +36,7 @@
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:layout_marginStart="14dp" android:layout_marginStart="14dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:tint="?android:attr/colorAccent" /> android:tint="?android:attr/colorAccent"/>
<TextView <TextView
android:id="@android:id/title" android:id="@android:id/title"
@@ -43,7 +44,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="14dp" android:layout_marginTop="14dp"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary" /> android:textColor="?android:attr/textColorPrimary"/>
</LinearLayout> </LinearLayout>
@@ -56,7 +57,7 @@
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:textAppearance="?android:attr/textAppearanceListItemSecondary" android:textAppearance="?android:attr/textAppearanceListItemSecondary"
android:alpha=".7" android:alpha=".7"
android:textColor="?android:attr/textColorPrimary" /> android:textColor="?android:attr/textColorPrimary"/>
<androidx.appcompat.widget.ButtonBarLayout <androidx.appcompat.widget.ButtonBarLayout
android:id="@+id/buttonBar" android:id="@+id/buttonBar"
@@ -76,20 +77,15 @@
android:alpha=".8" android:alpha=".8"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
style="?android:attr/buttonBarButtonStyle" /> style="?android:attr/buttonBarButtonStyle"/>
<Button <Space
android:id="@+id/second_action"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"/>
android:alpha=".8"
android:textAlignment="viewStart"
android:textColor="?android:attr/textColorPrimary"
style="?android:attr/buttonBarButtonStyle" />
</androidx.appcompat.widget.ButtonBarLayout> </androidx.appcompat.widget.ButtonBarLayout>
<include layout="@layout/horizontal_divider" /> <include layout="@layout/horizontal_divider"/>
</LinearLayout> </LinearLayout>