awfixer/OwnDroid
1
0
Fork 0
mirror of https://github.com/awfixers-stuff/OwnDroid.git synced 2026-03-23 19:15:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

hide deactivate profile owner button in work profile (#16)

Browse Source 
add a button to copy device-specific id
This commit is contained in:
BinTianqi
2024-05-05 15:04:09 +08:00
parent 57e5021f1e
commit 9743cecd37
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/bintianqi/owndroid/dpm/Permissions.kt
View File

@@ -119,10 +119,12 @@ private fun Home(localNavCtrl:NavHostController,listScrollState:ScrollState){
operation = {localNavCtrl.navigate("ProfileOwner")} operation = {localNavCtrl.navigate("ProfileOwner")}
) )
} }
if(!isProfileOwner(myDpm)){
SubPageItem( SubPageItem(
R.string.device_owner, stringResource(if(isDeviceOwner(myDpm)){R.string.activated}else{R.string.deactivated}), R.string.device_owner, stringResource(if(isDeviceOwner(myDpm)){R.string.activated}else{R.string.deactivated}),
operation = {localNavCtrl.navigate("DeviceOwner")} operation = {localNavCtrl.navigate("DeviceOwner")}
) )
}
SubPageItem(R.string.shizuku,""){localNavCtrl.navigate("Shizuku")} SubPageItem(R.string.shizuku,""){localNavCtrl.navigate("Shizuku")}
SubPageItem(R.string.device_info,"",R.drawable.perm_device_information_fill0){localNavCtrl.navigate("DeviceInfo")} SubPageItem(R.string.device_info,"",R.drawable.perm_device_information_fill0){localNavCtrl.navigate("DeviceInfo")}
if(VERSION.SDK_INT>=31&&(isProfileOwner(myDpm)|| isDeviceOwner(myDpm))){ if(VERSION.SDK_INT>=31&&(isProfileOwner(myDpm)|| isDeviceOwner(myDpm))){
@@ -204,6 +206,7 @@ private fun DeviceAdmin(){
myDpm.removeActiveAdmin(myComponent) myDpm.removeActiveAdmin(myComponent)
co.launch{ delay(400); showDeactivateButton=myDpm.isAdminActive(myComponent) } co.launch{ delay(400); showDeactivateButton=myDpm.isAdminActive(myComponent) }
}, },
enabled = !isProfileOwner(myDpm)&&!isDeviceOwner(myDpm),
colors = ButtonDefaults.buttonColors(containerColor = colorScheme.error, contentColor = colorScheme.onError) colors = ButtonDefaults.buttonColors(containerColor = colorScheme.error, contentColor = colorScheme.onError)
) { ) {
Text(stringResource(R.string.deactivate)) Text(stringResource(R.string.deactivate))
@@ -243,6 +246,7 @@ private fun ProfileOwner(){
myDpm.clearProfileOwner(myComponent) myDpm.clearProfileOwner(myComponent)
co.launch { delay(400); showDeactivateButton=isProfileOwner(myDpm) } co.launch { delay(400); showDeactivateButton=isProfileOwner(myDpm) }
}, },
enabled = !myDpm.isManagedProfile(myComponent),
colors = ButtonDefaults.buttonColors(containerColor = colorScheme.error, contentColor = colorScheme.onError) colors = ButtonDefaults.buttonColors(containerColor = colorScheme.error, contentColor = colorScheme.onError)
) { ) {
Text(stringResource(R.string.deactivate)) Text(stringResource(R.string.deactivate))
@@ -355,6 +359,7 @@ private fun SpecificID(){
Spacer(Modifier.padding(vertical = 5.dp)) Spacer(Modifier.padding(vertical = 5.dp))
if(specificId!=""){ if(specificId!=""){
SelectionContainer(modifier = Modifier.horizontalScroll(rememberScrollState())){ Text(specificId) } SelectionContainer(modifier = Modifier.horizontalScroll(rememberScrollState())){ Text(specificId) }
CopyTextButton(myContext, R.string.copy, specificId)
}else{ }else{
Text(stringResource(R.string.require_set_org_id)) Text(stringResource(R.string.require_set_org_id))
} }

1
app/src/main/res/values-zh-rCN/strings.xml
View File

@@ -42,6 +42,7 @@
<string name="options">选项</string> <string name="options">选项</string>
<string name="copy_command">复制代码</string> <string name="copy_command">复制代码</string>
<string name="unknown_status">未知状态</string> <string name="unknown_status">未知状态</string>
<string name="copy">复制</string>
<!--Permissions--> <!--Permissions-->
<string name="click_to_activate">点击以激活</string> <string name="click_to_activate">点击以激活</string>

1
app/src/main/res/values/strings.xml
View File

@@ -45,6 +45,7 @@
<string name="package_name">Package name</string> <string name="package_name">Package name</string>
<string name="not_exist">Not exist</string> <string name="not_exist">Not exist</string>
<string name="unknown_status">Unknown status</string> <string name="unknown_status">Unknown status</string>
<string name="copy">Copy</string>
<!--Permissions--> <!--Permissions-->
<string name="click_to_activate">Click to activate</string> <string name="click_to_activate">Click to activate</string>