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

Commit 2437d3c6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add default IME to Privacy Settings page"

parents c7bf800e 2700cdbd

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -8164,6 +8164,8 @@ 
        <item quantity="one"><xliff:g id="count">%d</xliff:g> default app set by your admin</item>

        <item quantity="other"><xliff:g id="count">%d</xliff:g> default apps set by your admin</item>

    </plurals>

    <!-- Label explaining that the current input method was set by the admin. [CHAR LIMIT=NONE] -->

    <string name="enterprise_privacy_input_method">Default keyboard set to <xliff:g id="app_label" example="Example Keyboard">%s</xliff:g> by your admin</string>

    <!-- Label explaining that an always-on VPN was set by the admin for the entire device. [CHAR LIMIT=NONE] -->

    <string name="enterprise_privacy_always_on_vpn_device">Always-on VPN turned on</string>

    <!-- Label explaining that an always-on VPN was set by the admin in the personal profile. [CHAR LIMIT=NONE] -->

res/xml/enterprise_privacy_settings.xml

+4 −0
Original line number Diff line number Diff line
@@ -88,6 +88,10 @@ 
                android:title="@string/enterprise_privacy_always_on_vpn_work"

                settings:allowDividerBelow="true"

                settings:multiLine="true"/>

        <com.android.settings.DividerPreference

                android:key="input_method"

                settings:allowDividerBelow="true"

                settings:multiLine="true"/>

        <com.android.settings.DividerPreference

                android:key="global_http_proxy"

                android:title="@string/enterprise_privacy_global_http_proxy"

src/com/android/settings/accounts/ChooseAccountActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ public class ChooseAccountActivity extends SettingsPreferenceFragment { 
    }



    private void addEnterpriseDisclosure() {

        final CharSequence disclosure = mFeatureProvider.getDeviceOwnerDisclosure(getActivity());

        final CharSequence disclosure = mFeatureProvider.getDeviceOwnerDisclosure();

        if (disclosure == null) {

            return;

        }

src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java

+8 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.enterprise;



import android.content.ComponentName;

import android.os.UserHandle;

import android.support.annotation.Nullable;



/**
@@ -89,4 +90,11 @@ public interface DevicePolicyManagerWrapper { 
     * @see android.app.admin.DevicePolicyManager#getLastNetworkLogRetrievalTime

     */

    long getLastNetworkLogRetrievalTime();



    /**

     * Calls {@code DevicePolicyManager.isCurrentInputMethodSetByOwner()}.

     *

     * @see android.app.admin.DevicePolicyManager#isCurrentInputMethodSetByOwner

     */

    boolean isCurrentInputMethodSetByOwner();

}

src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.enterprise; 


import android.app.admin.DevicePolicyManager;

import android.content.ComponentName;

import android.os.UserHandle;

import android.support.annotation.Nullable;



public class DevicePolicyManagerWrapperImpl implements DevicePolicyManagerWrapper {
@@ -72,4 +73,9 @@ public class DevicePolicyManagerWrapperImpl implements DevicePolicyManagerWrappe 
    public long getLastNetworkLogRetrievalTime() {

        return mDpm.getLastNetworkLogRetrievalTime();

    }



    @Override

    public boolean isCurrentInputMethodSetByOwner() {

        return mDpm.isCurrentInputMethodSetByOwner();

    }

}