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

Merge "Add intent for entering communal settings" into udc-dev

Browse Source
This commit is contained in:
Lucas Silva
2023-04-13 18:28:43 +00:00
committed by Android (Google) Code Review
parent bfb5780a19 3b1c739ce2
commit 07d056f5c6
4 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
AndroidManifest.xml
View File

@@ -3285,6 +3285,24 @@
android:value="true" />
</activity>
<activity
android:name="Settings$CommunalSettingsActivity"
android:label="@string/communal_settings_title"
android:exported="true"
android:icon="@drawable/ia_settings_communal">
<intent-filter android:priority="1">
<action android:name="android.settings.COMMUNAL_SETTINGS" />
<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.communal.CommunalDashboardFragment" />
<meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
android:value="@string/menu_key_communal"/>
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
</activity>
<activity
android:name="Settings$UserSettingsActivity"
android:label="@string/user_settings_title"

11
src/com/android/settings/Settings.java
View File

@@ -29,6 +29,7 @@ import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.biometrics.face.FaceSettings;
import com.android.settings.communal.CommunalPreferenceController;
import com.android.settings.core.FeatureFlags;
import com.android.settings.enterprise.EnterprisePrivacySettings;
import com.android.settings.network.MobileNetworkIntentConverter;
@@ -314,6 +315,16 @@ public class Settings extends SettingsActivity {
public static class AndroidBeamSettingsActivity extends SettingsActivity { /* empty */ }
public static class WifiDisplaySettingsActivity extends SettingsActivity { /* empty */ }
public static class DreamSettingsActivity extends SettingsActivity { /* empty */ }
/** Activity to manage communal settings */
public static class CommunalSettingsActivity extends SettingsActivity {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (!CommunalPreferenceController.isAvailable(this)) {
finish();
}
}
}
public static class NotificationStationActivity extends SettingsActivity { /* empty */ }
public static class UserSettingsActivity extends SettingsActivity { /* empty */ }
public static class NotificationAccessSettingsActivity extends SettingsActivity { /* empty */ }

12
src/com/android/settings/communal/CommunalPreferenceController.java
View File

@@ -32,8 +32,14 @@ public class CommunalPreferenceController extends BasePreferenceController {
@Override
public int getAvailabilityStatus() {
return (mContext.getResources().getBoolean(R.bool.config_show_communal_settings)
&& Utils.canCurrentUserDream(mContext))
? AVAILABLE : UNSUPPORTED_ON_DEVICE;
return isAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
/**
* Returns whether communal preferences are available.
*/
public static boolean isAvailable(Context context) {
return context.getResources().getBoolean(R.bool.config_show_communal_settings)
&& Utils.canCurrentUserDream(context);
}
}

2
src/com/android/settings/core/gateway/SettingsGateway.java
View File

@@ -78,6 +78,7 @@ import com.android.settings.bluetooth.BluetoothDeviceDetailsFragment;
import com.android.settings.bluetooth.BluetoothFindBroadcastsFragment;
import com.android.settings.bluetooth.BluetoothPairingDetail;
import com.android.settings.bugreporthandler.BugReportHandlerPicker;
import com.android.settings.communal.CommunalDashboardFragment;
import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment;
import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
import com.android.settings.connecteddevice.NfcAndPaymentFragment;
@@ -275,6 +276,7 @@ public class SettingsGateway {
SystemNavigationGestureSettings.class.getName(),
DataUsageSummary.class.getName(),
DreamSettings.class.getName(),
CommunalDashboardFragment.class.getName(),
UserSettings.class.getName(),
NotificationAccessSettings.class.getName(),
NotificationAccessDetails.class.getName(),