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 | |
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')
-rw-r--r-- | packages/SystemUI/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | packages/SystemUI/res/layout/recent_apps_activity.xml | 55 | ||||
-rw-r--r-- | packages/SystemUI/res/values/strings.xml | 13 | ||||
-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 |
6 files changed, 74 insertions, 4 deletions
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index c81da70..f1f31cf 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -29,7 +29,7 @@ android:excludeFromRecents="true"> </activity> - <activity android:name=".statusbar.RecentApplicationsActivity" + <activity android:name=".recent.RecentApplicationsActivity" android:theme="@android:style/Theme.NoTitleBar" android:excludeFromRecents="true" android:exported="true"> diff --git a/packages/SystemUI/res/layout/recent_apps_activity.xml b/packages/SystemUI/res/layout/recent_apps_activity.xml new file mode 100644 index 0000000..ec661e8 --- /dev/null +++ b/packages/SystemUI/res/layout/recent_apps_activity.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 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. +*/ +--> + +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <!-- Title --> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="#80FFFFFF" + android:textStyle="bold" + android:singleLine="true" + android:text="@string/recent_tasks_title" + android:visibility="gone"/> + + <!-- This is only intended to be visible when carousel is invisible --> + <TextView + android:id="@+id/no_applications_message" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:textAppearance="?android:attr/textAppearanceSmall" + android:text="@string/recent_tasks_empty" + android:visibility="gone"/> + + <com.android.systemui.recent.RecentApplicationsCarouselView + android:id="@+id/carousel" + android:layout_width="match_parent" + android:layout_height="0dip" + android:layout_weight="1"> + </com.android.systemui.recent.RecentApplicationsCarouselView> + +</LinearLayout> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 2df3b6d..037dc4a 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -54,4 +54,17 @@ <!-- Name of the button that links to the Settings app. [MAXCHARS=NONE] --> <string name="system_panel_settings_button">Settings</string> + + <!-- Recent Tasks dialog: title + TODO: this should move to SystemUI.apk, but the code for the old + recent dialog is still in the framework + --> + <string name="recent_tasks_title">Recent</string> + <!-- Recent Tasks dialog: message when there are no recent applications + TODO: this should move to SystemUI.apk, but the code for the old + recent dialog is still in the framework + --> + <string name="recent_tasks_empty">No recent applications.</string> + + </resources> 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 { |