resolved conflicts for merge of a3e22d6a to master

Change-Id: I8770574acf86e280a9d15d4309686111260e09d9

1 files changed, 36 insertions, 0 deletions

diff --git a/res/layout-sw720dp/market_button.xml b/res/layout-sw720dp/market_button.xml
new file mode 100644
index 000000000..7eaeafac3
--- /dev/null
+++ b/res/layout-sw720dp/market_button.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/MarketButton"
+    android:onClick="onClickAppMarketButton"
+    android:gravity="center"
+    android:paddingLeft="32dp"
+    android:paddingRight="32dp"
+    android:drawablePadding="10dp"
+    android:background="@drawable/tab_widget_indicator_selector"
+    android:text="@string/market"
+    android:contentDescription="@string/market"
+    android:textColor="@color/workspace_all_apps_and_delete_zone_text_color"
+    android:textStyle="bold"
+    android:textSize="14sp"
+    android:textAllCaps="true"
+    android:shadowColor="@color/workspace_all_apps_and_delete_zone_text_shadow_color"
+    android:shadowDx="0.0"
+    android:shadowDy="0.0"
+    android:shadowRadius="2.0"
+    android:focusable="true"
+    android:clickable="true" />