Merge "[NFC] Add a picture under NFC settings to show NFC detection point." into rvc-dev
This commit is contained in:
BIN
res/drawable-nodpi/nfc_detection_point.png
Normal file
BIN
res/drawable-nodpi/nfc_detection_point.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 95 B |
29
res/layout/nfc_detection_point.xml
Normal file
29
res/layout/nfc_detection_point.xml
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Copyright (C) 2020 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.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="@dimen/nfc_detection_point_height"
|
||||||
|
android:scaleType="centerCrop"
|
||||||
|
android:cropToPadding="true"
|
||||||
|
android:src="@drawable/nfc_detection_point"
|
||||||
|
android:contentDescription="@null" />
|
||||||
|
|
||||||
|
</FrameLayout>
|
@@ -442,4 +442,7 @@
|
|||||||
|
|
||||||
<!-- Package name of dialer supports RTT setting-->
|
<!-- Package name of dialer supports RTT setting-->
|
||||||
<string name="config_rtt_setting_package_name" translatable="false"></string>
|
<string name="config_rtt_setting_package_name" translatable="false"></string>
|
||||||
|
|
||||||
|
<!-- Whether nfc detection point preview image is available or not. -->
|
||||||
|
<bool name="config_nfc_detection_point">false</bool>
|
||||||
</resources>
|
</resources>
|
||||||
|
@@ -67,6 +67,8 @@
|
|||||||
<!-- Weight of the right pane in a multi-pane preference layout. So the split is 40:60 -->
|
<!-- Weight of the right pane in a multi-pane preference layout. So the split is 40:60 -->
|
||||||
<integer name="preferences_right_pane_weight">6</integer>
|
<integer name="preferences_right_pane_weight">6</integer>
|
||||||
|
|
||||||
|
<dimen name="nfc_detection_point_height">300dp</dimen>
|
||||||
|
|
||||||
<dimen name="notification_app_icon_size">64dp</dimen>
|
<dimen name="notification_app_icon_size">64dp</dimen>
|
||||||
<dimen name="notification_app_icon_badge_size">20dp</dimen>
|
<dimen name="notification_app_icon_badge_size">20dp</dimen>
|
||||||
<dimen name="notification_app_icon_badge_margin">4dp</dimen>
|
<dimen name="notification_app_icon_badge_margin">4dp</dimen>
|
||||||
|
@@ -19,6 +19,12 @@
|
|||||||
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
||||||
android:title="@string/nfc_quick_toggle_title">
|
android:title="@string/nfc_quick_toggle_title">
|
||||||
|
|
||||||
|
<com.android.settingslib.widget.LayoutPreference
|
||||||
|
android:key="nfc_detection_point"
|
||||||
|
android:selectable="false"
|
||||||
|
android:layout="@layout/nfc_detection_point"
|
||||||
|
settings:controller="com.android.settings.nfc.NfcDetectionPointController"/>
|
||||||
|
|
||||||
<SwitchPreference
|
<SwitchPreference
|
||||||
android:key="toggle_nfc"
|
android:key="toggle_nfc"
|
||||||
android:title="@string/nfc_quick_toggle_title"
|
android:title="@string/nfc_quick_toggle_title"
|
||||||
@@ -37,4 +43,4 @@
|
|||||||
android:fragment="com.android.settings.nfc.PaymentSettings"
|
android:fragment="com.android.settings.nfc.PaymentSettings"
|
||||||
settings:keywords="@string/keywords_default_payment_app"
|
settings:keywords="@string/keywords_default_payment_app"
|
||||||
settings:controller="com.android.settings.applications.specialaccess.DefaultPaymentSettingsPreferenceController"/>
|
settings:controller="com.android.settings.applications.specialaccess.DefaultPaymentSettingsPreferenceController"/>
|
||||||
</PreferenceScreen>
|
</PreferenceScreen>
|
||||||
|
@@ -0,0 +1,48 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2020 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.nfc;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
import androidx.annotation.VisibleForTesting;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
import com.android.settings.core.BasePreferenceController;
|
||||||
|
/**
|
||||||
|
* Controller that used to show nfc detection point guidance
|
||||||
|
*/
|
||||||
|
public class NfcDetectionPointController extends BasePreferenceController {
|
||||||
|
private boolean mEnabled;
|
||||||
|
|
||||||
|
public NfcDetectionPointController(Context context, String preferenceKey) {
|
||||||
|
super(context, preferenceKey);
|
||||||
|
mEnabled = mContext.getResources().getBoolean(R.bool.config_nfc_detection_point);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getAvailabilityStatus() {
|
||||||
|
if (!mEnabled) {
|
||||||
|
return UNSUPPORTED_ON_DEVICE;
|
||||||
|
}
|
||||||
|
return AVAILABLE;
|
||||||
|
}
|
||||||
|
|
||||||
|
@VisibleForTesting
|
||||||
|
public void setConfig(boolean value) {
|
||||||
|
mEnabled = value;
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,50 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2020 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.nfc;
|
||||||
|
|
||||||
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.robolectric.RobolectricTestRunner;
|
||||||
|
import org.robolectric.RuntimeEnvironment;
|
||||||
|
|
||||||
|
@RunWith(RobolectricTestRunner.class)
|
||||||
|
public class NfcDetectionPointControllerTest {
|
||||||
|
|
||||||
|
private NfcDetectionPointController mController;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() {
|
||||||
|
mController = new NfcDetectionPointController(RuntimeEnvironment.application, "fakeKey");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getAvailabilityStatus_withConfigIsTrue_returnAvailable() {
|
||||||
|
mController.setConfig(true);
|
||||||
|
assertThat(mController.getAvailabilityStatus())
|
||||||
|
.isEqualTo(NfcDetectionPointController.AVAILABLE);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getAvailabilityStatus_withConfigIsFalse_returnUnavailable() {
|
||||||
|
mController.setConfig(false);
|
||||||
|
assertThat(mController.getAvailabilityStatus())
|
||||||
|
.isNotEqualTo(NfcDetectionPointController.AVAILABLE);
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user