Merge "Revert^2 "Nullability Annotations replacement"" into main
This commit is contained in:
@@ -1,11 +1,12 @@
|
||||
package com.android.settings.datausage;
|
||||
|
||||
import android.annotation.Nullable;
|
||||
import android.content.Context;
|
||||
import android.util.AttributeSet;
|
||||
import android.view.View;
|
||||
import android.widget.LinearLayout;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
public class MeasurableLinearLayout extends LinearLayout {
|
||||
private View mFixedView;
|
||||
private View mDisposableView;
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
package com.android.settings.datausage;
|
||||
|
||||
import android.annotation.Nullable;
|
||||
import android.content.Context;
|
||||
import android.util.AttributeSet;
|
||||
import android.view.View;
|
||||
import android.widget.AdapterView;
|
||||
import android.widget.Spinner;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceViewHolder;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user