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

Merge changes I06c1bc14,I5415b8ed into qt-dev

Browse Source 
am: a83638788b

Change-Id: If774abf9364a66eca020f65a5f2122c1faf5401a
This commit is contained in:
Fan Zhang
2019-05-17 16:32:11 -07:00
committed by android-build-merger
parent 09bc5975a4 a83638788b
commit bc58c1f129
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/wifi_dpp_qrcode_scanner_fragment.xml
View File

@@ -45,7 +45,8 @@
<FrameLayout <FrameLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:clipChildren="true">
<TextureView <TextureView
android:id="@+id/preview_view" android:id="@+id/preview_view"
android:layout_width="match_parent" android:layout_width="match_parent"

6
res/values/strings.xml
View File

@@ -8969,12 +8969,6 @@
<!-- Title for Default Phone app settings [CHAR LIMIT=30] --> <!-- Title for Default Phone app settings [CHAR LIMIT=30] -->
<string name="default_phone_title">Phone app</string> <string name="default_phone_title">Phone app</string>
<!--
~ STOPSHIP(b/110557011): Remove once the new UI is ready.
-->
<!-- Title for Roles settings [CHAR LIMIT=30] -->
<string name="roles_title">Roles</string>
<!-- Label of default app for current setting [CHAR LIMIT=40] --> <!-- Label of default app for current setting [CHAR LIMIT=40] -->
<string name="default_app">(Default)</string> <string name="default_app">(Default)</string>

2
src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
View File

@@ -67,7 +67,7 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
QrCamera.ScannerCallback, QrCamera.ScannerCallback,
WifiManager.ActionListener, WifiManager.ActionListener,
WifiTracker.WifiListener { WifiTracker.WifiListener {
private static final String TAG = "WifiDppQrCodeScannerFragment"; private static final String TAG = "WifiDppQrCodeScanner";
/** Message sent to hide error message */ /** Message sent to hide error message */
private static final int MESSAGE_HIDE_ERROR_MESSAGE = 1; private static final int MESSAGE_HIDE_ERROR_MESSAGE = 1;