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

Merge "Revert "Nullability Annotations replacement"" into main

Browse Source
This commit is contained in:
Sunny Shao
2023-12-29 03:18:24 +00:00
committed by Android (Google) Code Review
parent 2d2fc79edd 19d1d3d15d
commit 946f52b2a1
130 changed files with 154 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/fuelgauge/BatteryActiveView.java
View File

@@ -14,6 +14,7 @@
package com.android.settings.fuelgauge;
import android.annotation.Nullable;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Paint;
@@ -21,8 +22,6 @@ import android.util.AttributeSet;
import android.util.SparseIntArray;
import android.view.View;
import androidx.annotation.Nullable;
public class BatteryActiveView extends View {
private final Paint mPaint = new Paint();

2
src/com/android/settings/fuelgauge/BatteryMeterView.java
View File

@@ -16,12 +16,12 @@
package com.android.settings.fuelgauge;
import android.annotation.Nullable;
import android.content.Context;
import android.graphics.ColorFilter;
import android.util.AttributeSet;
import android.widget.ImageView;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import com.android.settings.R;

2
src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
View File

@@ -16,13 +16,13 @@
package com.android.settings.fuelgauge.batterytip;
import android.annotation.Nullable;
import android.content.Context;
import android.os.BadParcelableException;
import android.os.Bundle;
import android.util.ArrayMap;
import android.util.Log;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;

2
src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.fuelgauge.batteryusage;
import android.annotation.IntDef;
import android.annotation.Nullable;
import android.app.usage.IUsageStatsManager;
import android.app.usage.UsageEvents.Event;
import android.app.usage.UsageStatsManager;
@@ -33,7 +34,6 @@ import android.util.Base64;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import com.android.settings.fuelgauge.BatteryUtils;