Revert "Bluetooth configuration for SetupWizard."HEADandroid-wear-p-preview-2android-wear-8.1.0_r1android-wear-8.0.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-preview-2android-o-mr1-preview-1android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r9android-8.1.0_r81android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1android-8.0.0_r34android-8.0.0_r33android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21security-oc-mr1-releasesdk-releaseoreo-vts-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-iot-releaseoreo-mr1-devoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-mr1-1.2-iot-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devoreo-devo-mr1-iot-preview-8o-mr1-iot-preview-7mastermain

This reverts commit 2066ca63ba8f0765ee30e1be14552866da35d8ac.

Change-Id: Icbec4a3c404729dc6489d65fc3fff975d55f7d71

1 files changed, 0 insertions, 163 deletions

diff --git a/SetupWizard/res/xml/wizard_script_user.xml b/SetupWizard/res/xml/wizard_script_user.xml
deleted file mode 100644
index 10c91a7..0000000
--- a/SetupWizard/res/xml/wizard_script_user.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (c) 2014 Google Inc.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<!--
-    The wizard:uris recorded here have the inconvenience of being generated by hand, but they allow
-    for the full spread of launch flags (we need FLAG_ACTIVITY_NEW_TASK [0x10000000]), where the
-    <intent> tag processed by Intent.parseIntent() does not.
-
-    adb shell am to-intent-uri -a com.android.setupwizard.WELCOME -f 0x10000000 \-\-ez firstRun true
--->
-<WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.android.car.setupwizard"
-    wizard:firstAction="oem_pre_setup">
-
-    <!-- Preliminary setup for OEMs [CUSTOMIZABLE] -->
-    <WizardAction id="oem_pre_setup"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.OEM_PRE_SETUP;end">
-        <result wizard:action="secondary_user_warning" />
-    </WizardAction>
-
-
-    <!-- Secondary user warning [RECOMMENDED, CUSTOMIZABLE] -->
-    <WizardAction id="secondary_user_warning"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.USER_WARNING;end">
-        <result wizard:name="dpm_user_complete"
-            wizard:resultCode="111"
-            wizard:action="check_user_unlock_dpm_user_complete" />
-        <result wizard:action="check_user_unlock" />
-    </WizardAction>
-
-    <WizardAction id="check_user_unlock_dpm_user_complete"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.CHECK_USER_UNLOCK;end">
-        <result wizard:action="oem_post_setup" />
-    </WizardAction>
-
-    <WizardAction id="check_user_unlock"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.CHECK_USER_UNLOCK;end">
-        <result wizard:action="bluetooth_settings" />
-    </WizardAction>
-
-    <!-- Bluetooth selection [REQUIRED, CUSTOMIZABLE] -->
-    <WizardAction id="bluetooth_settings"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.BLUETOOTH_SETTINGS;end">
-        <result wizard:action="network_settings" />
-    </WizardAction>
-
-    <!-- Network selection [REQUIRED, CUSTOMIZABLE] -->
-    <WizardAction id="network_settings"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.NETWORK_SETTINGS;end">
-        <result wizard:name="see_all_wifi"
-            wizard:resultCode="101"
-            wizard:action="wifi_settings" />
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="no_account_flow" />
-        <result wizard:action="captive_portal" />
-    </WizardAction>
-
-
-    <!-- Wi-Fi setup [REQUIRED, CUSTOMIZABLE] -->
-    <WizardAction id="wifi_settings"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.WIFI_SETTINGS;end">
-        <result wizard:action="captive_portal" />
-    </WizardAction>
-
-
-    <!-- Resolve captive portal access, and wait for check-in [REQUIRED] -->
-    <WizardAction id="captive_portal"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.CAPTIVE_PORTAL;end">
-        <result wizard:action="gms_checkin" />
-    </WizardAction>
-
-    <WizardAction id="gms_checkin"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.GMS_CHECKIN;end">
-        <result wizard:action="load_account_intent" />
-    </WizardAction>
-
-
-    <!-- Add an account [REQUIRED] -->
-    <WizardAction id="load_account_intent"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.LOAD_ADD_ACCOUNT_INTENT;end">
-        <result wizard:action="account_setup" />
-    </WizardAction>
-
-    <WizardAction id="account_setup"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.ACCOUNT_SETUP;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="no_account_flow" />
-        <!-- Alternate flow if managed provisioning already set the user up (for enterprise) [RECOMMENDED] -->
-        <result wizard:name="dpm_user_complete"
-            wizard:resultCode="111"
-            wizard:action="oem_post_setup" />
-        <result wizard:action="gms_account_checkin" />
-    </WizardAction>
-
-
-    <!-- Checkin with Gservices using account. If it fails, VPA will not be available. [REQUIRED] -->
-    <WizardAction id="gms_account_checkin"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.GMS_ACCOUNT_CHECKIN;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="mfm_check" />
-        <result wizard:action="start_vpa" />
-    </WizardAction>
-
-
-    <!-- Initiate VPA (required for Play Auto-Installs) [RECOMMENDED] -->
-    <WizardAction id="start_vpa"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.START_VPA;end">
-        <result wizard:action="mfm_check" />
-    </WizardAction>
-
-
-    <!-- Branch to script for setting up with or without an account [REQUIRED] -->
-    <WizardAction id="mfm_check"
-        wizard:uri="intent:#Intent;action=com.google.android.setupwizard.ACCOUNT_CHECK;end">
-        <result wizard:name="skip"
-            wizard:resultCode="1"
-            wizard:action="no_account_flow" />
-        <result wizard:action="account_flow" />
-    </WizardAction>
-
-
-    <!-- Set up with an account [REQUIRED] -->
-    <WizardAction id="account_flow"
-        wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_user_account_flow">
-        <result wizard:action="oem_post_setup" />
-    </WizardAction>
-
-
-    <!-- Set up without an account [REQUIRED] -->
-    <WizardAction id="no_account_flow"
-        wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_user_no_account_flow">
-        <result wizard:action="oem_post_setup" />
-    </WizardAction>
-
-
-    <!-- OEM completion [CUSTOMIZABLE] -->
-    <WizardAction id="oem_post_setup"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.OEM_POST_SETUP;end">
-        <result wizard:action="exit" />
-    </WizardAction>
-
-
-    <!-- Leave Setup Wizard [REQUIRED] -->
-    <WizardAction id="exit"
-        wizard:uri="intent:#Intent;action=com.android.setupwizard.EXIT;end" />
-
-</WizardScript>