diff options
author | Michael Jurka <mikejurka@google.com> | 2010-09-14 17:35:20 -0700 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2010-09-14 17:56:01 -0700 |
commit | 1ff706b8c03063740ca74868fea46fa47d71bb27 (patch) | |
tree | 2e4d7b4fb2305d052032be774a4feeaeccf21440 /res | |
parent | cfc629446ca86366665263dba6520a7b978b7c3e (diff) | |
download | android_packages_apps_Trebuchet-1ff706b8c03063740ca74868fea46fa47d71bb27.tar.gz android_packages_apps_Trebuchet-1ff706b8c03063740ca74868fea46fa47d71bb27.tar.bz2 android_packages_apps_Trebuchet-1ff706b8c03063740ca74868fea46fa47d71bb27.zip |
fix two crashes
* fix crash where Workspace gets an ACTION_MOVE
but didn't get the ACTION_DOWN before it
* fix crash in DimmableBubbleTextView on
non-xlarge devices (buganizer bug#3001211)
Change-Id: I419b4a9fd3c95df9949f1d46746845ad2dc4b831
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/application.xml | 2 | ||||
-rw-r--r-- | res/layout-port/application.xml | 8 | ||||
-rw-r--r-- | res/layout-xlarge-land/application.xml | 18 | ||||
-rw-r--r-- | res/layout-xlarge-port/application.xml | 18 |
4 files changed, 41 insertions, 5 deletions
diff --git a/res/layout-land/application.xml b/res/layout-land/application.xml index 846c81c1d..6e8c31e11 100644 --- a/res/layout-land/application.xml +++ b/res/layout-land/application.xml @@ -14,5 +14,5 @@ limitations under the License. --> -<com.android.launcher2.DimmableBubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.launcher2.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" style="@style/WorkspaceIcon.Landscape" /> diff --git a/res/layout-port/application.xml b/res/layout-port/application.xml index ec6697658..32c1510d9 100644 --- a/res/layout-port/application.xml +++ b/res/layout-port/application.xml @@ -4,9 +4,9 @@ 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. @@ -14,5 +14,5 @@ limitations under the License. --> -<com.android.launcher2.DimmableBubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/WorkspaceIcon.Portrait" /> +<com.android.launcher2.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/WorkspaceIcon.Portrait" /> diff --git a/res/layout-xlarge-land/application.xml b/res/layout-xlarge-land/application.xml new file mode 100644 index 000000000..d0c8d9bf6 --- /dev/null +++ b/res/layout-xlarge-land/application.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 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.DimmableBubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/WorkspaceIcon.Landscape" />
\ No newline at end of file diff --git a/res/layout-xlarge-port/application.xml b/res/layout-xlarge-port/application.xml new file mode 100644 index 000000000..ec6697658 --- /dev/null +++ b/res/layout-xlarge-port/application.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2008 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.DimmableBubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/WorkspaceIcon.Portrait" /> |