diff --git a/Android.mk b/Android.mk index 5c95d204568e8..4ff272c93526b 100644 --- a/Android.mk +++ b/Android.mk @@ -87,6 +87,7 @@ LOCAL_SRC_FILES += \ core/java/android/app/ISearchManagerCallback.aidl \ core/java/android/app/IServiceConnection.aidl \ core/java/android/app/IStatusBar.aidl \ + core/java/android/app/IPoo.aidl \ core/java/android/app/IThumbnailReceiver.aidl \ core/java/android/app/ITransientNotification.aidl \ core/java/android/app/IUiModeManager.aidl \ diff --git a/core/java/android/app/IPoo.aidl b/core/java/android/app/IPoo.aidl new file mode 100644 index 0000000000000..5d5d6f3c68a2d --- /dev/null +++ b/core/java/android/app/IPoo.aidl @@ -0,0 +1,23 @@ +/** + * Copyright (c) 2007, 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 android.app; + +/** @hide */ +interface IPoo +{ +} + diff --git a/core/java/android/app/IStatusBar.aidl b/core/java/android/app/IStatusBar.aidl index c64fa50f1dcd1..696fffe547a2f 100644 --- a/core/java/android/app/IStatusBar.aidl +++ b/core/java/android/app/IStatusBar.aidl @@ -16,6 +16,8 @@ package android.app; +import android.app.IPoo; + /** @hide */ interface IStatusBar { @@ -26,4 +28,7 @@ interface IStatusBar IBinder addIcon(String slot, String iconPackage, int iconId, int iconLevel); void updateIcon(IBinder key, String slot, String iconPackage, int iconId, int iconLevel); void removeIcon(IBinder key); + + // ---- Methods below are for use by the status bar policy services ---- + void registerStatusBar(IPoo callbacks); } diff --git a/packages/StatusBarPhone/Android.mk b/packages/StatusBarPhone/Android.mk new file mode 100644 index 0000000000000..b3d0558daa953 --- /dev/null +++ b/packages/StatusBarPhone/Android.mk @@ -0,0 +1,13 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := optional + +LOCAL_SRC_FILES := $(call all-subdir-java-files) + +LOCAL_JAVA_LIBRARIES := services + +LOCAL_PACKAGE_NAME := StatusBarPhone +LOCAL_CERTIFICATE := platform + +include $(BUILD_PACKAGE) diff --git a/packages/StatusBarPhone/AndroidManifest.xml b/packages/StatusBarPhone/AndroidManifest.xml new file mode 100644 index 0000000000000..7aa558e55cab1 --- /dev/null +++ b/packages/StatusBarPhone/AndroidManifest.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + diff --git a/packages/StatusBarPhone/MODULE_LICENSE_APACHE2 b/packages/StatusBarPhone/MODULE_LICENSE_APACHE2 new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/packages/StatusBarPhone/NOTICE b/packages/StatusBarPhone/NOTICE new file mode 100644 index 0000000000000..c5b1efa7aac76 --- /dev/null +++ b/packages/StatusBarPhone/NOTICE @@ -0,0 +1,190 @@ + + Copyright (c) 2005-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. + + 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. + + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + diff --git a/packages/StatusBarPhone/res/drawable-hdpi/ic_launcher_settings.png b/packages/StatusBarPhone/res/drawable-hdpi/ic_launcher_settings.png new file mode 100644 index 0000000000000..ff34a7ffcc4f5 Binary files /dev/null and b/packages/StatusBarPhone/res/drawable-hdpi/ic_launcher_settings.png differ diff --git a/packages/StatusBarPhone/res/drawable-mdpi/ic_launcher_settings.png b/packages/StatusBarPhone/res/drawable-mdpi/ic_launcher_settings.png new file mode 100644 index 0000000000000..b08ad3bd494bf Binary files /dev/null and b/packages/StatusBarPhone/res/drawable-mdpi/ic_launcher_settings.png differ diff --git a/packages/StatusBarPhone/res/values/defaults.xml b/packages/StatusBarPhone/res/values/defaults.xml new file mode 100644 index 0000000000000..34302c4792abe --- /dev/null +++ b/packages/StatusBarPhone/res/values/defaults.xml @@ -0,0 +1,78 @@ + + + + true + 60000 + false + + cell,bluetooth,wifi + wifi + true + true + + 102 + false + 100% + 100% + true + + false + false + + gps + true + + 1 + true + false + true + + false + + + true + + true + false + true + true + + true + + 2 + + + 1 + /system/media/audio/ui/LowBattery.ogg + 0 + /system/media/audio/ui/Dock.ogg + /system/media/audio/ui/Undock.ogg + /system/media/audio/ui/Dock.ogg + /system/media/audio/ui/Undock.ogg + 0 + /system/media/audio/ui/Lock.ogg + /system/media/audio/ui/Unlock.ogg + + + true + diff --git a/packages/StatusBarPhone/res/values/strings.xml b/packages/StatusBarPhone/res/values/strings.xml new file mode 100644 index 0000000000000..40ac66aac78d9 --- /dev/null +++ b/packages/StatusBarPhone/res/values/strings.xml @@ -0,0 +1,22 @@ + + + + + Status Bar + diff --git a/packages/StatusBarPhone/res/xml/bookmarks.xml b/packages/StatusBarPhone/res/xml/bookmarks.xml new file mode 100644 index 0000000000000..dfaeeaf6553c6 --- /dev/null +++ b/packages/StatusBarPhone/res/xml/bookmarks.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarService.java b/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarService.java new file mode 100644 index 0000000000000..d18fce739ddcd --- /dev/null +++ b/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarService.java @@ -0,0 +1,96 @@ +/* + * 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.policy.statusbar.phone; + +import android.app.Service; +import android.app.IStatusBar; +import android.app.IPoo; +import android.content.Context; +import android.content.Intent; +import android.graphics.PixelFormat; +import android.os.IBinder; +import android.os.RemoteException; +import android.os.ServiceManager; +import android.os.SystemClock; +import android.util.Log; +import android.view.Gravity; +import android.view.View; +import android.view.ViewGroup; +import android.view.Window; +import android.view.WindowManager; +import android.view.WindowManagerImpl; + +public class StatusBarService extends Service { + private static final String TAG = "StatusBarService"; + + Bar mBar = new Bar(); + IStatusBar mBarService; + + @Override + public void onCreate() { + // Put up the view + addStatusBarView(); + + // Connect in to the status bar manager service + mBarService = IStatusBar.Stub.asInterface( + ServiceManager.getService(Context.STATUS_BAR_SERVICE)); + try { + mBarService.registerStatusBar(mBar); + } catch (RemoteException ex) { + // If the system process isn't there we're doomed anyway. + } + } + + @Override + public void onDestroy() { + // we're never destroyed + } + + /** + * Nobody binds to us. + */ + @Override + public IBinder onBind(Intent intent) { + return null; + } + + class Bar extends IPoo.Stub { + } + + // ================================================================================ + // Constructing the view + // ================================================================================ + private void addStatusBarView() { + final View view = new View(this); + + // TODO final StatusBarView view = mStatusBarView; + WindowManager.LayoutParams lp = new WindowManager.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, + view.getContext().getResources().getDimensionPixelSize( + com.android.internal.R.dimen.status_bar_height), + WindowManager.LayoutParams.TYPE_STATUS_BAR, + WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE| + WindowManager.LayoutParams.FLAG_TOUCHABLE_WHEN_WAKING, + PixelFormat.RGB_888); + lp.gravity = Gravity.TOP | Gravity.FILL_HORIZONTAL; + lp.setTitle("StatusBar"); + // TODO lp.windowAnimations = R.style.Animation_StatusBar; + + WindowManagerImpl.getDefault().addView(view, lp); + } +} + diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarStarter.java b/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarStarter.java new file mode 100644 index 0000000000000..d150596190e42 --- /dev/null +++ b/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarStarter.java @@ -0,0 +1,38 @@ +/* + * 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.policy.statusbar.phone; + +import android.content.Context; +import android.content.Intent; +import android.content.BroadcastReceiver; +import android.util.Log; + +/** + * Receive a broadcast from the StatusBarManagerService at boot time, and + * kick off the StatusBarService. + */ +public class StatusBarStarter extends BroadcastReceiver { + private static final String TAG = "StatusBarStarter"; + + @Override + public void onReceive(Context context, Intent intent) { + Log.d(TAG, "StatusBarStarter onReceive intent=" + intent); + context.startService(new Intent(context, StatusBarService.class)); + } +} + + diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 9d5d035b083af..65becb60b21cc 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -464,6 +464,7 @@ class ServerThread extends Thread { } // These are needed to propagate to the runnable below. + final StatusBarService statusBarF = statusBar; final BatteryService batteryF = battery; final ConnectivityService connectivityF = connectivity; final DockObserver dockF = dock; @@ -485,6 +486,7 @@ class ServerThread extends Thread { public void run() { Slog.i(TAG, "Making services ready"); + if (statusBarF != null) statusBarF.systemReady2(); if (batteryF != null) batteryF.systemReady(); if (connectivityF != null) connectivityF.systemReady(); if (dockF != null) dockF.systemReady(); diff --git a/services/java/com/android/server/status/StatusBarService.java b/services/java/com/android/server/status/StatusBarService.java index 93c8d34312a4b..1907c806fa847 100644 --- a/services/java/com/android/server/status/StatusBarService.java +++ b/services/java/com/android/server/status/StatusBarService.java @@ -22,6 +22,7 @@ import com.android.internal.util.CharSequences; import android.app.ActivityManagerNative; import android.app.Dialog; import android.app.IStatusBar; +import android.app.IPoo; import android.app.PendingIntent; import android.app.StatusBarManager; import android.content.BroadcastReceiver; @@ -88,6 +89,9 @@ public class StatusBarService extends IStatusBar.Stub static final String TAG = "StatusBar"; static final boolean SPEW = false; + public static final String ACTION_STATUSBAR_START + = "com.android.internal.policy.statusbar.START"; + static final int EXPANDED_LEAVE_ALONE = -10000; static final int EXPANDED_FULL_OPEN = -10001; @@ -346,7 +350,13 @@ public class StatusBarService extends IStatusBar.Stub lp.setTitle("StatusBar"); lp.windowAnimations = R.style.Animation_StatusBar; - WindowManagerImpl.getDefault().addView(view, lp); + //WindowManagerImpl.getDefault().addView(view, lp); + } + + public void systemReady2() { + // Start the status bar app + Intent intent = new Intent(ACTION_STATUSBAR_START); + mContext.sendBroadcast(intent /** permission **/); } // ================================================================================ @@ -412,6 +422,11 @@ public class StatusBarService extends IStatusBar.Stub "StatusBarService"); } + public void registerStatusBar(IPoo bar) { + Slog.d(TAG, "registerStatusBar bar=" + bar); + } + + // ================================================================================ // Can be called from any thread // ================================================================================