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

Merge "Create add more fingerprint suggestion for setup" into oc-dr1-dev am: cf3130338c

Browse Source 
am: 15bcab49f7

Change-Id: Ib5cbaaa4c7bcfce89ed491e5ab02fd3069549efc
This commit is contained in:
Maurice Lam
2017-06-22 21:36:47 +00:00
committed by android-build-merger
parent 71dfd08b97 15bcab49f7
commit 554c95fbb1
6 changed files with 163 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/Settings.java
View File

@@ -143,7 +143,6 @@ public class Settings extends SettingsActivity {
public static class WifiCallingSuggestionActivity extends SettingsActivity { /* empty */ }
public static class ZenModeAutomationSuggestionActivity extends SettingsActivity { /* empty */ }
public static class FingerprintSuggestionActivity extends FingerprintSettings { /* empty */ }
public static class FingerprintEnrollSuggestionActivity extends FingerprintEnrollIntroduction {
/* empty */
}

2
src/com/android/settings/dashboard/suggestions/SuggestionsChecks.java
View File

@@ -30,11 +30,11 @@ import android.support.annotation.VisibleForTesting;
import com.android.ims.ImsManager;
import com.android.settings.Settings.CameraLiftTriggerSuggestionActivity;
import com.android.settings.Settings.FingerprintEnrollSuggestionActivity;
import com.android.settings.Settings.FingerprintSuggestionActivity;
import com.android.settings.Settings.ScreenLockSuggestionActivity;
import com.android.settings.Settings.WifiCallingSuggestionActivity;
import com.android.settings.Settings.ZenModeAutomationSuggestionActivity;
import com.android.settings.Utils;
import com.android.settings.fingerprint.FingerprintSuggestionActivity;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.wallpaper.WallpaperSuggestionActivity;
import com.android.settingslib.drawer.Tile;

39
src/com/android/settings/fingerprint/FingerprintSuggestionActivity.java Normal file
View File

@@ -0,0 +1,39 @@
/*
* Copyright (C) 2017 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.widget.Button;
import com.android.settings.R;
public class FingerprintSuggestionActivity extends SetupFingerprintEnrollIntroduction {
@Override
protected void initViews() {
super.initViews();
final Button cancelButton = findViewById(R.id.fingerprint_cancel_button);
cancelButton.setText(R.string.security_settings_fingerprint_enroll_introduction_cancel);
}
@Override
public void finish() {
// Always use RESULT_CANCELED because this action can be done multiple times
setResult(RESULT_CANCELED);
super.finish();
}
}