aboutsummaryrefslogtreecommitdiff
path: root/ui/window
diff options
context:
space:
mode:
authorAndrii Kulian <akulian@google.com>2016-03-29 17:17:47 -0700
committerAndrii Kulian <akulian@google.com>2016-03-29 17:35:47 -0700
commitf8064b80615433cd4d619be0daace76d563545f3 (patch)
tree4a5b159abc0775a72957c11e9f42436e60ddab89 /ui/window
parent526ab5816725d8070f86bec2e69531120b6f59dc (diff)
downloadandroid-f8064b80615433cd4d619be0daace76d563545f3.tar.gz
Refactor usages of Picture In Picture and Multi Window (3/4)
Bug: 27365860 Change-Id: Ic24f7ab7eecc4819beefa18e87ab83aa8aa5246a
Diffstat (limited to 'ui/window')
-rw-r--r--ui/window/MultiWindowPlayground/Application/src/main/java/com/android/multiwindowplayground/MainActivity.java2
-rw-r--r--ui/window/MultiWindowPlayground/Application/src/main/java/com/android/multiwindowplayground/activities/LoggingActivity.java6
2 files changed, 4 insertions, 4 deletions
diff --git a/ui/window/MultiWindowPlayground/Application/src/main/java/com/android/multiwindowplayground/MainActivity.java b/ui/window/MultiWindowPlayground/Application/src/main/java/com/android/multiwindowplayground/MainActivity.java
index 395385d6..bd7b5529 100644
--- a/ui/window/MultiWindowPlayground/Application/src/main/java/com/android/multiwindowplayground/MainActivity.java
+++ b/ui/window/MultiWindowPlayground/Application/src/main/java/com/android/multiwindowplayground/MainActivity.java
@@ -40,7 +40,7 @@ public class MainActivity extends LoggingActivity {
View multiDisabledMessage = findViewById(R.id.warning_multiwindow_disabled);
// Display an additional message if the app is not in multiwindow mode.
- if (!inMultiWindow()) {
+ if (!isInMultiWindowMode()) {
multiDisabledMessage.setVisibility(View.VISIBLE);
} else {
multiDisabledMessage.setVisibility(View.GONE);
diff --git a/ui/window/MultiWindowPlayground/Application/src/main/java/com/android/multiwindowplayground/activities/LoggingActivity.java b/ui/window/MultiWindowPlayground/Application/src/main/java/com/android/multiwindowplayground/activities/LoggingActivity.java
index 604485da..988a3195 100644
--- a/ui/window/MultiWindowPlayground/Application/src/main/java/com/android/multiwindowplayground/activities/LoggingActivity.java
+++ b/ui/window/MultiWindowPlayground/Application/src/main/java/com/android/multiwindowplayground/activities/LoggingActivity.java
@@ -103,10 +103,10 @@ public abstract class LoggingActivity extends AppCompatActivity {
}
@Override
- public void onMultiWindowChanged(boolean inMultiWindow) {
- super.onMultiWindowChanged(inMultiWindow);
+ public void onMultiWindowModeChanged(boolean isInMultiWindowMode) {
+ super.onMultiWindowModeChanged(isInMultiWindowMode);
- Log.d(mLogTag, "onMultiWindowChanged: " + inMultiWindow);
+ Log.d(mLogTag, "onMultiWindowModeChanged: " + isInMultiWindowMode);
}
// Logging and UI methods below.