diff options
| author | Adrian Roos <roosa@google.com> | 2014-10-16 14:54:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-16 14:54:19 +0000 |
| commit | ccb7a9af271836fde98636d9ce6ebbda09eb0158 (patch) | |
| tree | b5257bdd4d0184771f657782eb9848710d05982c /core/java/com | |
| parent | ea6f0ae86d62cff88d63b926578c588a956d0512 (diff) | |
| parent | 27c3ab630afd6296ff1ff7b2b71638caa8f2ec54 (diff) | |
| download | frameworks_base-ccb7a9af271836fde98636d9ce6ebbda09eb0158.zip frameworks_base-ccb7a9af271836fde98636d9ce6ebbda09eb0158.tar.gz frameworks_base-ccb7a9af271836fde98636d9ce6ebbda09eb0158.tar.bz2 | |
Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/app/ResolverActivity.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index f9da09a..b9cbc62 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -74,6 +74,9 @@ import java.util.List; import java.util.Map; import java.util.Set; +import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR; +import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN; + /** * This activity is displayed when the system attempts to start an Intent for * which there is more than one matching activity, allowing the user to decide @@ -269,6 +272,9 @@ public class ResolverActivity extends Activity implements AdapterView.OnItemClic mListView = (ListView) findViewById(R.id.resolver_list); mListView.setVisibility(View.GONE); } + // Prevent the Resolver window from becoming the top fullscreen window and thus from taking + // control of the system bars. + getWindow().clearFlags(FLAG_LAYOUT_IN_SCREEN|FLAG_LAYOUT_INSET_DECOR); final ResolverDrawerLayout rdl = (ResolverDrawerLayout) findViewById(R.id.contentPanel); if (rdl != null) { |