diff options
author | Douglas Sigelbaum <sigelbaum@google.com> | 2017-06-07 16:21:09 -0400 |
---|---|---|
committer | Douglas Sigelbaum <sigelbaum@google.com> | 2017-06-07 17:53:35 -0400 |
commit | d44566a42776d03195b15ba394d0d861306c0057 (patch) | |
tree | 8b24e014ce03b3e50826ef628bf283459d46c8f6 /input/autofill/AutofillFramework/kotlinApp/Application | |
parent | b7d6772dc5b2a35a1d23cd274f9e3e17b4b55b08 (diff) | |
download | android-d44566a42776d03195b15ba394d0d861306c0057.tar.gz |
Renaming sample autofill service to Multidataset
AutofillService.
Bug: 38182790
Test: manual
Change-Id: I21784ece130355f9bd1efec811bba7c0bfba5b70
Diffstat (limited to 'input/autofill/AutofillFramework/kotlinApp/Application')
-rw-r--r-- | input/autofill/AutofillFramework/kotlinApp/Application/src/main/AndroidManifest.xml | 10 | ||||
-rw-r--r-- | input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/AuthActivity.kt (renamed from input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/AuthActivity.kt) | 14 | ||||
-rw-r--r-- | input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/AutofillHelper.kt (renamed from input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/AutofillHelper.kt) | 8 | ||||
-rw-r--r-- | input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/MyAutofillService.kt (renamed from input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/MyAutofillService.kt) | 10 | ||||
-rw-r--r-- | input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/StructureParser.kt (renamed from input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/StructureParser.kt) | 10 | ||||
-rw-r--r-- | input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/datasource/AutofillRepository.kt (renamed from input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/datasource/AutofillRepository.kt) | 4 | ||||
-rw-r--r-- | input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/datasource/SharedPrefsAutofillRepository.kt (renamed from input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/datasource/SharedPrefsAutofillRepository.kt) | 4 | ||||
-rw-r--r-- | input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/model/AutofillField.kt (renamed from input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/model/AutofillField.kt) | 2 | ||||
-rw-r--r-- | input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/model/AutofillFieldsCollection.kt (renamed from input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/model/AutofillFieldsCollection.kt) | 2 | ||||
-rw-r--r-- | input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/model/ClientFormData.kt (renamed from input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/model/ClientFormData.kt) | 2 | ||||
-rw-r--r-- | input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/model/SavableAutofillData.kt (renamed from input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/model/SavableAutofillData.kt) | 2 | ||||
-rw-r--r-- | input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/settings/MyPreferences.kt (renamed from input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/settings/MyPreferences.kt) | 2 | ||||
-rw-r--r-- | input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/settings/SettingsActivity.kt (renamed from input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/settings/SettingsActivity.kt) | 34 | ||||
-rw-r--r-- | input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/multidataset_service_auth_activity.xml (renamed from input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/auth_activity.xml) | 2 | ||||
-rw-r--r-- | input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/multidataset_service_list_item.xml (renamed from input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/list_item.xml) | 0 | ||||
-rw-r--r-- | input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/multidataset_service_settings_activity.xml (renamed from input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/settings_activity.xml) | 0 | ||||
-rw-r--r-- | input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/multidataset_service_settings_authentication_dialog.xml (renamed from input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/settings_authentication_dialog.xml) | 0 | ||||
-rw-r--r-- | input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/xml/multidataset_service.xml (renamed from input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/xml/autofill_service.xml) | 2 |
18 files changed, 53 insertions, 55 deletions
diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/AndroidManifest.xml b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/AndroidManifest.xml index 787a6dba..f7aef70b 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/AndroidManifest.xml +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/AndroidManifest.xml @@ -61,7 +61,7 @@ Not necessary for a real service. --> <activity - android:name=".service.settings.SettingsActivity" + android:name=".multidatasetservice.settings.SettingsActivity" android:exported="true" android:label="@string/settings_name" android:taskAffinity=".SettingsActivity"> @@ -77,19 +77,19 @@ Settings Activity based on what the meta-data resource points to. --> <service - android:name=".service.MyAutofillService" + android:name=".multidatasetservice.MyAutofillService" android:permission="android.permission.BIND_AUTOFILL" - android:label="Sample Autofill Service"> + android:label="Multi-Dataset Autofill Service"> <meta-data android:name="android.autofill" - android:resource="@xml/autofill_service" /> + android:resource="@xml/multidataset_service" /> <intent-filter> <action android:name="android.service.autofill.AutofillService" /> </intent-filter> </service> - <activity android:name=".service.AuthActivity" /> + <activity android:name=".multidatasetservice.AuthActivity" /> </application> </manifest>
\ No newline at end of file diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/AuthActivity.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/AuthActivity.kt index d102a7e9..d3e07ce2 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/AuthActivity.kt +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/AuthActivity.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.example.android.autofillframework.service +package com.example.android.autofillframework.multidatasetservice import android.app.Activity import android.app.PendingIntent @@ -32,11 +32,11 @@ import com.example.android.autofillframework.CommonUtil.EXTRA_DATASET_NAME import com.example.android.autofillframework.CommonUtil.EXTRA_FOR_RESPONSE import com.example.android.autofillframework.CommonUtil.TAG import com.example.android.autofillframework.R -import com.example.android.autofillframework.service.datasource.SharedPrefsAutofillRepository -import com.example.android.autofillframework.service.settings.MyPreferences -import kotlinx.android.synthetic.main.auth_activity.cancel -import kotlinx.android.synthetic.main.auth_activity.login -import kotlinx.android.synthetic.main.auth_activity.master_password +import com.example.android.autofillframework.multidatasetservice.datasource.SharedPrefsAutofillRepository +import com.example.android.autofillframework.multidatasetservice.settings.MyPreferences +import kotlinx.android.synthetic.main.multidataset_service_auth_activity.cancel +import kotlinx.android.synthetic.main.multidataset_service_auth_activity.login +import kotlinx.android.synthetic.main.multidataset_service_auth_activity.master_password /** * This Activity controls the UI for logging in to the Autofill service. @@ -49,7 +49,7 @@ class AuthActivity : Activity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.auth_activity) + setContentView(R.layout.multidataset_service_auth_activity) login.setOnClickListener { submitLogin() } cancel.setOnClickListener { onFailure() diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/AutofillHelper.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/AutofillHelper.kt index 58666ef4..4d67d5bc 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/AutofillHelper.kt +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/AutofillHelper.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.example.android.autofillframework.service +package com.example.android.autofillframework.multidatasetservice import android.content.Context import android.service.autofill.Dataset @@ -23,8 +23,8 @@ import android.util.Log import android.widget.RemoteViews import com.example.android.autofillframework.CommonUtil.TAG import com.example.android.autofillframework.R -import com.example.android.autofillframework.service.model.AutofillFieldsCollection -import com.example.android.autofillframework.service.model.ClientFormData +import com.example.android.autofillframework.multidatasetservice.model.AutofillFieldsCollection +import com.example.android.autofillframework.multidatasetservice.model.ClientFormData import java.util.HashMap /** @@ -53,7 +53,7 @@ object AutofillHelper { } fun newRemoteViews(packageName: String, remoteViewsText: String): RemoteViews { - val presentation = RemoteViews(packageName, R.layout.list_item) + val presentation = RemoteViews(packageName, R.layout.multidataset_service_list_item) presentation.setTextViewText(R.id.text1, remoteViewsText) return presentation } diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/MyAutofillService.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/MyAutofillService.kt index a67e08a9..f9169029 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/MyAutofillService.kt +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/MyAutofillService.kt @@ -13,10 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.example.android.autofillframework.service +package com.example.android.autofillframework.multidatasetservice -import android.app.assist.AssistStructure -import android.os.Bundle import android.os.CancellationSignal import android.service.autofill.AutofillService import android.service.autofill.FillCallback @@ -28,14 +26,14 @@ import android.util.Log import com.example.android.autofillframework.CommonUtil.TAG import com.example.android.autofillframework.CommonUtil.bundleToString import com.example.android.autofillframework.R -import com.example.android.autofillframework.service.datasource.SharedPrefsAutofillRepository -import com.example.android.autofillframework.service.settings.MyPreferences +import com.example.android.autofillframework.multidatasetservice.datasource.SharedPrefsAutofillRepository +import com.example.android.autofillframework.multidatasetservice.settings.MyPreferences class MyAutofillService : AutofillService() { override fun onFillRequest(request: FillRequest, cancellationSignal: CancellationSignal, callback: FillCallback) { - val structure = request.fillContexts[request.fillContexts.size - 1].structure + val structure = request.getFillContexts().get(request.getFillContexts().size - 1).structure val data = request.clientState Log.d(TAG, "onFillRequest(): data=" + bundleToString(data)) diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/StructureParser.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/StructureParser.kt index 2cb37eea..78cab5ee 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/StructureParser.kt +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/StructureParser.kt @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.example.android.autofillframework.service +package com.example.android.autofillframework.multidatasetservice import android.app.assist.AssistStructure import android.app.assist.AssistStructure.ViewNode import android.util.Log import com.example.android.autofillframework.CommonUtil.TAG -import com.example.android.autofillframework.service.model.AutofillField -import com.example.android.autofillframework.service.model.AutofillFieldsCollection -import com.example.android.autofillframework.service.model.ClientFormData -import com.example.android.autofillframework.service.model.SavableAutofillData +import com.example.android.autofillframework.multidatasetservice.model.AutofillField +import com.example.android.autofillframework.multidatasetservice.model.AutofillFieldsCollection +import com.example.android.autofillframework.multidatasetservice.model.ClientFormData +import com.example.android.autofillframework.multidatasetservice.model.SavableAutofillData /** * Parser for an AssistStructure object. This is invoked when the Autofill Service receives an diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/datasource/AutofillRepository.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/datasource/AutofillRepository.kt index f335187e..9e4d6e20 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/datasource/AutofillRepository.kt +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/datasource/AutofillRepository.kt @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.example.android.autofillframework.service.datasource +package com.example.android.autofillframework.multidatasetservice.datasource import android.content.Context -import com.example.android.autofillframework.service.model.ClientFormData +import com.example.android.autofillframework.multidatasetservice.model.ClientFormData import java.util.HashMap interface AutofillRepository { diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/datasource/SharedPrefsAutofillRepository.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/datasource/SharedPrefsAutofillRepository.kt index e2fb8708..8aeac0df 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/datasource/SharedPrefsAutofillRepository.kt +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/datasource/SharedPrefsAutofillRepository.kt @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.example.android.autofillframework.service.datasource +package com.example.android.autofillframework.multidatasetservice.datasource import android.content.Context import android.content.SharedPreferences import android.util.ArraySet -import com.example.android.autofillframework.service.model.ClientFormData +import com.example.android.autofillframework.multidatasetservice.model.ClientFormData import com.google.gson.Gson import com.google.gson.reflect.TypeToken diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/model/AutofillField.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/model/AutofillField.kt index f6e89bde..474454a3 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/model/AutofillField.kt +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/model/AutofillField.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.example.android.autofillframework.service.model +package com.example.android.autofillframework.multidatasetservice.model import android.app.assist.AssistStructure.ViewNode; import android.service.autofill.SaveInfo diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/model/AutofillFieldsCollection.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/model/AutofillFieldsCollection.kt index 371934da..c62ea327 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/model/AutofillFieldsCollection.kt +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/model/AutofillFieldsCollection.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.example.android.autofillframework.service.model +package com.example.android.autofillframework.multidatasetservice.model import android.view.autofill.AutofillId import java.util.ArrayList diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/model/ClientFormData.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/model/ClientFormData.kt index 2dc844ae..8f434abe 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/model/ClientFormData.kt +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/model/ClientFormData.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.example.android.autofillframework.service.model +package com.example.android.autofillframework.multidatasetservice.model import android.service.autofill.Dataset import android.util.Log diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/model/SavableAutofillData.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/model/SavableAutofillData.kt index a088cb6c..3c50d339 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/model/SavableAutofillData.kt +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/model/SavableAutofillData.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.example.android.autofillframework.service.model +package com.example.android.autofillframework.multidatasetservice.model import android.app.assist.AssistStructure import android.view.autofill.AutofillValue diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/settings/MyPreferences.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/settings/MyPreferences.kt index 096813f6..1ddf3dab 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/settings/MyPreferences.kt +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/settings/MyPreferences.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.example.android.autofillframework.service.settings +package com.example.android.autofillframework.multidatasetservice.settings import android.content.Context import android.content.SharedPreferences diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/settings/SettingsActivity.kt b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/settings/SettingsActivity.kt index 7179d98b..e314ccd7 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/service/settings/SettingsActivity.kt +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/java/com/example/android/autofillframework/multidatasetservice/settings/SettingsActivity.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.example.android.autofillframework.service.settings +package com.example.android.autofillframework.multidatasetservice.settings import android.os.Bundle import android.support.v7.app.AlertDialog @@ -27,26 +27,26 @@ import android.widget.ImageView import android.widget.Switch import android.widget.TextView import com.example.android.autofillframework.R -import com.example.android.autofillframework.service.datasource.SharedPrefsAutofillRepository -import kotlinx.android.synthetic.main.settings_activity.settings_auth_credentials_container -import kotlinx.android.synthetic.main.settings_activity.settings_auth_credentials_icon -import kotlinx.android.synthetic.main.settings_activity.settings_auth_credentials_label -import kotlinx.android.synthetic.main.settings_activity.settings_auth_datasets_container -import kotlinx.android.synthetic.main.settings_activity.settings_auth_datasets_label -import kotlinx.android.synthetic.main.settings_activity.settings_auth_datasets_switch -import kotlinx.android.synthetic.main.settings_activity.settings_auth_responses_container -import kotlinx.android.synthetic.main.settings_activity.settings_auth_responses_label -import kotlinx.android.synthetic.main.settings_activity.settings_auth_responses_switch -import kotlinx.android.synthetic.main.settings_activity.settings_clear_data_container -import kotlinx.android.synthetic.main.settings_activity.settings_clear_data_icon -import kotlinx.android.synthetic.main.settings_activity.settings_clear_data_label +import com.example.android.autofillframework.multidatasetservice.datasource.SharedPrefsAutofillRepository +import kotlinx.android.synthetic.main.multidataset_service_settings_activity.settings_auth_credentials_container +import kotlinx.android.synthetic.main.multidataset_service_settings_activity.settings_auth_credentials_icon +import kotlinx.android.synthetic.main.multidataset_service_settings_activity.settings_auth_credentials_label +import kotlinx.android.synthetic.main.multidataset_service_settings_activity.settings_auth_datasets_container +import kotlinx.android.synthetic.main.multidataset_service_settings_activity.settings_auth_datasets_label +import kotlinx.android.synthetic.main.multidataset_service_settings_activity.settings_auth_datasets_switch +import kotlinx.android.synthetic.main.multidataset_service_settings_activity.settings_auth_responses_container +import kotlinx.android.synthetic.main.multidataset_service_settings_activity.settings_auth_responses_label +import kotlinx.android.synthetic.main.multidataset_service_settings_activity.settings_auth_responses_switch +import kotlinx.android.synthetic.main.multidataset_service_settings_activity.settings_clear_data_container +import kotlinx.android.synthetic.main.multidataset_service_settings_activity.settings_clear_data_icon +import kotlinx.android.synthetic.main.multidataset_service_settings_activity.settings_clear_data_label class SettingsActivity : AppCompatActivity() { public override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.settings_activity) + setContentView(R.layout.multidataset_service_settings_activity) setupSettingsSwitch(settings_auth_responses_container, settings_auth_responses_label, settings_auth_responses_switch, @@ -98,7 +98,7 @@ class SettingsActivity : AppCompatActivity() { private fun buildCurrentCredentialsDialog(): AlertDialog { val currentPasswordField = LayoutInflater .from(this@SettingsActivity) - .inflate(R.layout.settings_authentication_dialog, null) + .inflate(R.layout.multidataset_service_settings_authentication_dialog, null) .findViewById<EditText>(R.id.master_password_field) return prepareCredentialsDialog() .setMessage(R.string.settings_auth_enter_current_password) @@ -116,7 +116,7 @@ class SettingsActivity : AppCompatActivity() { private fun buildNewCredentialsDialog(): AlertDialog { val newPasswordField = LayoutInflater .from(this@SettingsActivity) - .inflate(R.layout.settings_authentication_dialog, null) + .inflate(R.layout.multidataset_service_settings_authentication_dialog, null) .findViewById<EditText>(R.id.master_password_field) return prepareCredentialsDialog() .setMessage(R.string.settings_auth_enter_new_password) diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/auth_activity.xml b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/multidataset_service_auth_activity.xml index 4b5926a7..0890af86 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/auth_activity.xml +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/multidataset_service_auth_activity.xml @@ -24,7 +24,7 @@ android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" - tools:context=".service.AuthActivity"> + tools:context=".multidatasetservice.AuthActivity"> <TextView android:layout_width="wrap_content" diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/list_item.xml b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/multidataset_service_list_item.xml index d01bc37d..d01bc37d 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/list_item.xml +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/multidataset_service_list_item.xml diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/settings_activity.xml b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/multidataset_service_settings_activity.xml index 3704e40f..3704e40f 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/settings_activity.xml +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/multidataset_service_settings_activity.xml diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/settings_authentication_dialog.xml b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/multidataset_service_settings_authentication_dialog.xml index 93ac6dd1..93ac6dd1 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/settings_authentication_dialog.xml +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/layout/multidataset_service_settings_authentication_dialog.xml diff --git a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/xml/autofill_service.xml b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/xml/multidataset_service.xml index 6408a68e..0c1c14d0 100644 --- a/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/xml/autofill_service.xml +++ b/input/autofill/AutofillFramework/kotlinApp/Application/src/main/res/xml/multidataset_service.xml @@ -21,4 +21,4 @@ Settings Activity. This is pointed to in the service's meta-data in the applicat --> <autofill-service xmlns:android="http://schemas.android.com/apk/res/android" - android:settingsActivity="com.example.android.autofillframework.service.settings.SettingsActivity"/>
\ No newline at end of file + android:settingsActivity="com.example.android.autofillframework.multidatasetservice.settings.SettingsActivity"/>
\ No newline at end of file |