diff options
author | Jim Miller <jaggies@google.com> | 2010-09-02 18:08:05 -0700 |
---|---|---|
committer | Jim Miller <jaggies@google.com> | 2010-09-03 17:44:57 -0700 |
commit | 783cb60ddb7cde1349ca531c7b96ad67d5053cd2 (patch) | |
tree | d53d80afb802f3ebca636448fcadcc5e8fdf330f /packages/SystemUI | |
parent | 2cb3e29e823de1130c7649c0c515485917ab188c (diff) | |
download | frameworks_base-783cb60ddb7cde1349ca531c7b96ad67d5053cd2.zip frameworks_base-783cb60ddb7cde1349ca531c7b96ad67d5053cd2.tar.gz frameworks_base-783cb60ddb7cde1349ca531c7b96ad67d5053cd2.tar.bz2 |
Update RecentApplications to use shared Carousel widget.
Change-Id: I5ca7389aeca9ee6f03f48317f9d1034f9fb8c1ca
Diffstat (limited to 'packages/SystemUI')
3 files changed, 45 insertions, 4 deletions
diff --git a/packages/SystemUI/Android.mk b/packages/SystemUI/Android.mk index 910e84e..cfad939 100644 --- a/packages/SystemUI/Android.mk +++ b/packages/SystemUI/Android.mk @@ -3,10 +3,13 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(call all-subdir-java-files) +LOCAL_SRC_FILES := $(call all-subdir-java-files) \ + ../../../ex/carousel/java/com/android/ex/carousel/carousel.rs LOCAL_JAVA_LIBRARIES := services +LOCAL_STATIC_JAVA_LIBRARIES := android-common-carousel + LOCAL_PACKAGE_NAME := SystemUI LOCAL_CERTIFICATE := platform diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/RecentApplicationsActivity.java b/packages/SystemUI/src/com/android/systemui/statusbar/RecentApplicationsActivity.java index a5ba7e2..6e5d241 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/RecentApplicationsActivity.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/RecentApplicationsActivity.java @@ -17,14 +17,13 @@ package com.android.systemui.statusbar; +import com.android.ex.carousel.CarouselView; +import com.android.ex.carousel.CarouselRS.CarouselCallback; import com.android.internal.R; import java.util.ArrayList; import java.util.List; -import com.android.internal.widget.CarouselView; -import com.android.internal.widget.CarouselRS.CarouselCallback; - import android.app.Activity; import android.app.ActivityManager; import android.app.IThumbnailReceiver; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/RecentApplicationsCarouselView.java b/packages/SystemUI/src/com/android/systemui/statusbar/RecentApplicationsCarouselView.java new file mode 100644 index 0000000..f5fcb11 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/RecentApplicationsCarouselView.java @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2010 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. + */ + +package com.android.systemui.statusbar; + +import android.content.Context; +import android.util.AttributeSet; + +import com.android.ex.carousel.CarouselView; +import com.android.systemui.R; + +public class RecentApplicationsCarouselView extends CarouselView { + + public RecentApplicationsCarouselView(Context context) { + this(context, null); + } + + public RecentApplicationsCarouselView(Context context, AttributeSet attrs) { + super(context, attrs); + } + + public Info getRenderScriptInfo() { + return new Info(R.raw.carousel); + } + +} |