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

Commit 5bc79b9b authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Fix various crashes"

parents b6cda972 8b886c46
Loading
Loading
Loading
Loading
+0 −10
Original line number Diff line number Diff line
@@ -1932,16 +1932,6 @@
                android:value="com.android.settings.wfd.WifiDisplaySettings" />
        </activity>


        <!-- Development settings -->

        <!-- DeviceInfo adds the user's requested build to stats upload.  -->
        <receiver android:name=".DeviceInfo$StatsReportReceiver">
            <intent-filter>
                <action android:name="android.intent.action.STATISTICS_REPORT" />
            </intent-filter>
        </receiver>

        <activity android:name="Display" android:label="@string/display_label"
                android:configChanges="fontScale"
                android:taskAffinity="com.android.settings"
+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@
    android:title="@string/accessibility_autoclick_preference_title" >


    <SeekBarPreference
    <com.android.settings.SeekBarPreference
        android:key="autoclick_delay"
        android:title="@string/accessibility_autoclick_delay_preference_title"
        android:layout="@layout/preference_iconless_slider" />
+1 −3
Original line number Diff line number Diff line
@@ -33,10 +33,8 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.widget.Switch;

import com.android.internal.logging.MetricsLogger;
import com.android.settings.DimmableIconPreference;
import com.android.settings.PreferenceActivity;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
@@ -416,7 +414,7 @@ public class LocationSettings extends LocationSettingsBase
            // start new fragment to display extended information
            Bundle args = new Bundle();
            args.putString(InstalledAppDetails.ARG_PACKAGE_NAME, mPackage);
            ((PreferenceActivity) getActivity()).startPreferencePanelAsUser(
            ((SettingsActivity) getActivity()).startPreferencePanelAsUser(
                    InstalledAppDetails.class.getName(), args,
                    R.string.application_info_label, null, mUserHandle);
            return true;