Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37f20aea authored by Alex Stetson's avatar Alex Stetson Committed by Automerger Merge Worker
Browse files

Updated Activity, Fragment, and loaders to jetpack am: 8161fd4c

Change-Id: I286143fb3e37966458ea25c3cf584e3afc1837b0
parents 67796f40 8161fd4c
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -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) {
@@ -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()
+3 −3
Original line number Diff line number Diff line
@@ -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;
+2 −2
Original line number Diff line number Diff line
@@ -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;
+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;

/**