diff options
| author | Joseph Herlant <herlantj@gmail.com> | 2018-08-30 10:53:09 -0700 |
|---|---|---|
| committer | Joseph Herlant <herlantj@gmail.com> | 2018-08-30 10:53:09 -0700 |
| commit | 20229a918ebb304d7e3c185d0a1a3174037ecc14 (patch) | |
| tree | 26f9ba6afb6a901673e3987bddf8085b09bc524c | |
| parent | 3e8962911655a82fe3e03195c9135e8ae1a15c04 (diff) | |
| download | navit-20229a918ebb304d7e3c185d0a1a3174037ecc14.tar.gz | |
cleanup:android:Fix checkstyle OperatorWrap
3 files changed, 6 insertions, 6 deletions
diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java index 0995ee12f..82a797253 100644 --- a/navit/android/src/org/navitproject/navit/Navit.java +++ b/navit/android/src/org/navitproject/navit/Navit.java @@ -313,8 +313,8 @@ public class Navit extends Activity { status_bar_height, action_bar_default_height, navigation_bar_height, navigation_bar_height_landscape, navigation_bar_width)); if ((ContextCompat.checkSelfPermission(this, - Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) || - (ContextCompat.checkSelfPermission(this, + Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) + || (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED)) { Log.d (TAG,"ask for permission(s)"); ActivityCompat.requestPermissions(this, diff --git a/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java b/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java index 2e908f82e..5750ad61b 100644 --- a/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java +++ b/navit/android/src/org/navitproject/navit/NavitAddressSearchActivity.java @@ -295,8 +295,8 @@ public class NavitAddressSearchActivity extends Activity { break; } - search_results_wait.setMessage(Navit.getInstance().getTstring(R.string.address_search_towns) + ":" + - search_results_towns + " " + search_results_wait.setMessage(Navit.getInstance().getTstring(R.string.address_search_towns) + ":" + + search_results_towns + " " + Navit.getInstance().getTstring(R.string.address_search_streets) + ":" + search_results_streets + "/" + search_results_streets_hn); diff --git a/navit/android/src/org/navitproject/navit/NavitGraphics.java b/navit/android/src/org/navitproject/navit/NavitGraphics.java index 2ee446353..efefd8216 100644 --- a/navit/android/src/org/navitproject/navit/NavitGraphics.java +++ b/navit/android/src/org/navitproject/navit/NavitGraphics.java @@ -717,8 +717,8 @@ public class NavitGraphics { * Logic is taken from AOSP RenderSessionImpl.findNavigationBar() * (platform/frameworks/base/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java) */ - final Boolean isLandscape = (navit.getResources().getConfiguration().orientation == - Configuration.ORIENTATION_LANDSCAPE); + final Boolean isLandscape = (navit.getResources().getConfiguration().orientation + == Configuration.ORIENTATION_LANDSCAPE); final Boolean isNavAtBottom = (!isLandscape) || (navit.getResources().getConfiguration().smallestScreenWidthDp >= 600); Log.d(TAG, String.format("isNavAtBottom=%b (Configuration.smallestScreenWidthDp=%d, isLandscape=%b)", isNavAtBottom, navit.getResources().getConfiguration().smallestScreenWidthDp, isLandscape)); |