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

Commit a1593227 authored by Tetiana Meronyk's avatar Tetiana Meronyk Committed by Automerger Merge Worker
Browse files

Merge "Remove "Allow guest to use phone" from devices without telephony." into... 

Merge "Remove "Allow guest to use phone" from devices without telephony." into udc-qpr-dev am: f059fb9a am: 434b34c7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23781311



Change-Id: Ie611bc46b118990db4ea58ff1bc17c953b7c9a21
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1c112249 434b34c7

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -6433,7 +6433,7 @@ 
    <!-- 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>

    <!-- 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] -->

    <string name="enable_guest_calling_summary">Call history will be shared with guest user</string>

























src/com/android/settings/users/GuestTelephonyPreferenceController.java



+3
−1






























Original line number
Diff line number
Diff line







@@ -17,6 +17,7 @@







package com.android.settings.users;



















import android.content.Context;









import android.content.pm.PackageManager;









import android.os.Bundle;









import android.os.UserManager;


















@@ -73,6 +74,7 @@ public class GuestTelephonyPreferenceController extends TogglePreferenceControll







    public void updateState(Preference preference) {









        super.updateState(preference);









        mUserCaps.updateAddUserCapabilities(mContext);









        preference.setVisible(isAvailable() && mUserCaps.mUserSwitcherEnabled);









        preference.setVisible(isAvailable() && mUserCaps.mUserSwitcherEnabled && mContext









                .getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY));









    }









}