summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorPauloftheWest <paulofthewest@google.com>2014-09-10 10:18:30 -0700
committerPauloftheWest <paulofthewest@google.com>2014-09-10 15:03:59 -0700
commitaddfd25b639047e8463772b14f249758bdb20fbc (patch)
tree2c519542618ad4cde4edfab221bc9b1401aabd7e /res/values
parent4d3f577e6896449b8162983d17dd2b4a771623e2 (diff)
downloadandroid_packages_apps_Bluetooth-addfd25b639047e8463772b14f249758bdb20fbc.tar.gz
android_packages_apps_Bluetooth-addfd25b639047e8463772b14f249758bdb20fbc.tar.bz2
android_packages_apps_Bluetooth-addfd25b639047e8463772b14f249758bdb20fbc.zip
Applied Material theme to Bluetooth file acceptance dialog.
Bug: 17334507 Change-Id: I36d3ef5575ad84a27cda415c1d0e262f097e98a7
Diffstat (limited to 'res/values')
-rw-r--r--res/values/strings.xml8
-rw-r--r--res/values/styles.xml48
2 files changed, 55 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 623a09223..f1e2ca16f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -68,7 +68,7 @@
<!--Title -->
<string name="incoming_file_confirm_title">File transfer</string>
<!--content -->
- <string name="incoming_file_confirm_content">\u0022<xliff:g id="sender">%1$s</xliff:g>\u0022 wants to send you <xliff:g id="file">%2$s</xliff:g> (<xliff:g id="size">%3$s</xliff:g>). \n\n Accept the file? </string>
+ <string name="incoming_file_confirm_content">Accept incoming file? </string>
<!-- Label for a cancel button. -->
<string name="incoming_file_confirm_cancel">Decline</string>
<!-- Label for a confirm button.-->
@@ -118,6 +118,12 @@
<string name="download_cancel">Stop</string>
<!-- Label for a hide button.-->
<string name="download_ok">Hide</string>
+ <!--Line 1 -->
+ <string name="incoming_line1">From</string>
+ <!--Line 2 -->
+ <string name="incoming_line2">Filename</string>
+ <!--Line 3 -->
+ <string name="incoming_line3">Size</string>
<!-- Bluetooth failed Download Dialog -->
<!--Line 1 -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
new file mode 100644
index 000000000..cd6116e2b
--- /dev/null
+++ b/res/values/styles.xml
@@ -0,0 +1,48 @@
+<?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.
+-->
+
+<resources>
+
+ <style name="Theme.Material.Settings.Floating" parent="@android:style/Theme.Material.Settings">
+ <item name="android:windowIsFloating">true</item>
+ <item name="android:windowCloseOnTouchOutside">false</item>
+ <item name="android:colorBackgroundCacheHint">@null</item>
+ <item name="android:backgroundDimEnabled">true</item>
+ </style>
+
+ <style name="file_transfer_item_label">
+ <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_marginStart">20dip</item>
+ <item name="android:layout_marginEnd">20dip</item>
+ <item name="android:paddingTop">10dip</item>
+ <item name="android:textAlignment">viewStart</item>
+ <item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
+ <item name="android:textColor">@*android:color/secondary_text_default_material_light</item>
+ </style>
+
+ <style name="file_transfer_item_content">
+ <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_marginStart">20dip</item>
+ <item name="android:layout_marginEnd">20dip</item>
+ <item name="android:paddingBottom">10dip</item>
+ <item name="android:textAlignment">viewStart</item>
+ <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
+ <item name="android:textColor">@*android:color/primary_text_default_material_light</item>
+ </style>
+
+</resources>