diff --git a/alps/build/target/product/generic_no_telephony.mk b/alps/build/target/product/generic_no_telephony.mk
index 7af62ce..0222430 100644
--- a/alps/build/target/product/generic_no_telephony.mk
+++ b/alps/build/target/product/generic_no_telephony.mk
@@ -20,7 +20,6 @@
PRODUCT_PACKAGES := \
Bluetooth \
Camera2 \
- Gallery2 \
Music \
MusicFX \
OneTimeInitializer \
diff --git a/alps/device/mediatek/mt6735/device.mk b/alps/device/mediatek/mt6735/device.mk
index 192959c..8b5bb5e 100644
--- a/alps/device/mediatek/mt6735/device.mk
+++ b/alps/device/mediatek/mt6735/device.mk
@@ -716,7 +716,7 @@ endif
ifeq ($(strip $(MTK_EMULATOR_SUPPORT)),yes)
PRODUCT_PACKAGES += SDKGallery
else
- PRODUCT_PACKAGES += Gallery2
+ PRODUCT_PACKAGES += Gallery
endif
ifneq ($(strip $(MTK_EMULATOR_SUPPORT)),yes)
diff --git a/alps/frameworks/base/core/res/res/values/config.xml b/alps/frameworks/base/core/res/res/values/config.xml
index 1386d3c..5c509a4 100644
--- a/alps/frameworks/base/core/res/res/values/config.xml
+++ b/alps/frameworks/base/core/res/res/values/config.xml
@@ -2086,5 +2086,5 @@
<bool name="config_LTE_eri_for_network_name">true</bool>
<!-- Whether to start in touch mode -->
- <bool name="config_defaultInTouchMode">true</bool>
+ <bool name="config_defaultInTouchMode">false</bool>
</resources>
diff --git a/alps/frameworks/base/services/core/java/com/android/server/wm/WindowManagerService.java b/alps/frameworks/base/services/core/java/com/android/server/wm/WindowManagerService.java
index 2d5ef96..18ece84 100644
--- a/alps/frameworks/base/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/alps/frameworks/base/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -181,9 +181,9 @@ import com.mediatek.common.multiwindow.IMWWmsCallback;
public class WindowManagerService extends IWindowManager.Stub
implements Watchdog.Monitor, WindowManagerPolicy.WindowManagerFuncs {
static final String TAG = "WindowManager";
- static boolean DEBUG = false;
+ static boolean DEBUG = true;
static boolean DEBUG_ADD_REMOVE = false;
- static boolean DEBUG_FOCUS = false;
+ static boolean DEBUG_FOCUS = true;
static boolean DEBUG_FOCUS_LIGHT = DEBUG_FOCUS || false;
static boolean DEBUG_ANIM = false;
static boolean DEBUG_KEYGUARD = false;
diff --git a/alps/frameworks/native/data/etc/android.hardware.touchscreen.multitouch.distinct.xml b/alps/frameworks/native/data/etc/android.hardware.touchscreen.multitouch.distinct.xml
index 35eeefd..fc77f48 100644
--- a/alps/frameworks/native/data/etc/android.hardware.touchscreen.multitouch.distinct.xml
+++ b/alps/frameworks/native/data/etc/android.hardware.touchscreen.multitouch.distinct.xml
@@ -17,8 +17,5 @@
<!-- This is the standard set of features for a touchscreen that supports
independently-trackable multiple-finger multitouch. -->
<permissions>
- <feature name="android.hardware.touchscreen" />
- <feature name="android.hardware.touchscreen.multitouch" />
- <feature name="android.hardware.touchscreen.multitouch.distinct" />
- <feature name="android.hardware.faketouch" />
+
</permissions>
diff --git a/alps/frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml b/alps/frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml
index ed6606d..9326ebd 100644
--- a/alps/frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml
+++ b/alps/frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml
@@ -17,9 +17,5 @@
<!-- This is the standard set of features for a touchscreen that supports
independently-trackable multiple-finger multitouch. -->
<permissions>
- <feature name="android.hardware.touchscreen" />
- <feature name="android.hardware.touchscreen.multitouch" />
- <feature name="android.hardware.touchscreen.multitouch.distinct" />
- <feature name="android.hardware.touchscreen.multitouch.jazzhand" />
- <feature name="android.hardware.faketouch" />
+
</permissions>
diff --git a/alps/frameworks/native/data/etc/android.hardware.touchscreen.multitouch.xml b/alps/frameworks/native/data/etc/android.hardware.touchscreen.multitouch.xml
index 1d59a27..4cb615d 100644
--- a/alps/frameworks/native/data/etc/android.hardware.touchscreen.multitouch.xml
+++ b/alps/frameworks/native/data/etc/android.hardware.touchscreen.multitouch.xml
@@ -18,7 +18,5 @@
basic multitouch capable of gestures but not fully-indendent finger
tracking. -->
<permissions>
- <feature name="android.hardware.touchscreen" />
- <feature name="android.hardware.touchscreen.multitouch" />
- <feature name="android.hardware.faketouch" />
+
</permissions>
diff --git a/alps/frameworks/native/data/etc/android.hardware.touchscreen.xml b/alps/frameworks/native/data/etc/android.hardware.touchscreen.xml
index 5b5ddf9..08ccd30 100644
--- a/alps/frameworks/native/data/etc/android.hardware.touchscreen.xml
+++ b/alps/frameworks/native/data/etc/android.hardware.touchscreen.xml
@@ -17,6 +17,5 @@
<!-- This is the standard set of features for a touchscreen that does not
support multitouch. -->
<permissions>
- <feature name="android.hardware.touchscreen" />
- <feature name="android.hardware.faketouch" />
+
</permissions>
diff --git a/alps/frameworks/native/data/etc/handheld_core_hardware.xml b/alps/frameworks/native/data/etc/handheld_core_hardware.xml
index 1355ab8..1f2e787 100644
--- a/alps/frameworks/native/data/etc/handheld_core_hardware.xml
+++ b/alps/frameworks/native/data/etc/handheld_core_hardware.xml
@@ -30,7 +30,7 @@
<feature name="android.hardware.sensor.compass" />
<feature name="android.hardware.sensor.accelerometer" />
<feature name="android.hardware.bluetooth" />
- <feature name="android.hardware.touchscreen" />
+
<feature name="android.hardware.microphone" />
<feature name="android.hardware.screen.portrait" />
<feature name="android.hardware.screen.landscape" />
diff --git a/alps/frameworks/native/data/etc/tablet_core_hardware.xml b/alps/frameworks/native/data/etc/tablet_core_hardware.xml
index 8128165..2fa7220 100644
--- a/alps/frameworks/native/data/etc/tablet_core_hardware.xml
+++ b/alps/frameworks/native/data/etc/tablet_core_hardware.xml
@@ -29,9 +29,6 @@
<feature name="android.hardware.sensor.compass" />
<feature name="android.hardware.sensor.accelerometer" />
<feature name="android.hardware.bluetooth" />
- <feature name="android.hardware.touchscreen" />
- <feature name="android.hardware.touchscreen.multitouch" />
- <feature name="android.hardware.touchscreen.multitouch.distinct" />
<feature name="android.hardware.microphone" />
<feature name="android.hardware.screen.portrait" />
<feature name="android.hardware.screen.landscape" />
diff --git a/alps/frameworks/native/data/etc/wearable_core_hardware.xml b/alps/frameworks/native/data/etc/wearable_core_hardware.xml
index 346abad..5c44e5c 100644
--- a/alps/frameworks/native/data/etc/wearable_core_hardware.xml
+++ b/alps/frameworks/native/data/etc/wearable_core_hardware.xml
@@ -25,7 +25,7 @@
<feature name="android.hardware.sensor.compass" />
<feature name="android.hardware.sensor.accelerometer" />
<feature name="android.hardware.bluetooth" />
- <feature name="android.hardware.touchscreen" />
+
<feature name="android.hardware.microphone" />
<!-- basic system services -->
diff --git a/alps/packages/apps/Dialer/res/layout/lists_fragment.xml b/alps/packages/apps/Dialer/res/layout/lists_fragment.xml
index face20e..311d9c9 100644
--- a/alps/packages/apps/Dialer/res/layout/lists_fragment.xml
+++ b/alps/packages/apps/Dialer/res/layout/lists_fragment.xml
@@ -54,6 +54,7 @@
android:id="@+id/lists_pager"
android:layout_width="match_parent"
android:layout_height="0dp"
+ android:nextFocusDown="@+id/floating_action_button"
android:layout_weight="1" />
</LinearLayout>
index 7af62ce..0222430 100644
--- a/alps/build/target/product/generic_no_telephony.mk
+++ b/alps/build/target/product/generic_no_telephony.mk
@@ -20,7 +20,6 @@
PRODUCT_PACKAGES := \
Bluetooth \
Camera2 \
- Gallery2 \
Music \
MusicFX \
OneTimeInitializer \
diff --git a/alps/device/mediatek/mt6735/device.mk b/alps/device/mediatek/mt6735/device.mk
index 192959c..8b5bb5e 100644
--- a/alps/device/mediatek/mt6735/device.mk
+++ b/alps/device/mediatek/mt6735/device.mk
@@ -716,7 +716,7 @@ endif
ifeq ($(strip $(MTK_EMULATOR_SUPPORT)),yes)
PRODUCT_PACKAGES += SDKGallery
else
- PRODUCT_PACKAGES += Gallery2
+ PRODUCT_PACKAGES += Gallery
endif
ifneq ($(strip $(MTK_EMULATOR_SUPPORT)),yes)
diff --git a/alps/frameworks/base/core/res/res/values/config.xml b/alps/frameworks/base/core/res/res/values/config.xml
index 1386d3c..5c509a4 100644
--- a/alps/frameworks/base/core/res/res/values/config.xml
+++ b/alps/frameworks/base/core/res/res/values/config.xml
@@ -2086,5 +2086,5 @@
<bool name="config_LTE_eri_for_network_name">true</bool>
<!-- Whether to start in touch mode -->
- <bool name="config_defaultInTouchMode">true</bool>
+ <bool name="config_defaultInTouchMode">false</bool>
</resources>
diff --git a/alps/frameworks/base/services/core/java/com/android/server/wm/WindowManagerService.java b/alps/frameworks/base/services/core/java/com/android/server/wm/WindowManagerService.java
index 2d5ef96..18ece84 100644
--- a/alps/frameworks/base/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/alps/frameworks/base/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -181,9 +181,9 @@ import com.mediatek.common.multiwindow.IMWWmsCallback;
public class WindowManagerService extends IWindowManager.Stub
implements Watchdog.Monitor, WindowManagerPolicy.WindowManagerFuncs {
static final String TAG = "WindowManager";
- static boolean DEBUG = false;
+ static boolean DEBUG = true;
static boolean DEBUG_ADD_REMOVE = false;
- static boolean DEBUG_FOCUS = false;
+ static boolean DEBUG_FOCUS = true;
static boolean DEBUG_FOCUS_LIGHT = DEBUG_FOCUS || false;
static boolean DEBUG_ANIM = false;
static boolean DEBUG_KEYGUARD = false;
diff --git a/alps/frameworks/native/data/etc/android.hardware.touchscreen.multitouch.distinct.xml b/alps/frameworks/native/data/etc/android.hardware.touchscreen.multitouch.distinct.xml
index 35eeefd..fc77f48 100644
--- a/alps/frameworks/native/data/etc/android.hardware.touchscreen.multitouch.distinct.xml
+++ b/alps/frameworks/native/data/etc/android.hardware.touchscreen.multitouch.distinct.xml
@@ -17,8 +17,5 @@
<!-- This is the standard set of features for a touchscreen that supports
independently-trackable multiple-finger multitouch. -->
<permissions>
- <feature name="android.hardware.touchscreen" />
- <feature name="android.hardware.touchscreen.multitouch" />
- <feature name="android.hardware.touchscreen.multitouch.distinct" />
- <feature name="android.hardware.faketouch" />
+
</permissions>
diff --git a/alps/frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml b/alps/frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml
index ed6606d..9326ebd 100644
--- a/alps/frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml
+++ b/alps/frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml
@@ -17,9 +17,5 @@
<!-- This is the standard set of features for a touchscreen that supports
independently-trackable multiple-finger multitouch. -->
<permissions>
- <feature name="android.hardware.touchscreen" />
- <feature name="android.hardware.touchscreen.multitouch" />
- <feature name="android.hardware.touchscreen.multitouch.distinct" />
- <feature name="android.hardware.touchscreen.multitouch.jazzhand" />
- <feature name="android.hardware.faketouch" />
+
</permissions>
diff --git a/alps/frameworks/native/data/etc/android.hardware.touchscreen.multitouch.xml b/alps/frameworks/native/data/etc/android.hardware.touchscreen.multitouch.xml
index 1d59a27..4cb615d 100644
--- a/alps/frameworks/native/data/etc/android.hardware.touchscreen.multitouch.xml
+++ b/alps/frameworks/native/data/etc/android.hardware.touchscreen.multitouch.xml
@@ -18,7 +18,5 @@
basic multitouch capable of gestures but not fully-indendent finger
tracking. -->
<permissions>
- <feature name="android.hardware.touchscreen" />
- <feature name="android.hardware.touchscreen.multitouch" />
- <feature name="android.hardware.faketouch" />
+
</permissions>
diff --git a/alps/frameworks/native/data/etc/android.hardware.touchscreen.xml b/alps/frameworks/native/data/etc/android.hardware.touchscreen.xml
index 5b5ddf9..08ccd30 100644
--- a/alps/frameworks/native/data/etc/android.hardware.touchscreen.xml
+++ b/alps/frameworks/native/data/etc/android.hardware.touchscreen.xml
@@ -17,6 +17,5 @@
<!-- This is the standard set of features for a touchscreen that does not
support multitouch. -->
<permissions>
- <feature name="android.hardware.touchscreen" />
- <feature name="android.hardware.faketouch" />
+
</permissions>
diff --git a/alps/frameworks/native/data/etc/handheld_core_hardware.xml b/alps/frameworks/native/data/etc/handheld_core_hardware.xml
index 1355ab8..1f2e787 100644
--- a/alps/frameworks/native/data/etc/handheld_core_hardware.xml
+++ b/alps/frameworks/native/data/etc/handheld_core_hardware.xml
@@ -30,7 +30,7 @@
<feature name="android.hardware.sensor.compass" />
<feature name="android.hardware.sensor.accelerometer" />
<feature name="android.hardware.bluetooth" />
- <feature name="android.hardware.touchscreen" />
+
<feature name="android.hardware.microphone" />
<feature name="android.hardware.screen.portrait" />
<feature name="android.hardware.screen.landscape" />
diff --git a/alps/frameworks/native/data/etc/tablet_core_hardware.xml b/alps/frameworks/native/data/etc/tablet_core_hardware.xml
index 8128165..2fa7220 100644
--- a/alps/frameworks/native/data/etc/tablet_core_hardware.xml
+++ b/alps/frameworks/native/data/etc/tablet_core_hardware.xml
@@ -29,9 +29,6 @@
<feature name="android.hardware.sensor.compass" />
<feature name="android.hardware.sensor.accelerometer" />
<feature name="android.hardware.bluetooth" />
- <feature name="android.hardware.touchscreen" />
- <feature name="android.hardware.touchscreen.multitouch" />
- <feature name="android.hardware.touchscreen.multitouch.distinct" />
<feature name="android.hardware.microphone" />
<feature name="android.hardware.screen.portrait" />
<feature name="android.hardware.screen.landscape" />
diff --git a/alps/frameworks/native/data/etc/wearable_core_hardware.xml b/alps/frameworks/native/data/etc/wearable_core_hardware.xml
index 346abad..5c44e5c 100644
--- a/alps/frameworks/native/data/etc/wearable_core_hardware.xml
+++ b/alps/frameworks/native/data/etc/wearable_core_hardware.xml
@@ -25,7 +25,7 @@
<feature name="android.hardware.sensor.compass" />
<feature name="android.hardware.sensor.accelerometer" />
<feature name="android.hardware.bluetooth" />
- <feature name="android.hardware.touchscreen" />
+
<feature name="android.hardware.microphone" />
<!-- basic system services -->
diff --git a/alps/packages/apps/Dialer/res/layout/lists_fragment.xml b/alps/packages/apps/Dialer/res/layout/lists_fragment.xml
index face20e..311d9c9 100644
--- a/alps/packages/apps/Dialer/res/layout/lists_fragment.xml
+++ b/alps/packages/apps/Dialer/res/layout/lists_fragment.xml
@@ -54,6 +54,7 @@
android:id="@+id/lists_pager"
android:layout_width="match_parent"
android:layout_height="0dp"
+ android:nextFocusDown="@+id/floating_action_button"
android:layout_weight="1" />
</LinearLayout>