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

Commit 1c5c7ae6 authored by Romain Hunault's avatar Romain Hunault
Browse files

Fix issues by using Fragment

parent f68ba7d3

AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -3226,6 +3226,9 @@ 
            </intent-filter>

            <meta-data android:name="com.android.settings.category"

                android:value="com.android.settings.category.system" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.MicroGSettings" />



        </activity>



    </application>

src/com/android/settings/MicroGSettings.java

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 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.

 */



package com.android.settings;



import android.os.Bundle;

import android.content.Intent;

import android.content.ComponentName;

import android.app.Fragment;



public class MicroGSettings extends Fragment {



    @Override

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        Intent intent = new Intent("android.intent.action.MAIN");

        intent.setComponent(new ComponentName("com.google.android.gms", "org.microg.gms.ui.SettingsActivity"));

        startActivity(intent);

    }

}

src/com/android/settings/Settings.java

+1 −13
Original line number Diff line number Diff line
@@ -20,9 +20,6 @@ package com.android.settings; 
import com.android.settings.applications.AppOpsSummary;

import com.android.settings.fingerprint.FingerprintEnrollIntroduction;

import com.android.settings.fingerprint.FingerprintSettings;

import android.content.Intent;

import android.content.ComponentName;

import android.os.Bundle;



/**

 * Top-level Settings activity
@@ -159,16 +156,7 @@ public class Settings extends SettingsActivity { 
    public static class TestingSettingsActivity extends SettingsActivity { /* empty */ }

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

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

    public static class MicroGActivity extends SettingsActivity {

        @Override

        protected void onCreate(Bundle savedState) {

            super.onCreate(savedState);



            Intent intent = new Intent("android.intent.action.MAIN");

            intent.setComponent(new ComponentName("com.google.android.gms", "org.microg.gms.ui.SettingsActivity"));

            startActivity(intent);

        }

    }

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



    // Categories.

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

src/com/android/settings/SettingsActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -369,7 +369,8 @@ public class SettingsActivity extends SettingsDrawerActivity 
            MasterClear.class.getName(),

            NightDisplaySettings.class.getName(),

            ManageDomainUrls.class.getName(),

            AutomaticStorageManagerSettings.class.getName()

            AutomaticStorageManagerSettings.class.getName(),

            MicroGSettings.class.getName()

    };