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

Commit 38b0d588 authored by Tony Mak's avatar Tony Mak Committed by android-build-merger
Browse files

Merge "Fix the strings accordingly for policy transparency dialogs" into oc-mr1-dev am: 106dc34f 

am: 5d5d865d

Change-Id: If49e70eb961731a2bb5b8ecb5313fd52346612db
parents 572a5618 5d5d865d

packages/SystemUI/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1152,7 +1152,7 @@ 
    <string name="monitoring_description_vpn_settings_separator">" "</string>



    <!-- Monitoring dialog: Link to open the VPN settings page [CHAR LIMIT=60] -->

    <string name="monitoring_description_vpn_settings">Open VPN Settings</string>

    <string name="monitoring_description_vpn_settings">Open VPN settings</string>



    <!-- Monitoring dialog: Space that separates the CA certs body text and the "Open trusted credentials" link that follows it. [CHAR LIMIT=5] -->

    <string name="monitoring_description_ca_cert_settings_separator">" "</string>

packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooter.java

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ public class QSSecurityFooter implements OnClickListener, DialogInterface.OnClic 
    }



    private String getPositiveButton() {

        return mContext.getString(R.string.quick_settings_done);

        return mContext.getString(R.string.ok);

    }



    protected CharSequence getManagementMessage(boolean isDeviceManaged,