From fef1f5c31e7683ade64b55cc0b5cf1dcdf912eec Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Wed, 25 Mar 2015 11:28:02 +0100 Subject: [PATCH] Emergency fix: accesibility additions break Android 2.x --- src/com/owncloud/android/ui/activity/FileDisplayActivity.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index e921d73c..052250d3 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -1393,7 +1393,10 @@ OnSslUntrustedCertListener, OnEnforceableRefreshListener { actionBar.setDisplayShowTitleEnabled(!noRoot); if (!noRoot) { actionBar.setTitle(getString(R.string.default_display_name_for_root_folder)); - getWindow().getDecorView().findViewById(actionBarTitleId).setContentDescription(getString(R.string.default_display_name_for_root_folder)); + View actionBarView = getWindow().getDecorView().findViewById(actionBarTitleId); + if (actionBarView != null) { // it's null in Android 2.x (at least) + actionBarView.setContentDescription(getString(R.string.default_display_name_for_root_folder)); + } } actionBar.setNavigationMode(!noRoot ? ActionBar.NAVIGATION_MODE_STANDARD : ActionBar.NAVIGATION_MODE_LIST); actionBar.setListNavigationCallbacks(mDirectories, this); // assuming mDirectories is updated -- 2.11.0