diff options
author | Michael Jurka <mikejurka@google.com> | 2012-10-08 13:21:35 +0200 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2012-10-08 15:53:53 +0200 |
commit | 45355c4596f396d7e7247e91de850646356bd104 (patch) | |
tree | f847e46f9ef60e7dda14978cbdc139c5f09726d1 /res/layout | |
parent | 914d55501146cf2c3abdf52c021b40fa789d211a (diff) | |
download | android_packages_apps_Trebuchet-45355c4596f396d7e7247e91de850646356bd104.tar.gz android_packages_apps_Trebuchet-45355c4596f396d7e7247e91de850646356bd104.tar.bz2 android_packages_apps_Trebuchet-45355c4596f396d7e7247e91de850646356bd104.zip |
Re-merge "Add support for custom manta cling"
Also, fix issue where mako was crashing because
Launcher was trying to load a custom cling for it.
It was doing this because a custom home layout was
specified by SetupWizard, but for now we only want
custom clings on large devices
Bug: 7302705
Bug: 6992663
This reverts commit 2ebcf509f038f435ca8819dc098a7cb480bed0d9.
Change-Id: I46533309d5c62edfbd3a3b178c6965ffc73b6476
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/custom_workspace_cling.xml | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/res/layout/custom_workspace_cling.xml b/res/layout/custom_workspace_cling.xml new file mode 100644 index 000000000..5bdc58719 --- /dev/null +++ b/res/layout/custom_workspace_cling.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 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. +--> +<!-- dummy layout, to be replaced in overlays --> +<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="workspace_custom"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="20dp" + android:textColor="@android:color/holo_blue_light" + android:text="@string/dummy_custom_cling_error_message" + android:gravity="left" + android:layout_gravity="bottom|left" + /> +</com.android.launcher2.Cling> |