am 1d890971: Merge "sw600dp clings" into jb-dev

* commit '1d890971b4fa41b1d01f4967f5706497fa38fe58':
  sw600dp clings
This commit is contained in:
Andrew Flynn authored and Android Git Automerger committed 2012-05-18 14:21:41 -07:00
commit 8769126c3b
2 files changed
+103

No files matched your search

@@ -0,0 +1,51 @@
<?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.
-->
<com.android.launcher2.Cling
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
launcher:drawIdentifier="all_apps_portrait">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="20dp"
android:layout_marginTop="20dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
style="@style/ClingTitleText"
android:id="@+id/all_apps_cling_title"
android:text="@string/all_apps_cling_title" />
<TextView
style="@style/ClingText"
android:id="@+id/all_apps_cling_add_item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/all_apps_cling_add_item" />
</LinearLayout>
</FrameLayout>
<Button
style="@style/ClingButton"
android:id="@+id/cling_dismiss"
android:layout_width="118dp"
android:layout_height="54dp"
android:textSize="24sp"
android:layout_marginBottom="27dp"
android:layout_marginRight="36dp"
android:layout_gravity="bottom|right"
android:onClick="dismissAllAppsCling" />
</com.android.launcher2.Cling>
+52
View File
@@ -0,0 +1,52 @@
<?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.
-->
<com.android.launcher2.Cling
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
launcher:drawIdentifier="folder_portrait">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="20dp"
android:layout_marginRight="10dp"
android:layout_marginTop="@dimen/folderClingMarginTop">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
style="@style/ClingTitleText"
android:id="@+id/folder_cling_title"
android:text="@string/folder_cling_title" />
<TextView
style="@style/ClingText"
android:id="@+id/folder_cling_create_folder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/folder_cling_create_folder" />
</LinearLayout>
</FrameLayout>
<Button
style="@style/ClingButton"
android:id="@+id/cling_dismiss"
android:layout_width="118dp"
android:layout_height="54dp"
android:textSize="24sp"
android:layout_marginBottom="27dp"
android:layout_marginRight="36dp"
android:layout_gravity="bottom|right"
android:onClick="dismissFolderCling" />
</com.android.launcher2.Cling>