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

Commit 4da79e08 authored by Jason Monk's avatar Jason Monk
Browse files

First pass at drawer to Settings 

Change-Id: I94c3bc69ff773e48c33f59f37bfc0d91139c187a
parent 77c69c5a

AndroidManifest.xml

+195 −158

File changed.

Preview size limit exceeded, changes collapsed.

src/com/android/settings/CreateShortcut.java

+2 −23
Original line number Diff line number Diff line
@@ -31,19 +31,13 @@ import android.view.View; 
import android.view.View.MeasureSpec;

import android.widget.ImageView;

import android.widget.ListView;



import com.android.settings.Settings.TetherSettingsActivity;

import com.android.settings.dashboard.DashboardCategory;

import com.android.settings.dashboard.DashboardTile;

import com.android.settingslib.TetherUtil;



import java.util.ArrayList;

import java.util.List;



public class CreateShortcut extends LauncherActivity {



    private static final String TOP_LEVEL_HEADER = "com.android.settings.TOP_LEVEL_HEADER_ID";



    @Override

    protected Intent getTargetIntent() {

        Intent targetIntent = new Intent(Intent.ACTION_MAIN, null);
@@ -63,10 +57,8 @@ public class CreateShortcut extends LauncherActivity { 
        intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, itemForPosition(position).label);

        ResolveInfo resolveInfo = itemForPosition(position).resolveInfo;

        ActivityInfo activityInfo = resolveInfo.activityInfo;

        if (activityInfo.metaData != null && activityInfo.metaData.containsKey(TOP_LEVEL_HEADER)) {

            int topLevelId = activityInfo.metaData.getInt(TOP_LEVEL_HEADER);

            int resourceId = getDrawableResource(topLevelId);

            intent.putExtra(Intent.EXTRA_SHORTCUT_ICON, createIcon(resourceId));

        if (activityInfo.icon != 0) {

            intent.putExtra(Intent.EXTRA_SHORTCUT_ICON, createIcon(activityInfo.icon));

        }

        setResult(RESULT_OK, intent);

        finish();
@@ -87,19 +79,6 @@ public class CreateShortcut extends LauncherActivity { 
        return bitmap;

    }



    private int getDrawableResource(int topLevelId) {

        ArrayList<DashboardCategory> categories = new ArrayList<>();

        SettingsActivity.loadCategoriesFromResource(R.xml.dashboard_categories, categories, this);

        for (DashboardCategory category : categories) {

            for (DashboardTile tile : category.tiles) {

                if (tile.id == topLevelId) {

                    return tile.iconRes;

                }

            }

        }

        return 0;

    }



    @Override

    protected boolean onEvaluateShowIcons() {

        return false;

src/com/android/settings/HomeSettings.java

+0 −11
Original line number Diff line number Diff line
@@ -161,17 +161,6 @@ public class HomeSettings extends SettingsPreferenceFragment implements Indexabl 
                }

            }

        }



        // If we're down to just one possible home app, back out of this settings

        // fragment and show a dialog explaining to the user that they won't see

        // 'Home' settings now until such time as there are multiple available.

        if (mPrefs.size() < 2) {

            if (mShowNotice) {

                mShowNotice = false;

                SettingsActivity.requestHomeNotice();

            }

            finishFragment();

        }

    }



    private void buildHomeActivitiesList() {

src/com/android/settings/ProfileSelectDialog.java

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import android.os.Bundle; 
import android.os.UserHandle;

import android.os.UserManager;



import com.android.settings.dashboard.DashboardTile;

import com.android.settingslib.drawer.DashboardTile;



public class ProfileSelectDialog extends DialogFragment implements OnClickListener {

src/com/android/settings/Settings.java

+6 −0
Original line number Diff line number Diff line
@@ -118,4 +118,10 @@ public class Settings extends SettingsActivity { 
    public static class WriteSettingsActivity extends SettingsActivity { /* empty */ }

    public static class AppDrawOverlaySettingsActivity extends SettingsActivity { /* empty */ }

    public static class AppWriteSettingsActivity extends SettingsActivity { /* empty */ }



    // Categories.

    public static class WirelessSettings extends SettingsActivity { /* empty */ }

    public static class DeviceSettings extends SettingsActivity { /* empty */ }

    public static class PersonalSettings extends SettingsActivity { /* empty */ }

    public static class SystemSettings extends SettingsActivity { /* empty */ }

}