PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove uses of libcore.util.Objects.hashCode / equals."

Browse Source
This commit is contained in:
Narayan Kamath
2018-02-20 13:55:53 +00:00
committed by Android (Google) Code Review
parent 8d9dc9a642 facb59a13f
commit b61f89d268
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/datausage/CycleAdapter.java
View File

@@ -26,10 +26,9 @@ import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.net.ChartData;
import libcore.util.Objects;
import java.time.ZonedDateTime;
import java.util.Iterator;
import java.util.Objects;
public class CycleAdapter extends ArrayAdapter<CycleAdapter.CycleItem> {
@@ -142,7 +141,7 @@ public class CycleAdapter extends ArrayAdapter<CycleAdapter.CycleItem> {
// only force-update cycle when changed; skipping preserves any
// user-defined inspection region.
final CycleAdapter.CycleItem selectedItem = getItem(position);
if (!Objects.equal(selectedItem, previousItem)) {
if (!Objects.equals(selectedItem, previousItem)) {
mListener.onItemSelected(null, null, position, 0);
return false;
}

6
src/com/android/settings/datausage/DataUsageSummaryPreference.java
View File

@@ -28,7 +28,7 @@ import com.android.settings.R;
import com.android.settings.SummaryPreference;
import com.android.settingslib.utils.StringUtil;
import libcore.util.Objects;
import java.util.Objects;
/**
* Provides a summary of data usage.
@@ -51,7 +51,7 @@ public class DataUsageSummaryPreference extends SummaryPreference {
}
public void setLimitInfo(String text) {
if (!Objects.equal(text, mLimitInfoText)) {
if (!Objects.equals(text, mLimitInfoText)) {
mLimitInfoText = text;
notifyChanged();
}
@@ -114,4 +114,4 @@ public class DataUsageSummaryPreference extends SummaryPreference {
carrierInfo.setVisibility(View.GONE);
}
}
}
}

5
src/com/android/settings/display/ThemePreferenceController.java
View File

@@ -33,10 +33,9 @@ import com.android.settings.wrapper.OverlayManagerWrapper.OverlayInfo;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import libcore.util.Objects;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_THEME;
@@ -111,7 +110,7 @@ public class ThemePreferenceController extends AbstractPreferenceController impl
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
String current = getTheme();
if (Objects.equal(newValue, current)) {
if (Objects.equals(newValue, current)) {
return true;
}
mOverlayService.setEnabledExclusiveInCategory((String) newValue, UserHandle.myUserId());