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

Commit 2e09de3e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Misc fixes"

parents b441d90f f6c0d1c3

AndroidManifest.xml

+0 −6
Original line number Diff line number Diff line
@@ -1086,9 +1086,6 @@ 
                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

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

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

            </intent-filter>

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

                android:value="com.android.settings.applications.ProcessStatsSummary" />

        </activity>
@@ -3059,9 +3056,6 @@ 
                <category android:name="android.intent.category.DEFAULT" />

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

            </intent-filter>

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

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

            </intent-filter>

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

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

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

res/layout/condition_header_icon.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 


<ImageView xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@android:id/icon"

    android:layout_width="@dimen/dashboard_tile_image_size"

    android:layout_height="@dimen/dashboard_tile_image_size"

    android:layout_width="@dimen/suggestion_card_icon_size"

    android:layout_height="@dimen/suggestion_card_icon_size"

    android:layout_marginStart="0dp"

    android:layout_marginEnd="24dp"

    android:tint="?android:attr/colorAccent"

res/layout/condition_tile.xml

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 


        <ImageView

            android:id="@android:id/icon"

            android:layout_width="@dimen/dashboard_tile_image_size"

            android:layout_height="@dimen/dashboard_tile_image_size"

            android:layout_width="@dimen/suggestion_card_icon_size"

            android:layout_height="@dimen/suggestion_card_icon_size"

            android:layout_marginTop="12dp"

            android:layout_marginStart="14dp"

            android:layout_marginEnd="24dp"

res/layout/suggestion_tile.xml

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 


        <ImageView

            android:id="@android:id/icon"

            android:layout_width="@dimen/dashboard_tile_image_size"

            android:layout_height="@dimen/dashboard_tile_image_size"

            android:layout_width="@dimen/suggestion_card_icon_size"

            android:layout_height="@dimen/suggestion_card_icon_size"

            android:layout_marginStart="14dp"

            android:layout_marginEnd="24dp" />

src/com/android/settings/dashboard/conditional/AirplaneModeCondition.java

+7 −5
Original line number Diff line number Diff line
@@ -21,10 +21,11 @@ import android.content.Intent; 
import android.content.IntentFilter;

import android.graphics.drawable.Icon;

import android.net.ConnectivityManager;

import android.provider.Settings;

import android.util.Log;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.R;

import com.android.settings.Settings;

import com.android.settingslib.WirelessUtils;



public class AirplaneModeCondition extends Condition {
@@ -84,8 +85,9 @@ public class AirplaneModeCondition extends Condition { 


    @Override

    public void onPrimaryClick() {

        mManager.getContext().startActivity(new Intent(mManager.getContext(),

                Settings.NetworkDashboardActivity.class));

        mManager.getContext().startActivity(

                new Intent(Settings.ACTION_WIRELESS_SETTINGS)

                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));

    }



    @Override