summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorAnthony Hugh <ahugh@google.com>2015-03-24 19:22:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-24 19:22:00 +0000
commitea6ae3406ff74d018d16638168f8cc776ae9153d (patch)
treea839e58cb15e2dda3f56de8e866a7ff6a858d219 /core/res
parente7f931c4505a6bd62e01bef5193dd724571a672b (diff)
parent0ab653cb1d50ec4a43f3cbb8c779b5d66f0118ea (diff)
downloadframeworks_base-ea6ae3406ff74d018d16638168f8cc776ae9153d.zip
frameworks_base-ea6ae3406ff74d018d16638168f8cc776ae9153d.tar.gz
frameworks_base-ea6ae3406ff74d018d16638168f8cc776ae9153d.tar.bz2
am 0ab653cb: am b8f28ba0: am 457b8838: Update progress_dialog on watch to use small spinner
* commit '0ab653cb1d50ec4a43f3cbb8c779b5d66f0118ea': Update progress_dialog on watch to use small spinner
Diffstat (limited to 'core/res')
-rw-r--r--core/res/res/layout-watch/progress_dialog_material.xml47
1 files changed, 47 insertions, 0 deletions
diff --git a/core/res/res/layout-watch/progress_dialog_material.xml b/core/res/res/layout-watch/progress_dialog_material.xml
new file mode 100644
index 0000000..228f724
--- /dev/null
+++ b/core/res/res/layout-watch/progress_dialog_material.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2015 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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <LinearLayout
+ android:id="@+id/body"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:baselineAligned="false"
+ android:paddingStart="?attr/dialogPreferredPadding"
+ android:paddingTop="@dimen/dialog_padding_top_material"
+ android:paddingEnd="?attr/dialogPreferredPadding"
+ android:paddingBottom="@dimen/dialog_padding_top_material">
+
+ <ProgressBar
+ android:id="@id/progress"
+ style="?android:attr/progressBarStyleSmall"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:max="10000"
+ android:layout_marginEnd="?attr/dialogPreferredPadding" />
+
+ <TextView
+ android:id="@+id/message"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical" />
+ </LinearLayout>
+</FrameLayout>