diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2020-11-04 20:42:14 -0800 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2020-11-04 20:42:14 -0800 |
| commit | a4d72345c288263348d1fbe62938528f913cc57b (patch) | |
| tree | 9cd3be086f0353dd58f67e97f619d48e0c66ced4 /app/src/main/res | |
| parent | 1c2d783f4bc7ad16b7cd4e323317d10e0b20432a (diff) | |
| parent | f4edc8f502279fa4eb1a52652c3f57b209202ecf (diff) | |
| download | dsub-a4d72345c288263348d1fbe62938528f913cc57b.tar.gz dsub-a4d72345c288263348d1fbe62938528f913cc57b.tar.bz2 dsub-a4d72345c288263348d1fbe62938528f913cc57b.zip | |
Merge branch 'target-sdk-29' into edge
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/abstract_activity.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/src/main/res/layout/abstract_activity.xml b/app/src/main/res/layout/abstract_activity.xml index 56db1439..7ca9b936 100644 --- a/app/src/main/res/layout/abstract_activity.xml +++ b/app/src/main/res/layout/abstract_activity.xml @@ -4,8 +4,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/drawer_layout" android:layout_width="match_parent" - android:layout_height="match_parent" - android:fitsSystemWindows="true"> + android:layout_height="match_parent"> <!-- The main content view --> <FrameLayout diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2dcee2d6..87ebbe07 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -669,7 +669,7 @@ <string name="details.home_page">Home Page</string> <string name="permission.external_storage.failed">DSub cannot function without the ability to write to storage</string> - <string name="permission.location.failed">This apps uses location data to get the WIFI SSID when the app is in use. No location data is collected.</string> + <string name="permission.location.failed">This apps uses location data to get the WIFI SSID to match against your local network settings. To get rid of this message, change the local network SSID to blank.</string> <plurals name="select_album_n_songs"> <item quantity="zero">No songs</item> |