Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 458b7165 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Merge Theme.Micro and Theme.Material." into nyc-mr1-dev

parents 0c41f4bc 5a861676

core/res/res/values-round/dimens_micro.xml→core/res/res/drawable-watch/dialog_background_material.xml

+4 −5
Original line number Diff line number Diff line
@@ -13,8 +13,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<resources>

    <dimen name="dialog_padding_micro">32dp</dimen>

    <dimen name="list_item_padding_left_micro">40dp</dimen>

    <dimen name="list_item_padding_right_micro">24dp</dimen>

</resources>
 


<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">

    <solid android:color="?attr/colorBackground" />

</shape>

core/res/res/layout/alert_dialog_micro.xml→core/res/res/layout-watch/alert_dialog_material.xml

+12 −12
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ 
                android:layout_height="wrap_content">

            <!-- Top Panel -->

            <FrameLayout

                    android:paddingLeft="@dimen/dialog_padding_micro"

                    android:paddingRight="@dimen/dialog_padding_micro"

                    android:paddingLeft="?dialogPreferredPadding"

                    android:paddingRight="?dialogPreferredPadding"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:id="@+id/topPanel">
@@ -48,9 +48,9 @@ 
                <TextView android:id="@+id/message"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:textAppearance="@style/TextAppearance.Micro.AlertDialog.Message"

                        android:paddingStart="@dimen/dialog_padding_micro"

                        android:paddingEnd="@dimen/dialog_padding_micro"

                        android:textAppearance="@style/TextAppearance.Material.Body1"

                        android:paddingStart="?dialogPreferredPadding"

                        android:paddingEnd="?dialogPreferredPadding"

                        android:paddingTop="8dip"

                        android:paddingBottom="8dip"/>

            </FrameLayout>
@@ -78,31 +78,31 @@ 
                        android:dividerPadding="0dip"

                        android:orientation="vertical"

                        android:minHeight="@dimen/alert_dialog_button_bar_height"

                        android:paddingBottom="@dimen/dialog_padding_micro"

                        android:paddingBottom="?dialogPreferredPadding"

                        style="?android:attr/buttonBarStyle"

                        android:layoutDirection="locale"

                        android:measureWithLargestChild="true">

                    <Button android:id="@+id/button1"

                            android:layout_gravity="start"

                            android:layout_weight="1"

                            android:layout_marginLeft="@dimen/dialog_padding_micro"

                            android:layout_marginRight="@dimen/dialog_padding_micro"

                            android:layout_marginLeft="?dialogPreferredPadding"

                            android:layout_marginRight="?dialogPreferredPadding"

                            style="?android:attr/buttonBarButtonStyle"

                            android:layout_width="match_parent"

                            android:layout_height="wrap_content" />

                    <Button android:id="@+id/button3"

                            android:layout_gravity="start"

                            android:layout_weight="1"

                            android:layout_marginLeft="@dimen/dialog_padding_micro"

                            android:layout_marginRight="@dimen/dialog_padding_micro"

                            android:layout_marginLeft="?dialogPreferredPadding"

                            android:layout_marginRight="?dialogPreferredPadding"

                            style="?android:attr/buttonBarButtonStyle"

                            android:layout_width="match_parent"

                            android:layout_height="wrap_content" />

                    <Button android:id="@+id/button2"

                            android:layout_gravity="start"

                            android:layout_weight="1"

                            android:layout_marginLeft="@dimen/dialog_padding_micro"

                            android:layout_marginRight="@dimen/dialog_padding_micro"

                            android:layout_marginLeft="?dialogPreferredPadding"

                            android:layout_marginRight="?dialogPreferredPadding"

                            style="?android:attr/buttonBarButtonStyle"

                            android:layout_width="match_parent"

                            android:layout_height="wrap_content" />