PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of b1840567 to master

Browse Source 
Change-Id: Ieb83bd61e624609ce3c339ed0c33c691cb4b38bb
This commit is contained in:
Christopher Tate
2015-08-14 13:08:32 -07:00
parent ab60fe2a14 b184056727
commit 07298fbc3e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/applications/AppLaunchSettings.java
View File

@@ -39,6 +39,7 @@ import java.util.List;
import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS; import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS;
import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ASK; import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ASK;
import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK;
import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER; import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER;
import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED; import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED;
@@ -96,7 +97,7 @@ public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListe
}); });
mAppLinkState.setEntryValues(new CharSequence[] { mAppLinkState.setEntryValues(new CharSequence[] {
Integer.toString(INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS), Integer.toString(INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS),
Integer.toString(INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ASK), Integer.toString(INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK),
Integer.toString(INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER), Integer.toString(INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER),
}); });
@@ -108,7 +109,7 @@ public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListe
final int state = mPm.getIntentVerificationStatus(mPackageName, UserHandle.myUserId()); final int state = mPm.getIntentVerificationStatus(mPackageName, UserHandle.myUserId());
mAppLinkState.setValue( mAppLinkState.setValue(
Integer.toString((state == INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED) Integer.toString((state == INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED)
? INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ASK ? INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK
: state)); : state));
// Set the callback only after setting the initial selected item // Set the callback only after setting the initial selected item