diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-04-23 03:11:44 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-04-23 03:11:44 +0000 |
| commit | 630a7d033f27b532614d9419c08b408f8dc244a2 (patch) | |
| tree | c50bc5af49e839157574073f7ce2bbe358323b32 | |
| parent | ed8d11a773e5fc05851865c96412e12d0e0d2d05 (diff) | |
| parent | 446328f8ae51ca6abd0cec0bab33c98db0f28559 (diff) | |
| download | CellBroadcastReceiver-630a7d033f27b532614d9419c08b408f8dc244a2.tar.gz | |
Snap for 5495412 from 446328f8ae51ca6abd0cec0bab33c98db0f28559 to qt-release
Change-Id: I99d593e982237cf301aa9db949c478795b7d9777
| -rw-r--r-- | AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | res/layout/cell_broadcast_list_screen.xml | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 902e2c76f..bfd79a526 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -31,6 +31,7 @@ <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" /> <uses-permission android:name="android.permission.MANAGE_USERS" /> <uses-permission android:name="android.permission.DEVICE_POWER" /> + <uses-permission android:name="android.permission.START_ACTIVITIES_FROM_BACKGROUND" /> <uses-sdk android:minSdkVersion="21"/> diff --git a/res/layout/cell_broadcast_list_screen.xml b/res/layout/cell_broadcast_list_screen.xml index 3118ac5d4..80d43ec4b 100644 --- a/res/layout/cell_broadcast_list_screen.xml +++ b/res/layout/cell_broadcast_list_screen.xml @@ -33,7 +33,6 @@ android:layout_height="match_parent" android:gravity="center" android:text="@string/no_cell_broadcasts" - android:fontFamily="sans-serif" android:textColor="?android:attr/textColorSecondary" android:textAppearance="?android:attr/textAppearanceMedium" /> |