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

Commit caf75a85 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-42a2a3ad-8c90-4c84-a0ad-5d067beb8e30-for-git_oc-mr1-release-43... 

release-request-42a2a3ad-8c90-4c84-a0ad-5d067beb8e30-for-git_oc-mr1-release-4349323 snap-temp-L16100000104414353

Change-Id: I389b8203db4238da0561f4b42fef36be4361d809
parents 307954ce cb52e803

src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java

+0 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import com.android.settings.dashboard.DashboardAdapter.DashboardItemHolder; 
import com.android.settings.dashboard.DashboardAdapter.IconCache;

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.drawer.Tile;

import com.android.settingslib.drawer.TileUtils;



import java.util.List;

import java.util.Objects;
@@ -77,7 +76,6 @@ public class SuggestionAdapter extends RecyclerView.Adapter<DashboardItemHolder> 
            mSuggestionsShownLogged.add(suggestionId);

        }

        if (suggestion.remoteViews != null) {

            TileUtils.updateTileUsingSummaryUri(mContext, suggestion);

            final ViewGroup itemView = (ViewGroup) holder.itemView;

            itemView.removeAllViews();

            itemView.addView(suggestion.remoteViews.apply(itemView.getContext(), itemView));

src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java

+2 −3
Original line number Diff line number Diff line
@@ -166,8 +166,7 @@ public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider 
    @VisibleForTesting

    boolean hasUsedNightDisplay(Context context) {

        final ContentResolver cr = context.getContentResolver();

        final long lastActivatedTimeMillis = Secure.getLong(cr,

                Secure.NIGHT_DISPLAY_LAST_ACTIVATED_TIME, -1);

        return lastActivatedTimeMillis > 0;

        return Secure.getInt(cr, Secure.NIGHT_DISPLAY_AUTO_MODE, 0) != 0

                || Secure.getString(cr, Secure.NIGHT_DISPLAY_LAST_ACTIVATED_TIME) != null;

    }

}

src/com/android/settings/display/NightDisplayPreference.java

+6 −5
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import com.android.internal.app.NightDisplayController; 
import com.android.settings.R;



import java.text.DateFormat;

import java.time.LocalTime;

import java.util.Calendar;

import java.util.TimeZone;
@@ -58,11 +59,11 @@ public class NightDisplayPreference extends SwitchPreference 
        mController.setListener(null);

    }



    private String getFormattedTimeString(NightDisplayController.LocalTime localTime) {

    private String getFormattedTimeString(LocalTime localTime) {

        final Calendar c = Calendar.getInstance();

        c.setTimeZone(mTimeFormatter.getTimeZone());

        c.set(Calendar.HOUR_OF_DAY, localTime.hourOfDay);

        c.set(Calendar.MINUTE, localTime.minute);

        c.set(Calendar.HOUR_OF_DAY, localTime.getHour());

        c.set(Calendar.MINUTE, localTime.getMinute());

        c.set(Calendar.SECOND, 0);

        c.set(Calendar.MILLISECOND, 0);

        return mTimeFormatter.format(c.getTime());
@@ -116,12 +117,12 @@ public class NightDisplayPreference extends SwitchPreference 
    }



    @Override

    public void onCustomStartTimeChanged(NightDisplayController.LocalTime startTime) {

    public void onCustomStartTimeChanged(LocalTime startTime) {

        updateSummary();

    }



    @Override

    public void onCustomEndTimeChanged(NightDisplayController.LocalTime endTime) {

    public void onCustomEndTimeChanged(LocalTime endTime) {

        updateSummary();

    }

}

src/com/android/settings/display/NightDisplaySettings.java

+9 −9
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import com.android.settings.widget.SeekBarPreference; 
import com.android.settings.SettingsPreferenceFragment;



import java.text.DateFormat;

import java.time.LocalTime;

import java.util.Calendar;

import java.util.TimeZone;
@@ -144,7 +145,7 @@ public class NightDisplaySettings extends SettingsPreferenceFragment 
    @Override

    public Dialog onCreateDialog(final int dialogId) {

        if (dialogId == DIALOG_START_TIME || dialogId == DIALOG_END_TIME) {

            final NightDisplayController.LocalTime initialTime;

            final LocalTime initialTime;

            if (dialogId == DIALOG_START_TIME) {

                initialTime = mController.getCustomStartTime();

            } else {
@@ -156,15 +157,14 @@ public class NightDisplaySettings extends SettingsPreferenceFragment 
            return new TimePickerDialog(context, new TimePickerDialog.OnTimeSetListener() {

                @Override

                public void onTimeSet(TimePicker view, int hourOfDay, int minute) {

                    final NightDisplayController.LocalTime time =

                            new NightDisplayController.LocalTime(hourOfDay, minute);

                    final LocalTime time = LocalTime.of(hourOfDay, minute);

                    if (dialogId == DIALOG_START_TIME) {

                        mController.setCustomStartTime(time);

                    } else {

                        mController.setCustomEndTime(time);

                    }

                }

            }, initialTime.hourOfDay, initialTime.minute, use24HourFormat);

            }, initialTime.getHour(), initialTime.getMinute(), use24HourFormat);

        }

        return super.onCreateDialog(dialogId);

    }
@@ -201,11 +201,11 @@ public class NightDisplaySettings extends SettingsPreferenceFragment 
        mTemperaturePreference.setProgress(convertTemperature(colorTemperature));

    }



    private String getFormattedTimeString(NightDisplayController.LocalTime localTime) {

    private String getFormattedTimeString(LocalTime localTime) {

        final Calendar c = Calendar.getInstance();

        c.setTimeZone(mTimeFormatter.getTimeZone());

        c.set(Calendar.HOUR_OF_DAY, localTime.hourOfDay);

        c.set(Calendar.MINUTE, localTime.minute);

        c.set(Calendar.HOUR_OF_DAY, localTime.getHour());

        c.set(Calendar.MINUTE, localTime.getMinute());

        c.set(Calendar.SECOND, 0);

        c.set(Calendar.MILLISECOND, 0);

        return mTimeFormatter.format(c.getTime());
@@ -221,12 +221,12 @@ public class NightDisplaySettings extends SettingsPreferenceFragment 
    }



    @Override

    public void onCustomStartTimeChanged(NightDisplayController.LocalTime startTime) {

    public void onCustomStartTimeChanged(LocalTime startTime) {

        mStartTimePreference.setSummary(getFormattedTimeString(startTime));

    }



    @Override

    public void onCustomEndTimeChanged(NightDisplayController.LocalTime endTime) {

    public void onCustomEndTimeChanged(LocalTime endTime) {

        mEndTimePreference.setSummary(getFormattedTimeString(endTime));

    }

src/com/android/settings/wifi/WifiSettings.java

+4 −5
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ public class WifiSettings extends RestrictedSettingsFragment 
        WifiDialog.WifiDialogListener {



    private static final String TAG = "WifiSettings";

    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);



    /* package */ static final int MENU_ID_WPS_PBC = Menu.FIRST;

    private static final int MENU_ID_WPS_PIN = Menu.FIRST + 1;
@@ -386,8 +385,8 @@ public class WifiSettings extends RestrictedSettingsFragment 
        }

        setProgressBarVisible(true);

        mWifiTracker.forceUpdate();

        if (DEBUG) {

            Log.d(TAG, "WifiSettings force update APs: " + mWifiTracker.getAccessPoints());

        if (WifiTracker.sVerboseLogging) {

            Log.i(TAG, "WifiSettings force update APs: " + mWifiTracker.getAccessPoints());

        }

        getView().removeCallbacks(mUpdateAccessPointsRunnable);

        updateAccessPointPreferences();
@@ -775,8 +774,8 @@ public class WifiSettings extends RestrictedSettingsFragment 
        }

        // AccessPoints are sorted by the WifiTracker

        final List<AccessPoint> accessPoints = mWifiTracker.getAccessPoints();

        if (DEBUG) {

            Log.d(TAG, "updateAccessPoints called for: " + accessPoints);

        if (WifiTracker.sVerboseLogging) {

            Log.i(TAG, "updateAccessPoints called for: " + accessPoints);

        }



        boolean hasAvailableAccessPoints = false;