[Fingerprint] Add fingerprint enroll in setup wizard
Make a subclass for each enrolling screen that setup wizard uses, and in override the corresponding get*Intent methods to always use the setup wizard versions of the next screens. On minor change made to the original flow is that it will now return RESULT_OK if it is finished, as opposed to RESULT_CANCELED. Bug: 21695577 Change-Id: Id666826e8027272ede6a5426967d66fb291670a4
This commit is contained in:
@@ -0,0 +1,73 @@
|
||||
/*
|
||||
* Copyright (C) 2015 The Android Open Source Project
|
||||
*
|
||||
* 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
|
||||
*/
|
||||
|
||||
package com.android.settings.fingerprint;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.content.res.Resources;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
|
||||
import com.android.settings.ChooseLockSettingsHelper;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SetupWizardUtils;
|
||||
import com.android.setupwizardlib.view.NavigationBar;
|
||||
|
||||
public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSensor
|
||||
implements NavigationBar.NavigationBarListener {
|
||||
|
||||
@Override
|
||||
protected Intent getEnrollingIntent() {
|
||||
Intent intent = new Intent(this, SetupFingerprintEnrollEnrolling.class);
|
||||
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
|
||||
SetupWizardUtils.copySetupExtras(getIntent(), intent);
|
||||
return intent;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
|
||||
resid = SetupWizardUtils.getTheme(getIntent());
|
||||
super.onApplyThemeResource(theme, resid, first);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void initViews() {
|
||||
SetupWizardUtils.setImmersiveMode(this);
|
||||
|
||||
final View nextButton = findViewById(R.id.next_button);
|
||||
if (nextButton != null) {
|
||||
nextButton.setVisibility(View.GONE);
|
||||
}
|
||||
|
||||
getNavigationBar().setNavigationBarListener(this);
|
||||
getNavigationBar().getBackButton().setVisibility(View.GONE);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Button getNextButton() {
|
||||
return getNavigationBar().getNextButton();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNavigateBack() {
|
||||
onBackPressed();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNavigateNext() {
|
||||
onNextButtonClick();
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user