PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add an action name and support 2-pane UI in Backup page

Browse Source 
Fix: 377618895
Test: manual, atest UserBackupSettingsActivityTest
Flag: EXEMPT only export activity
Change-Id: If0469a42548a7ba1153dd41f88b68972ce5a23e4
This commit is contained in:
Jason Chiu
2024-11-06 14:44:17 +08:00
parent c0a4fec1e6
commit 9eab62acdc
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@@ -4507,6 +4507,10 @@
android:label="@string/privacy_settings_title" android:label="@string/privacy_settings_title"
android:exported="true" android:exported="true"
android:icon="@drawable/ic_settings_backup"> android:icon="@drawable/ic_settings_backup">
<intent-filter android:priority="1">
<action android:name="com.android.settings.BACKUP_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />

7
src/com/android/settings/backup/UserBackupSettingsActivity.java
View File

@@ -23,10 +23,10 @@ import android.os.Bundle;
import android.util.Log; import android.util.Log;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.Indexable; import com.android.settingslib.search.Indexable;
import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.search.SearchIndexable;
@@ -46,13 +46,16 @@ import java.util.List;
* Therefore, as a simple workaround, we use a new class which is enabled by default. * Therefore, as a simple workaround, we use a new class which is enabled by default.
*/ */
@SearchIndexable @SearchIndexable
public class UserBackupSettingsActivity extends FragmentActivity implements Indexable { public class UserBackupSettingsActivity extends SettingsActivity implements Indexable {
private static final String TAG = "BackupSettingsActivity"; private static final String TAG = "BackupSettingsActivity";
private FragmentManager mFragmentManager; private FragmentManager mFragmentManager;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
if (isFinishing()) {
return;
}
BackupSettingsHelper backupHelper = new BackupSettingsHelper(this); BackupSettingsHelper backupHelper = new BackupSettingsHelper(this);