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

Commit 329b9ff0 authored by Todd Lee's avatar Todd Lee Committed by Android (Google) Code Review
Browse files

Merge "Add message view in wear alert dialog."

parents ef3dad14 963128ba

core/res/res/layout-watch/alert_dialog_progress_material.xml

0 → 100644
+50 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2014 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.

-->



<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="wrap_content"

    android:layout_height="match_parent"

    android:paddingStart="?attr/dialogPreferredPadding"

    android:paddingTop="@dimen/dialog_padding_top_material"

    android:paddingEnd="?attr/dialogPreferredPadding"

    android:paddingBottom="@dimen/dialog_padding_top_material">

    <TextView

        android:id="@+id/progress_dialog_message"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_centerInParent="true"

        style="@style/ProgressDialogMessage" />

    <ProgressBar

        android:id="@+id/progress"

        style="?attr/progressBarStyleHorizontal"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentBottom="true"

        android:layout_centerHorizontal="true" />

    <TextView

        android:id="@+id/progress_percent"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentStart="true"

        android:layout_below="@id/progress" />

    <TextView

        android:id="@+id/progress_number"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentEnd="true"

        android:layout_below="@id/progress" />

</RelativeLayout>

core/res/res/values-watch/dimens_material.xml

+7 −0
Original line number Diff line number Diff line
@@ -45,6 +45,13 @@ 
    <dimen name="progress_bar_size_medium">32dip</dimen>

    <dimen name="progress_bar_size_large">64dip</dimen>



    <!-- Progress bar message dimens -->

    <dimen name="message_progress_dialog_text_size">18sp</dimen>

    <dimen name="message_progress_dialog_bottom_padding">80px</dimen>

    <dimen name="message_progress_dialog_top_padding">0dp</dimen>

    <dimen name="message_progress_dialog_start_padding">0dp</dimen>

    <dimen name="message_progress_dialog_end_padding">0dp</dimen>



    <!-- fallback for screen percentage widths -->

    <dimen name="screen_percentage_05">0dp</dimen>

    <dimen name="screen_percentage_10">0dp</dimen>

core/res/res/values-watch/styles_material.xml

+10 −0
Original line number Diff line number Diff line
@@ -97,4 +97,14 @@ please see styles_device_defaults.xml. 
        <item name="gravity">center_horizontal|top</item>

        <item name="ellipsize">end</item>

    </style>



    <style name="ProgressDialogMessage">

        <item name="android:textAlignment">center</item>

        <item name="textAppearance">@android:style/TextAppearance.DeviceDefault.Medium</item>

        <item name="textSize">@dimen/message_progress_dialog_text_size</item>

        <item name="paddingBottom">@dimen/message_progress_dialog_bottom_padding</item>

        <item name="paddingEnd">@dimen/message_progress_dialog_end_padding</item>

        <item name="paddingStart">@dimen/message_progress_dialog_start_padding</item>

        <item name="paddingTop">@dimen/message_progress_dialog_top_padding</item>

    </style>

</resources>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ 
  <java-symbol type="id" name="progress_horizontal" />

  <java-symbol type="id" name="progress_number" />

  <java-symbol type="id" name="progress_percent" />

  <java-symbol type="id" name="progress_dialog_message" />

  <java-symbol type="id" name="progressContainer" />

  <java-symbol type="id" name="rew" />

  <java-symbol type="id" name="rightSpacer" />