diff --git a/Readme-en.md b/Readme-en.md index 5c2f7aa..76ce03f 100644 --- a/Readme-en.md +++ b/Readme-en.md @@ -14,12 +14,12 @@ Use Android's DevicePolicyManager API to manage your device. ## Features -- System: Disable camera, disable screenshot, master volume mute, disable USB signal, Lock task mode, Manage CA certificates, Wipe data... -- Network: Add/modify/delete Wi-Fi, Network stats, Minimum Wi-Fi security level, Always-on VPN, Network logging... -- Applications: Suspend/hide app, Block app uninstallation, Grant/revoke permissions, Clear app storage, Install/uninstall app... -- User restriction: Disable SMS, disable outgoing call, disable bluetooth, disable NFC, disable USB file transfer, disable app installing, disable app uninstalling... -- User manager: User information, Start/switch/stop/delete user, Create user... -- Password and keyguard: Reset password, Require password complexity, Set screen timeout... +- System: disable camera, disable screenshot, master volume mute, disable USB signal, lock task mode, wipe data... +- Network: add/modify/delete Wi-Fi, network stats, network logging... +- Applications: suspend/hide app, block app uninstallation, grant/revoke permissions, clear app storage, install/uninstall app... +- User restriction: disable SMS, disable outgoing call, disable bluetooth, disable NFC, disable USB file transfer, disable app installing/uninstalling... +- Users: user information, create/start/switch/stop/delete user... +- Password and keyguard: reset password, set screen timeout... ## Working modes diff --git a/Readme.md b/Readme.md index eaaf8d5..ef68db8 100644 --- a/Readme.md +++ b/Readme.md @@ -14,12 +14,12 @@ ## 功能 -- 系统:禁用摄像头、禁止截屏、全局静音、禁用USB信号、锁定任务模式、管理CA证书、清除数据... -- 网络:添加/修改/删除 Wi-Fi、网络统计、最小Wi-Fi安全等级、VPN保持打开、网络日志... +- 系统:禁用摄像头、禁止截屏、全局静音、禁用USB信号、锁定任务模式、清除数据... +- 网络:添加/修改/删除 Wi-Fi、网络统计、网络日志... - 应用:挂起/隐藏应用、阻止应用卸载、授予/撤销权限、清除应用存储、安装/卸载应用... -- 用户限制:禁止发送短信、禁止拨出电话、禁用蓝牙、禁用NFC、禁用USB文件传输、禁止安装应用、禁止卸载应用... -- 用户:用户信息、启动/切换/停止/删除用户、创建用户... -- 密码与锁屏:重置密码、要求密码复杂度、设置屏幕超时... +- 用户限制:禁止发送短信、禁止拨出电话、禁用蓝牙、禁用NFC、禁用USB文件传输、禁止安装/卸载应用... +- 用户:用户信息、创建/启动/切换/停止/删除用户... +- 密码与锁屏:重置密码、设置屏幕超时... ## 工作模式 diff --git a/app/src/main/java/com/bintianqi/owndroid/dpm/Applications.kt b/app/src/main/java/com/bintianqi/owndroid/dpm/Applications.kt index 754840e..17a434c 100644 --- a/app/src/main/java/com/bintianqi/owndroid/dpm/Applications.kt +++ b/app/src/main/java/com/bintianqi/owndroid/dpm/Applications.kt @@ -214,8 +214,10 @@ fun ApplicationsFeaturesScreen(onNavigateUp: () -> Unit, onNavigate: (Any) -> Un if(VERSION.SDK_INT >= 28 && privilege.device) { FunctionItem(R.string.keep_uninstalled_packages, icon = R.drawable.delete_fill0) { onNavigate(KeepUninstalledPackages) } } - if(VERSION.SDK_INT >= 28) FunctionItem(R.string.install_existing_app, icon = R.drawable.install_mobile_fill0) { - onNavigate(InstallExistingApp) + if (VERSION.SDK_INT >= 28 && (privilege.device || (privilege.profile && privilege.affiliated))) { + FunctionItem(R.string.install_existing_app, icon = R.drawable.install_mobile_fill0) { + onNavigate(InstallExistingApp) + } } if(VERSION.SDK_INT >= 30 && privilege.work) { FunctionItem(R.string.cross_profile_apps, icon = R.drawable.work_fill0) { onNavigate(CrossProfilePackages) } diff --git a/app/src/main/java/com/bintianqi/owndroid/dpm/UserRestriction.kt b/app/src/main/java/com/bintianqi/owndroid/dpm/UserRestriction.kt index 47b797f..b9dc2c3 100644 --- a/app/src/main/java/com/bintianqi/owndroid/dpm/UserRestriction.kt +++ b/app/src/main/java/com/bintianqi/owndroid/dpm/UserRestriction.kt @@ -116,7 +116,9 @@ fun UserRestrictionScreen(onNavigateUp: () -> Unit, onNavigate: (Any) -> Unit) { ) { Spacer(Modifier.padding(vertical = 2.dp)) Text(text = stringResource(R.string.switch_to_disable_feature), modifier = Modifier.padding(start = 16.dp)) - if(privilege.profile) { Text(text = stringResource(R.string.profile_owner_is_restricted), modifier = Modifier.padding(start = 16.dp)) } + if (privilege.profile && !privilege.work) { + Text(text = stringResource(R.string.profile_owner_is_restricted), modifier = Modifier.padding(start = 16.dp)) + } if(privilege.work) { Text(text = stringResource(R.string.some_features_invalid_in_work_profile), modifier = Modifier.padding(start = 16.dp)) } diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt new file mode 100644 index 0000000..7cea4ca --- /dev/null +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -0,0 +1,17 @@ +OwnDroid is a DPC (device policy controller) app. + +It supports the following working modes: + +- Device owner +- Profile owner (only in secondary users) +- Work profile +- Dhizuku + +It has the following features: + +- System: disable camera, disable screenshot, master volume mute, disable USB signal, lock task mode, wipe data... +- Network: add/modify/delete Wi-Fi, network stats, network logging... +- Applications: suspend/hide app, block app uninstallation, grant/revoke permissions, clear app storage, install/uninstall app... +- User restriction: disable SMS, disable outgoing call, disable bluetooth, disable NFC, disable USB file transfer, disable app installing/uninstalling... +- Users: user information, create/start/switch/stop/delete user... +- Password and keyguard: reset password, set screen timeout... \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg new file mode 100644 index 0000000..11cb604 Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg differ diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt new file mode 100644 index 0000000..a77b727 --- /dev/null +++ b/fastlane/metadata/android/en-US/short_description.txt @@ -0,0 +1 @@ +Use device owner privileges to manage your device \ No newline at end of file diff --git a/fastlane/metadata/android/zh/full_description.txt b/fastlane/metadata/android/zh/full_description.txt new file mode 100644 index 0000000..2d457c8 --- /dev/null +++ b/fastlane/metadata/android/zh/full_description.txt @@ -0,0 +1,17 @@ +OwnDroid是一个设备策略管理器app。 + +它支持以下几种工作模式: + +- Device owner +- Profile owner (仅在次要用户中) +- 工作资料 +- Dhizuku + +它有以下功能: + +- 系统:禁用摄像头、禁止截屏、全局静音、禁用USB信号、锁定任务模式、清除数据... +- 网络:添加/修改/删除 Wi-Fi、网络统计、网络日志... +- 应用:挂起/隐藏应用、阻止应用卸载、授予/撤销权限、清除应用存储、安装/卸载应用... +- 用户限制:禁止发送短信、禁止拨出电话、禁用蓝牙、禁用NFC、禁用USB文件传输、禁止安装/卸载应用... +- 用户:用户信息、创建/启动/切换/停止/删除用户... +- 密码与锁屏:重置密码、设置屏幕超时... \ No newline at end of file diff --git a/fastlane/metadata/android/zh/images/phoneScreenshots/1.jpg b/fastlane/metadata/android/zh/images/phoneScreenshots/1.jpg new file mode 100644 index 0000000..1ec95ab Binary files /dev/null and b/fastlane/metadata/android/zh/images/phoneScreenshots/1.jpg differ diff --git a/fastlane/metadata/android/zh/short_description.txt b/fastlane/metadata/android/zh/short_description.txt new file mode 100644 index 0000000..af2b698 --- /dev/null +++ b/fastlane/metadata/android/zh/short_description.txt @@ -0,0 +1 @@ +使用device owner特权管理你的设备 \ No newline at end of file