Commit 5b154b85 authored by lambroslambrou's avatar lambroslambrou Committed by Commit bot

Chromoting Android: Fix getActionBar() NullPointerException

s/getActionBar/getSupportActionBar in Desktop.java which uses
ActionBarActivity from the support library.

BUG=423875

Review URL: https://codereview.chromium.org/655243004

Cr-Commit-Position: refs/heads/master@{#299827}
parent 17abbb90
...@@ -140,7 +140,7 @@ public class Desktop extends ActionBarActivity implements View.OnSystemUiVisibil ...@@ -140,7 +140,7 @@ public class Desktop extends ActionBarActivity implements View.OnSystemUiVisibil
public void showActionBar() { public void showActionBar() {
mOverlayButton.setVisibility(View.INVISIBLE); mOverlayButton.setVisibility(View.INVISIBLE);
getActionBar().show(); getSupportActionBar().show();
View decorView = getWindow().getDecorView(); View decorView = getWindow().getDecorView();
decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE); decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
...@@ -149,7 +149,7 @@ public class Desktop extends ActionBarActivity implements View.OnSystemUiVisibil ...@@ -149,7 +149,7 @@ public class Desktop extends ActionBarActivity implements View.OnSystemUiVisibil
@SuppressLint("InlinedApi") @SuppressLint("InlinedApi")
public void hideActionBar() { public void hideActionBar() {
mOverlayButton.setVisibility(View.VISIBLE); mOverlayButton.setVisibility(View.VISIBLE);
getActionBar().hide(); getSupportActionBar().hide();
View decorView = getWindow().getDecorView(); View decorView = getWindow().getDecorView();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment