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

Commit d629eb4a authored by Ethan Chen's avatar Ethan Chen Committed by Bruno Martins
Browse files

Profiles: Bring-up and inject into Settings via IA 

 * Make use of the new information architecture for the Settings app
   and place the status bar settings into System category.

 * Set intent priority to a value between those that Google uses for
   "Languages & input" and "Date & time" entried in order to place our
   preference in between those two.

 * Use empty summary so that the title is centered vertically,
   matching "Developer options" and "Reset" entries.

Change-Id: I732d51ef81df7af0ce2488cb935592d2d1f52cf5
parent e0a02f4b

AndroidManifest.xml

+7 −18
Original line number Diff line number Diff line
@@ -161,31 +161,24 @@ 
        <activity android:name=".gestures.KeyHandler" />

        -->



        <!-- Profiles settings (dashboard) -->

        <!--

        <!-- Profiles settings (System category) -->

        <activity-alias

            android:name=".profiles.ProfilesSettings"

            android:label="@string/profiles_settings_title"

            android:icon="@drawable/ic_settings_profiles"

            android:targetActivity="PartsActivity">

            <intent-filter android:priority="1">

                <action android:name="com.android.settings.action.EXTRA_SETTINGS" />

            <intent-filter android:priority="255">

                <action android:name="org.lineageos.lineageparts.action.SETTINGS" />

                <action android:name="org.lineageos.lineageparts.PROFILES_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data

                android:name="com.android.settings.category"

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

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

            <meta-data

                android:name="com.android.settings.icon"

                android:resource="@drawable/ic_settings_profiles" />

            <meta-data

                android:name="org.lineageos.settings.summary.receiver"

                android:value="org.lineageos.lineageparts.PartsUpdater" />

            <meta-data

                android:name="org.lineageos.settings.summary.key"

                android:value="profiles_settings" />

                android:name="com.android.settings.summary"

                android:resource="@string/summary_empty" />

        </activity-alias>

        -->



        <!-- Status bar settings (dashboard) -->

        <!--
@@ -253,7 +246,6 @@ 
        </activity-alias>

        -->



        <!--

        <activity android:name=".profiles.NFCProfile">

            <intent-filter>

                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
@@ -261,14 +253,11 @@ 
                <data android:mimeType="cm/profile" />

            </intent-filter>

        </activity>

        -->



        <!--

        <activity

            android:name=".profiles.NFCProfileSelect"

            android:label="@string/profile_select"

            android:excludeFromRecents="true"/>

        -->



    </application>

</manifest>

src/org/lineageos/lineageparts/PartsActivity.java

+0 −9
Original line number Diff line number Diff line
@@ -34,9 +34,7 @@ import android.widget.Button; 


import com.android.settingslib.drawer.SettingsDrawerActivity;



/*

import org.lineageos.lineageparts.profiles.NFCProfileTagCallback;

*/

import org.lineageos.lineageparts.widget.SwitchBar;

import org.lineageos.internal.lineageparts.PartInfo;

import org.lineageos.internal.lineageparts.PartsList;
@@ -55,9 +53,7 @@ public class PartsActivity extends SettingsDrawerActivity implements 
    public static final String EXTRA_SHOW_FRAGMENT_TITLE_RESID =

            ":settings:show_fragment_title_resid";



    /*

    private NFCProfileTagCallback mNfcProfileCallback;

    */



    private CharSequence mInitialTitle;
@@ -141,21 +137,17 @@ public class PartsActivity extends SettingsDrawerActivity implements 
        return true;

    }



    /*

    public void setNfcProfileCallback(NFCProfileTagCallback callback) {

        mNfcProfileCallback = callback;

    }

    */



    @Override

    protected void onNewIntent(Intent intent) {

        if (NfcAdapter.ACTION_TAG_DISCOVERED.equals(intent.getAction())) {

            Tag detectedTag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG);

            /*

            if (mNfcProfileCallback != null) {

                mNfcProfileCallback.onTagRead(detectedTag);

            }

            */

            return;

        }

        super.onNewIntent(intent);
@@ -270,4 +262,3 @@ public class PartsActivity extends SettingsDrawerActivity implements 
        setTitle(mInitialTitle);

    }

}

src/org/lineageos/lineageparts/profiles/ProfilesPreference.java

+0 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import org.lineageos.lineageparts.PartsActivity; 
import org.lineageos.lineageparts.R;

import org.lineageos.lineageparts.SettingsPreferenceFragment;



/*

public class ProfilesPreference extends CheckBoxPreference implements View.OnClickListener {

    private static final String TAG = ProfilesPreference.class.getSimpleName();

    private static final float DISABLED_ALPHA = 0.4f;
@@ -137,4 +136,3 @@ public class ProfilesPreference extends CheckBoxPreference implements View.OnCli 
                R.string.profile_profile_manage, null, null, PROFILE_DETAILS);

    }

}
 
*/

src/org/lineageos/lineageparts/profiles/ProfilesSettings.java

+0 −2
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ import lineageos.app.Profile; 
import lineageos.app.ProfileManager;

import lineageos.providers.LineageSettings;



/*

public class ProfilesSettings extends SettingsPreferenceFragment

        implements LineageBaseSystemSettingSwitchBar.SwitchBarChangeCallback,

        Preference.OnPreferenceChangeListener {
@@ -320,4 +319,3 @@ public class ProfilesSettings extends SettingsPreferenceFragment 
        }

    };

}
 
*/

src/org/lineageos/lineageparts/profiles/SetupActionsFragment.java

+3 −5
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ import android.widget.ListView; 
import android.widget.SeekBar;

import android.widget.TextView;



/*

import lineageos.app.Profile;

import lineageos.app.ProfileGroup;

import lineageos.app.ProfileManager;
@@ -796,11 +795,11 @@ public class SetupActionsFragment extends SettingsPreferenceFragment 


        int defaultIndex = 0; // normal by default

        if (setting.isOverride()) {

            if (setting.getValue().equals(values[0] /* normal *//*)) {

            if (setting.getValue().equals(values[0] /* normal */)) {

                defaultIndex = 0;

            } else if (setting.getValue().equals(values[1] /* vibrate *//*)) {

            } else if (setting.getValue().equals(values[1] /* vibrate */)) {

                defaultIndex = 1; // enabled

            } else if (setting.getValue().equals(values[2] /* mute *//*)) {

            } else if (setting.getValue().equals(values[2] /* mute */)) {

                defaultIndex = 2; // mute

            }

        } else {
@@ -1160,4 +1159,3 @@ public class SetupActionsFragment extends SettingsPreferenceFragment 
                R.string.profile_profile_manage, null, this, NEW_TRIGGER_REQUEST_CODE);

    }

}
 
*/