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

Merge "Remove "Allow guest to use phone" from devices without telephony." into udc-qpr-dev

Browse Source
This commit is contained in:
Tetiana Meronyk
2023-06-29 07:31:06 +00:00
committed by Android (Google) Code Review
parent f733b7b0ff 7c6f4ae19c
commit f059fb9a27
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -6429,7 +6429,7 @@
<!-- Search keywords for the "Delete Guest Activity" section in Multiple Users Screen. [CHAR LIMIT=NONE] --> <!-- Search keywords for the "Delete Guest Activity" section in Multiple Users Screen. [CHAR LIMIT=NONE] -->
<string name="remove_guest_on_exit_keywords">delete, guest, activity, remove, data, visitor, erase</string> <string name="remove_guest_on_exit_keywords">delete, guest, activity, remove, data, visitor, erase</string>
<!-- Title of preference to enable guest calling[CHAR LIMIT=40] --> <!-- Title of preference to enable guest calling[CHAR LIMIT=40] -->
<string name="enable_guest_calling">Allow guest to use phone</string> <string name="enable_guest_calling">Allow guest to make phone calls</string>
<!-- Summary of preference to enable guest calling [CHAR LIMIT=NONE] --> <!-- Summary of preference to enable guest calling [CHAR LIMIT=NONE] -->
<string name="enable_guest_calling_summary">Call history will be shared with guest user</string> <string name="enable_guest_calling_summary">Call history will be shared with guest user</string>

4
src/com/android/settings/users/GuestTelephonyPreferenceController.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.users; package com.android.settings.users;
import android.content.Context; import android.content.Context;
import android.content.pm.PackageManager;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserManager; import android.os.UserManager;
@@ -73,6 +74,7 @@ public class GuestTelephonyPreferenceController extends TogglePreferenceControll
public void updateState(Preference preference) { public void updateState(Preference preference) {
super.updateState(preference); super.updateState(preference);
mUserCaps.updateAddUserCapabilities(mContext); mUserCaps.updateAddUserCapabilities(mContext);
preference.setVisible(isAvailable() && mUserCaps.mUserSwitcherEnabled); preference.setVisible(isAvailable() && mUserCaps.mUserSwitcherEnabled && mContext
.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY));
} }
} }