Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6c11c9d authored by DvTonder's avatar DvTonder
Browse files

Framework: Port CM9 features to CM10 (WIP) (Part 2 of 2) 

This commit includes:
 - Power menu Reboot
 - Power menu screenshot
 - Profiles
 - Lock screen Calendar
 - Lock screen Weather
 - Notification light customization
 - Battery light customization
 - IME Selector notification toggle
 - and a few more things to support Settings

I still need to add the attributions of all the original
authors.

Patch set 4  - Fixes Power menu reboot (Thx Ryan Welton for confirmation)
Patch set 5  - Rebase
Patch set 6  - IME Selector notification toggle (Rick C)
Patch set 7  - Add missing XHDPI ic_lockscreen_alarm_activated drawable
Patch set 8  - Preference support for Power Widget (WIP)
Patch set 9  - Add Chrome and Search Lock screen shortcut drawables
Patch seg 10 - Rebase, add Vol Wake support
Patch set 11 - Remove Lockscreen shortcut commit overlap

Change-Id: Ibd63116df90b06f6ce6adb8a0343059bbb999bfb
parent f55d1f6a

Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/app/IBackupAgent.aidl \

	core/java/android/app/IInstrumentationWatcher.aidl \

	core/java/android/app/INotificationManager.aidl \

	core/java/android/app/IProfileManager.aidl \

	core/java/android/app/IProcessObserver.aidl \

	core/java/android/app/ISearchManager.aidl \

	core/java/android/app/ISearchManagerCallback.aidl \
@@ -278,6 +279,8 @@ aidl_files := \ 
	frameworks/base/core/java/android/accounts/IAccountAuthenticator.aidl \

	frameworks/base/core/java/android/accounts/IAccountAuthenticatorResponse.aidl \

	frameworks/base/core/java/android/app/Notification.aidl \

	frameworks/base/core/java/android/app/NotificationGroup.aidl \

	frameworks/base/core/java/android/app/Profile.aidl \

	frameworks/base/core/java/android/app/PendingIntent.aidl \

	frameworks/base/core/java/android/bluetooth/BluetoothDevice.aidl \

	frameworks/base/core/java/android/bluetooth/BluetoothHealthAppConfiguration.aidl \

core/java/android/app/ConnectionSettings.java

0 → 100755
+216 −0
Original line number Diff line number Diff line 
package android.app;



import android.bluetooth.BluetoothAdapter;

import android.content.ContentResolver;

import android.content.Context;

import android.location.LocationManager;

import android.net.ConnectivityManager;

import android.net.wifi.WifiManager;

import android.net.wimax.WimaxHelper;

import android.os.Parcel;

import android.os.Parcelable;

import android.provider.Settings;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;



import java.io.IOException;



/** @hide */

public final class ConnectionSettings implements Parcelable {



    private int mConnectionId;

    private int mValue;

    private boolean mOverride;

    private boolean mDirty;



    public static final int PROFILE_CONNECTION_MOBILEDATA = 0;

    public static final int PROFILE_CONNECTION_WIFI = 1;

    public static final int PROFILE_CONNECTION_WIFIAP = 2;

    public static final int PROFILE_CONNECTION_WIMAX = 3;

    public static final int PROFILE_CONNECTION_GPS = 4;

    public static final int PROFILE_CONNECTION_SYNC = 5;

    public static final int PROFILE_CONNECTION_BLUETOOTH = 7;



    /** @hide */

    public static final Parcelable.Creator<ConnectionSettings> CREATOR = new Parcelable.Creator<ConnectionSettings>() {

        public ConnectionSettings createFromParcel(Parcel in) {

            return new ConnectionSettings(in);

        }



        @Override

        public ConnectionSettings[] newArray(int size) {

            return new ConnectionSettings[size];

        }

    };





    public ConnectionSettings(Parcel parcel) {

        readFromParcel(parcel);

    }



    public ConnectionSettings(int connectionId) {

        this(connectionId, 0, false);

    }



    public ConnectionSettings(int connectionId, int value, boolean override) {

        mConnectionId = connectionId;

        mValue = value;

        mOverride = override;

        mDirty = false;

    }



    public int getConnectionId() {

        return mConnectionId;

    }



    public int getValue() {

        return mValue;

    }



    public void setValue(int value) {

        mValue = value;

        mDirty = true;

    }



    public void setOverride(boolean override) {

        mOverride = override;

        mDirty = true;

    }



    public boolean isOverride() {

        return mOverride;

    }



    /** @hide */

    public boolean isDirty() {

        return mDirty;

    }



    public void processOverride(Context context) {

        BluetoothAdapter bta = BluetoothAdapter.getDefaultAdapter();

        LocationManager lm = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);

        WifiManager wm = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);

        ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);



        boolean forcedState = getValue() == 1;

        boolean currentState;



        switch (getConnectionId()) {

            case PROFILE_CONNECTION_MOBILEDATA:

                currentState = cm.getMobileDataEnabled();

                if (forcedState != currentState) {

                    cm.setMobileDataEnabled(forcedState);

                }

                break;

            case PROFILE_CONNECTION_BLUETOOTH:

                currentState = bta.isEnabled();

                if (forcedState && !currentState) {

                    bta.enable();

                } else if (!forcedState && currentState) {

                    bta.disable();

                }

                break;

            case PROFILE_CONNECTION_GPS:

                currentState = lm.isProviderEnabled(LocationManager.GPS_PROVIDER);

                if (currentState != forcedState) {

                    Settings.Secure.setLocationProviderEnabled(context.getContentResolver(),

                            LocationManager.GPS_PROVIDER, forcedState);

                }

                break;

            case PROFILE_CONNECTION_SYNC:

                currentState = ContentResolver.getMasterSyncAutomatically();

                if (forcedState != currentState) {

                    ContentResolver.setMasterSyncAutomatically(forcedState);

                }

                break;

            case PROFILE_CONNECTION_WIFI:

                int wifiApState = wm.getWifiApState();

                currentState = wm.isWifiEnabled();

                if (currentState != forcedState) {

                    // Disable wifi tether

                    if (forcedState && (wifiApState == WifiManager.WIFI_AP_STATE_ENABLING) ||

                            (wifiApState == WifiManager.WIFI_AP_STATE_ENABLED)) {

                        wm.setWifiApEnabled(null, false);

                    }

                    wm.setWifiEnabled(forcedState);

                }

                break;

            case PROFILE_CONNECTION_WIFIAP:

                int wifiState = wm.getWifiState();

                currentState = wm.isWifiApEnabled();

                if (currentState != forcedState) {

                    // Disable wifi

                    if (forcedState && (wifiState == WifiManager.WIFI_STATE_ENABLING) || (wifiState == WifiManager.WIFI_STATE_ENABLED)) {

                        wm.setWifiEnabled(false);

                    }

                    wm.setWifiApEnabled(null, forcedState);

                }

                break;

            case PROFILE_CONNECTION_WIMAX:

                if (WimaxHelper.isWimaxSupported(context)) {

                    currentState = WimaxHelper.isWimaxEnabled(context);

                    if (currentState != forcedState) {

                        WimaxHelper.setWimaxEnabled(context, forcedState);

                    }

                }

                break;

        }

    }



    /** @hide */

    public static ConnectionSettings fromXml(XmlPullParser xpp, Context context)

            throws XmlPullParserException, IOException {

        int event = xpp.next();

        ConnectionSettings connectionDescriptor = new ConnectionSettings(0);

        while (event != XmlPullParser.END_TAG || !xpp.getName().equals("connectionDescriptor")) {

            if (event == XmlPullParser.START_TAG) {

                String name = xpp.getName();

                if (name.equals("connectionId")) {

                    connectionDescriptor.mConnectionId = Integer.parseInt(xpp.nextText());

                } else if (name.equals("value")) {

                    connectionDescriptor.mValue = Integer.parseInt(xpp.nextText());

                } else if (name.equals("override")) {

                    connectionDescriptor.mOverride = Boolean.parseBoolean(xpp.nextText());

                }

            }

            event = xpp.next();

        }

        return connectionDescriptor;

    }



    /** @hide */

    public void getXmlString(StringBuilder builder, Context context) {

        builder.append("<connectionDescriptor>\n<connectionId>");

        builder.append(mConnectionId);

        builder.append("</connectionId>\n<value>");

        builder.append(mValue);

        builder.append("</value>\n<override>");

        builder.append(mOverride);

        builder.append("</override>\n</connectionDescriptor>\n");

    }



    @Override

    public int describeContents() {

        return 0;

    }



    /** @hide */

    @Override

    public void writeToParcel(Parcel dest, int flags) {

        dest.writeInt(mConnectionId);

        dest.writeInt(mOverride ? 1 : 0);

        dest.writeInt(mValue);

        dest.writeInt(mDirty ? 1 : 0);

    }



    /** @hide */

    public void readFromParcel(Parcel in) {

        mConnectionId = in.readInt();

        mOverride = in.readInt() != 0;

        mValue = in.readInt();

        mDirty = in.readInt() != 0;

    }





}

core/java/android/app/ContextImpl.java

+6 −0
Original line number Diff line number Diff line
@@ -485,6 +485,12 @@ class ContextImpl extends Context { 
                public Object getService(ContextImpl ctx) {

                    return WindowManagerImpl.getDefault(ctx.mPackageInfo.mCompatibilityInfo);

                }});



        registerService(PROFILE_SERVICE, new ServiceFetcher() {

                public Object createService(ContextImpl ctx) {

                    final Context outerContext = ctx.getOuterContext();

                    return new ProfileManager (outerContext, ctx.mMainThread.getHandler());

                }});

    }



    static ContextImpl getImpl(Context context) {

core/java/android/app/IProfileManager.aidl

0 → 100644
+50 −0
Original line number Diff line number Diff line 
/* //device/java/android/android/app/IProfileManager.aidl

**

** Copyright 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;



import android.app.Profile;

import android.app.NotificationGroup;

import android.os.ParcelUuid;



/** {@hide} */

interface IProfileManager

{

    boolean setActiveProfile(in ParcelUuid profileParcelUuid);

    boolean setActiveProfileByName(String profileName);

    Profile getActiveProfile();



    boolean addProfile(in Profile profile);

    boolean removeProfile(in Profile profile);

    void updateProfile(in Profile profile);



    Profile getProfile(in ParcelUuid profileParcelUuid);

    Profile getProfileByName(String profileName);

    Profile[] getProfiles();

    boolean profileExists(in ParcelUuid profileUuid);

    boolean profileExistsByName(String profileName);

    boolean notificationGroupExistsByName(String notificationGroupName);



    NotificationGroup[] getNotificationGroups();

    void addNotificationGroup(in NotificationGroup group);

    void removeNotificationGroup(in NotificationGroup group);

    void updateNotificationGroup(in NotificationGroup group);

    NotificationGroup getNotificationGroupForPackage(in String pkg);

    NotificationGroup getNotificationGroup(in ParcelUuid groupParcelUuid);



    void resetAll();

}

core/java/android/app/Notification.java

+9 −0
Original line number Diff line number Diff line
@@ -436,6 +436,15 @@ public class Notification implements Parcelable 
     */

    public static final String EXTRA_PEOPLE = "android.people";



    /**

     * Bit to be bitwise-ored into the {@link #flags} field that should be

     * set if this notification should force the led to pulse even if the

     * screen has been shut off while the notification was active.

     *

     * @hide

     */

    public static final int FLAG_FORCE_LED_SCREEN_OFF = 0x00000100;



    private Bundle extras;



    /**