diff --git a/app/src/main/java/com/bintianqi/owndroid/dpm/ApplicationManage.kt b/app/src/main/java/com/bintianqi/owndroid/dpm/ApplicationManage.kt index 7481b3b..4bc7b28 100644 --- a/app/src/main/java/com/bintianqi/owndroid/dpm/ApplicationManage.kt +++ b/app/src/main/java/com/bintianqi/owndroid/dpm/ApplicationManage.kt @@ -196,7 +196,7 @@ private fun Home(navCtrl:NavHostController, pkgName: String){ if(isDeviceOwner(myDpm)||isProfileOwner(myDpm)){ SubPageItem(R.string.block_uninstall,"",R.drawable.delete_forever_fill0){navCtrl.navigate("BlockUninstall")} } - if(VERSION.SDK_INT>=30&&(isDeviceOwner(myDpm)||isProfileOwner(myDpm))){ + if((VERSION.SDK_INT>=30&&isDeviceOwner(myDpm))||(VERSION.SDK_INT>=33&&isProfileOwner(myDpm))){ SubPageItem(R.string.ucd,"",R.drawable.do_not_touch_fill0){navCtrl.navigate("UserControlDisabled")} } if(VERSION.SDK_INT>=23&&(isDeviceOwner(myDpm)||isProfileOwner(myDpm))){ diff --git a/app/src/main/java/com/bintianqi/owndroid/dpm/Password.kt b/app/src/main/java/com/bintianqi/owndroid/dpm/Password.kt index 59aeeae..68e89f3 100644 --- a/app/src/main/java/com/bintianqi/owndroid/dpm/Password.kt +++ b/app/src/main/java/com/bintianqi/owndroid/dpm/Password.kt @@ -449,13 +449,13 @@ private fun PasswordHistoryLength(){ var ableToApply by remember{ mutableStateOf(inputContent!="") } Column(modifier = Modifier.fillMaxSize().padding(horizontal = 8.dp).verticalScroll(rememberScrollState())){ Spacer(Modifier.padding(vertical = 10.dp)) - Text(text = stringResource(R.string.pwd_timeout), style = typography.headlineLarge) + Text(text = stringResource(R.string.pwd_history), style = typography.headlineLarge) Spacer(Modifier.padding(vertical = 5.dp)) - Text(text= stringResource(R.string.pwd_timeout_desc)) + Text(text= stringResource(R.string.pwd_history_desc)) Spacer(Modifier.padding(vertical = 5.dp)) OutlinedTextField( value = inputContent, - label = { Text(stringResource(R.string.time_unit_ms))}, + label = { Text(stringResource(R.string.length))}, onValueChange = { inputContent = it ableToApply = inputContent!="" diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index a257e75..25d09ec 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -30,6 +30,7 @@ 未知 重置 时间(ms) + 长度 无日志 默认 @@ -403,6 +404,7 @@ 超时后锁屏(毫秒),0为由用户决定 超时后用户需重新设置密码(毫秒),0为无限制 密码历史记录长度 + 用户无法设置指定历史范围内之前曾设置过的密码 无(允许不设密码) 低(允许图案和连续性) 中(无连续性,至少4位) @@ -454,7 +456,7 @@ 动态取色 安卓12+ 关于 - 使用安卓的Device admin、Device owner 、Profile owner,全方位掌控你的设备 + 使用安卓的Device admin、Device owner、Profile owner,全方位掌控你的设备 使用教程 源代码 纯黑夜间主题 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6215bba..3d2f3b2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -31,6 +31,7 @@ Unknown Reset Time(ms) + Length None No logs Default @@ -417,6 +418,7 @@ Enter 0 to allow user decision, unit: millisecond When reach this limit, user should set a new password. Enter 0 to allow user decision, unit: millisecond Password history length + Historical passwords within the specified range cannot be set by user None (No password allowed) Low (Gesture password and characters repetition allowed) Medium (Repetition disallowed, 4 characters at least) @@ -468,7 +470,7 @@ Dynamic color Android 12+ About - Use device admin, profile owner and device owner privilege to take full control of your device. + Use Device admin, Profile owner and Device owner privilege to take full control of your device. User guide Source code Black theme