Settings Fragment Migration (Build pass app)

This patch focused on fixing compile errors and some runtime errors.

Test: We can't test it now. But we will have an integration test later.
Bug: 110259478
Change-Id: I16c471ddcd0fa1460c665b7f74d86fcace5ee67b
This commit is contained in:
tmfang
2018-06-28 11:39:05 +08:00
committed by Fan Zhang
parent 99cc23d0da
commit 27c84de325
164 changed files with 792 additions and 340 deletions

View File

@@ -70,13 +70,13 @@ import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceFragment;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceManager;
public class SettingsActivity extends SettingsBaseActivity
implements PreferenceManager.OnPreferenceTreeClickListener,
PreferenceFragment.OnPreferenceStartFragmentCallback,
PreferenceFragmentCompat.OnPreferenceStartFragmentCallback,
ButtonBarHandler, FragmentManager.OnBackStackChangedListener {
private static final String LOG_TAG = "SettingsActivity";
@@ -190,7 +190,7 @@ public class SettingsActivity extends SettingsBaseActivity
}
@Override
public boolean onPreferenceStartFragment(PreferenceFragment caller, Preference pref) {
public boolean onPreferenceStartFragment(PreferenceFragmentCompat caller, Preference pref) {
new SubSettingLauncher(this)
.setDestination(pref.getFragment())
.setArguments(pref.getExtras())
@@ -270,7 +270,7 @@ public class SettingsActivity extends SettingsBaseActivity
mContent = findViewById(R.id.main_content);
getFragmentManager().addOnBackStackChangedListener(this);
getSupportFragmentManager().addOnBackStackChangedListener(this);
if (savedState != null) {
// We are restarting from a previous saved state; used that to initialize, instead
@@ -430,7 +430,7 @@ public class SettingsActivity extends SettingsBaseActivity
}
private void setTitleFromBackStack() {
final int count = getFragmentManager().getBackStackEntryCount();
final int count = getSupportFragmentManager().getBackStackEntryCount();
if (count == 0) {
if (mInitialTitleResId > 0) {
@@ -441,7 +441,8 @@ public class SettingsActivity extends SettingsBaseActivity
return;
}
FragmentManager.BackStackEntry bse = getFragmentManager().getBackStackEntryAt(count - 1);
FragmentManager.BackStackEntry bse = getSupportFragmentManager().
getBackStackEntryAt(count - 1);
setTitleFromBackStackEntry(bse);
}
@@ -581,7 +582,7 @@ public class SettingsActivity extends SettingsBaseActivity
+ fragmentName);
}
Fragment f = Fragment.instantiate(this, fragmentName, args);
FragmentTransaction transaction = getFragmentManager().beginTransaction();
FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
transaction.replace(R.id.main_content, f);
if (withTransition) {
TransitionManager.beginDelayedTransition(mContent);
@@ -595,7 +596,7 @@ public class SettingsActivity extends SettingsBaseActivity
transaction.setBreadCrumbTitle(title);
}
transaction.commitAllowingStateLoss();
getFragmentManager().executePendingTransactions();
getSupportFragmentManager().executePendingTransactions();
Log.d(LOG_TAG, "Executed frag manager pendingTransactions");
return f;
}