Merge "Revert^2 "Nullability Annotations replacement"" into main

This commit is contained in:
Sunny Shao
2024-01-10 08:35:06 +00:00
committed by Android (Google) Code Review
130 changed files with 198 additions and 153 deletions

View File

@@ -18,7 +18,6 @@ package com.android.settings.search;
import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO;
import android.annotation.NonNull;
import android.app.ActivityOptions;
import android.content.ComponentName;
import android.content.Context;
@@ -30,6 +29,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Toolbar;
import androidx.annotation.NonNull;
import androidx.fragment.app.FragmentActivity;
import com.android.settings.R;

View File

@@ -16,7 +16,6 @@
package com.android.settings.search.actionbar;
import android.annotation.NonNull;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Intent;
@@ -26,6 +25,7 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import com.android.settings.R;