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

Commit 0256bb61 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-15.1' into v1-oreo

parents 84b2e674 3d86c43f

AndroidManifest.xml

+0 −18
Original line number Diff line number Diff line
@@ -101,24 +101,6 @@ 
            </intent-filter>

        </provider>



        <!-- LiveDisplay settings (Display category) -->

        <activity-alias

            android:name=".livedisplay.LiveDisplaySettings"

            android:label="@*lineageos.platform:string/live_display_title"

            android:targetActivity="PartsActivity">

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

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

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

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

            </intent-filter>

            <meta-data

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

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

            <meta-data

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

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

        </activity-alias>



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

        <activity-alias

            android:name=".input.ButtonSettings"

src/org/lineageos/lineageparts/livedisplay/LiveDisplaySettings.java

+6 −0
Original line number Diff line number Diff line
@@ -397,6 +397,12 @@ public class LiveDisplaySettings extends SettingsPreferenceFragment implements S 
            if (!config.hasFeature(FEATURE_READING_ENHANCEMENT)) {

                result.add(KEY_LIVE_DISPLAY_READING_ENHANCEMENT);

            }

            if (!context.getResources().getBoolean(

                    org.lineageos.platform.internal.R.bool.config_enableLiveDisplay)) {

                result.add(KEY_LIVE_DISPLAY_TEMPERATURE);

                result.add(KEY_LIVE_DISPLAY);

            }



            return result;

        }

src/org/lineageos/lineageparts/search/LineagePartsSearchIndexablesProvider.java

+3 −3
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ public class LineagePartsSearchIndexablesProvider extends SearchIndexablesProvid 
        // from parts_catalog.xml for indexing

        for (String key : keys) {

            PartInfo i = PartsList.get(getContext()).getPartInfo(key);

            if (i == null || i.getXmlRes() <= 0) {

            if (i == null || i.getXmlRes() <= 0 || !i.isAvailable()) {

                continue;

            }
@@ -106,7 +106,7 @@ public class LineagePartsSearchIndexablesProvider extends SearchIndexablesProvid 
        // which don't have an associated XML resource

        for (String key : keys) {

            PartInfo i = PartsList.get(getContext()).getPartInfo(key);

            if (i == null) {

            if (i == null || !i.isAvailable()) {

                continue;

            }
@@ -167,7 +167,7 @@ public class LineagePartsSearchIndexablesProvider extends SearchIndexablesProvid 


        for (String key : keys) {

            PartInfo i = PartsList.get(getContext()).getPartInfo(key);

            if (i == null) {

            if (i == null || !i.isAvailable()) {

                continue;

            }