diff options
| author | Joe Onorato <joeo@google.com> | 2010-09-08 15:23:18 -0400 |
|---|---|---|
| committer | Joe Onorato <joeo@google.com> | 2010-09-08 17:27:41 -0400 |
| commit | 013cfc1116e3382981aa0da903d97fc4fdb2c791 (patch) | |
| tree | 0b35fda495c25a995d388aad0482f84e8b1b3f4e /packages/SystemUI/src/com/android/systemui | |
| parent | 35dc79da11639117aab34d3278a7ae90984c0f87 (diff) | |
| download | frameworks_base-013cfc1116e3382981aa0da903d97fc4fdb2c791.zip frameworks_base-013cfc1116e3382981aa0da903d97fc4fdb2c791.tar.gz frameworks_base-013cfc1116e3382981aa0da903d97fc4fdb2c791.tar.bz2 | |
move recent apps around, attempting to make it not crash.
I think the problem is some kind of Context mismatch because the resource was in the framework but
referencing an app class.
Change-Id: Ia6b37c9c8be5dddc836331859e779cd80dd32596
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/recent/RecentApplicationsActivity.java (renamed from packages/SystemUI/src/com/android/systemui/statusbar/RecentApplicationsActivity.java) | 5 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/recent/RecentApplicationsCarouselView.java (renamed from packages/SystemUI/src/com/android/systemui/statusbar/RecentApplicationsCarouselView.java) | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarService.java | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/RecentApplicationsActivity.java b/packages/SystemUI/src/com/android/systemui/recent/RecentApplicationsActivity.java index 6e5d241..6838dda 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/RecentApplicationsActivity.java +++ b/packages/SystemUI/src/com/android/systemui/recent/RecentApplicationsActivity.java @@ -15,11 +15,12 @@ */ -package com.android.systemui.statusbar; +package com.android.systemui.recent; + +import com.android.systemui.R; 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; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/RecentApplicationsCarouselView.java b/packages/SystemUI/src/com/android/systemui/recent/RecentApplicationsCarouselView.java index f5fcb11..1c8ec95 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/RecentApplicationsCarouselView.java +++ b/packages/SystemUI/src/com/android/systemui/recent/RecentApplicationsCarouselView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.statusbar; +package com.android.systemui.recent; import android.content.Context; import android.util.AttributeSet; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarService.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarService.java index 814d375..6f74924 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarService.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarService.java @@ -47,6 +47,7 @@ import com.android.internal.statusbar.StatusBarIcon; import com.android.internal.statusbar.StatusBarNotification; import com.android.systemui.statusbar.*; +import com.android.systemui.recent.RecentApplicationsActivity; import com.android.systemui.R; public class TabletStatusBarService extends StatusBarService { |