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

Merge "Clean up styles and delete unused layout for action buttons"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-04 17:58:37 +00:00
committed by Android (Google) Code Review
parent 513d334ef3 797d2e126a
commit 6c753e8847
5 changed files with 5 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
res/layout/app_action_buttons.xml
View File

@@ -1,44 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2016 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.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingTop="8dp"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:orientation="horizontal">
<Button
android:id="@+id/left_button"
style="@style/AppActionPrimaryButton"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp" />
<Button
android:id="@+id/right_button"
style="@style/AppActionPrimaryButton"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp" />
</LinearLayout>

2
res/layout/instant_app_buttons.xml
View File

@@ -26,7 +26,7 @@
android:visibility="gone">
<Button
android:id="@+id/install"
style="@style/AppActionPrimaryButton"
style="@style/ActionPrimaryButton"
android:enabled="false"
android:layout_width="0dp"
android:layout_weight="1"

2
res/layout/manage_data_plans_preference.xml
View File

@@ -28,5 +28,5 @@
android:layout_height="wrap_content"
android:text="@string/data_plan_usage_manage_plans_button_text"
android:textAllCaps="true"
style="@style/AppActionPrimaryButton" />
style="@style/ActionPrimaryButton" />
</FrameLayout>

4
res/layout/two_action_buttons.xml
View File

@@ -31,7 +31,7 @@
android:layout_height="wrap_content">
<Button
android:id="@+id/button1_positive"
style="@style/AppActionPrimaryButton"
style="@style/ActionPrimaryButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp" />
@@ -48,7 +48,7 @@
android:layout_height="wrap_content">
<Button
android:id="@+id/button2_positive"
style="@style/AppActionPrimaryButton"
style="@style/ActionPrimaryButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp" />

2
res/values/styles.xml
View File

@@ -421,7 +421,7 @@
<item name="android:textSize">16sp</item>
</style>
<style name="AppActionPrimaryButton" parent="android:Widget.Material.Button.Colored"/>
<style name="ActionPrimaryButton" parent="android:Widget.Material.Button.Colored"/>
<style name="ActionSecondaryButton" parent="android:Widget.Material.Button"/>