Loading src/com/android/settings/intelligence/search/SearchActivity.java +5 −5 Original line number Diff line number Diff line Loading @@ -17,15 +17,15 @@ package com.android.settings.intelligence.search; import android.app.Activity; import android.app.Fragment; import android.app.FragmentManager; import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import android.os.Bundle; import android.view.WindowManager; import com.android.settings.intelligence.R; public class SearchActivity extends Activity { public class SearchActivity extends FragmentActivity { @Override public void onCreate(Bundle savedInstanceState) { Loading @@ -34,7 +34,7 @@ public class SearchActivity extends Activity { // Keeps layouts in-place when keyboard opens. getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN); FragmentManager fragmentManager = getFragmentManager(); FragmentManager fragmentManager = getSupportFragmentManager(); Fragment fragment = fragmentManager.findFragmentById(R.id.main_content); if (fragment == null) { fragmentManager.beginTransaction() Loading src/com/android/settings/intelligence/search/SearchFragment.java +3 −3 Original line number Diff line number Diff line Loading @@ -20,14 +20,14 @@ package com.android.settings.intelligence.search; import static com.android.settings.intelligence.nano.SettingsIntelligenceLogProto.SettingsIntelligenceEvent; import android.app.Activity; import android.app.Fragment; import android.app.LoaderManager; import android.content.Context; import android.content.Loader; import android.os.Bundle; import androidx.annotation.VisibleForTesting; import androidx.loader.content.Loader; import androidx.loader.app.LoaderManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.fragment.app.Fragment; import android.text.TextUtils; import android.util.EventLog; import android.util.Log; Loading src/com/android/settings/intelligence/search/savedqueries/SavedQueryController.java +2 −2 Original line number Diff line number Diff line Loading @@ -16,13 +16,13 @@ package com.android.settings.intelligence.search.savedqueries; import android.app.LoaderManager; import android.content.Context; import android.content.Loader; import android.os.Bundle; import android.util.Log; import android.view.Menu; import android.view.MenuItem; import androidx.loader.app.LoaderManager; import androidx.loader.content.Loader; import com.android.settings.intelligence.R; import com.android.settings.intelligence.overlay.FeatureFactory; Loading src/com/android/settings/intelligence/utils/AsyncLoader.java +1 −1 Original line number Diff line number Diff line package com.android.settings.intelligence.utils; import android.content.AsyncTaskLoader; import androidx.loader.content.AsyncTaskLoader; import android.content.Context; /** Loading Loading
src/com/android/settings/intelligence/search/SearchActivity.java +5 −5 Original line number Diff line number Diff line Loading @@ -17,15 +17,15 @@ package com.android.settings.intelligence.search; import android.app.Activity; import android.app.Fragment; import android.app.FragmentManager; import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import android.os.Bundle; import android.view.WindowManager; import com.android.settings.intelligence.R; public class SearchActivity extends Activity { public class SearchActivity extends FragmentActivity { @Override public void onCreate(Bundle savedInstanceState) { Loading @@ -34,7 +34,7 @@ public class SearchActivity extends Activity { // Keeps layouts in-place when keyboard opens. getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN); FragmentManager fragmentManager = getFragmentManager(); FragmentManager fragmentManager = getSupportFragmentManager(); Fragment fragment = fragmentManager.findFragmentById(R.id.main_content); if (fragment == null) { fragmentManager.beginTransaction() Loading
src/com/android/settings/intelligence/search/SearchFragment.java +3 −3 Original line number Diff line number Diff line Loading @@ -20,14 +20,14 @@ package com.android.settings.intelligence.search; import static com.android.settings.intelligence.nano.SettingsIntelligenceLogProto.SettingsIntelligenceEvent; import android.app.Activity; import android.app.Fragment; import android.app.LoaderManager; import android.content.Context; import android.content.Loader; import android.os.Bundle; import androidx.annotation.VisibleForTesting; import androidx.loader.content.Loader; import androidx.loader.app.LoaderManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.fragment.app.Fragment; import android.text.TextUtils; import android.util.EventLog; import android.util.Log; Loading
src/com/android/settings/intelligence/search/savedqueries/SavedQueryController.java +2 −2 Original line number Diff line number Diff line Loading @@ -16,13 +16,13 @@ package com.android.settings.intelligence.search.savedqueries; import android.app.LoaderManager; import android.content.Context; import android.content.Loader; import android.os.Bundle; import android.util.Log; import android.view.Menu; import android.view.MenuItem; import androidx.loader.app.LoaderManager; import androidx.loader.content.Loader; import com.android.settings.intelligence.R; import com.android.settings.intelligence.overlay.FeatureFactory; Loading
src/com/android/settings/intelligence/utils/AsyncLoader.java +1 −1 Original line number Diff line number Diff line package com.android.settings.intelligence.utils; import android.content.AsyncTaskLoader; import androidx.loader.content.AsyncTaskLoader; import android.content.Context; /** Loading