DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
Bug: 134405016
Change-Id: Ib7d990ceba3732de79765f7edf9d27111cbe4bab
diff --git a/Android.mk b/Android.mk
index cad55d5..09214ba 100644
--- a/Android.mk
+++ b/Android.mk
@@ -71,7 +71,9 @@
LOCAL_SDK_VERSION := current
-LOCAL_MODULE_PATH := $(TARGET_OUT_APPS)
+LOCAL_PRODUCT_MODULE := true
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_APPS)
LOCAL_COMPATIBILITY_SUITE := general-tests
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5fefe96..e23fcc0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -430,7 +430,7 @@
</activity>
<activity android:name=".ui.SmsStorageLowWarningActivity"
- android:theme="@style/Invisible"
+ android:theme="@style/Translucent"
android:configChanges="orientation|screenSize|keyboardHidden" />
<activity android:name=".ui.appsettings.ApnSettingsActivity"
diff --git a/CleanSpec.mk b/CleanSpec.mk
new file mode 100644
index 0000000..1391c1a
--- /dev/null
+++ b/CleanSpec.mk
@@ -0,0 +1,41 @@
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# If you don't need to do a full clean build but would like to touch
+# a file or delete some intermediate files, add a clean step to the end
+# of the list. These steps will only be run once, if they haven't been
+# run before.
+#
+# E.g.:
+# $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
+# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#
+# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
+# files that are missing or have been moved.
+#
+# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
+# Use $(OUT_DIR) to refer to the "out" directory.
+#
+# If you need to re-do something that's already mentioned, just copy
+# the command and add it to the bottom of the list. E.g., if a change
+# that you made last week required touching a file and a change you
+# made today requires touching the same file, just copy the old
+# touch step and add it to the end of the list.
+#
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/messaging)
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 582c755..643d044 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -76,6 +76,15 @@
<item name="android:windowNoDisplay">true</item>
</style>
+ <style name="Translucent" parent="BugleBaseTheme">
+ <item name="android:windowBackground">@android:color/transparent</item>
+ <item name="android:windowContentOverlay">@null</item>
+ <item name="android:windowIsTranslucent">true</item>
+ <item name="android:windowNoTitle">true</item>
+ <item name="android:windowAnimationStyle">@null</item>
+ <item name="android:windowDisablePreview">true</item>
+ </style>
+
<style name="BugleActionBar" parent="@style/Widget.AppCompat.Light.ActionBar.Solid">
<item name="height">@dimen/action_bar_height</item>
<item name="displayOptions">showTitle</item>
diff --git a/src/com/android/messaging/datamodel/data/SelfParticipantsData.java b/src/com/android/messaging/datamodel/data/SelfParticipantsData.java
index fc4027f..f389a78 100644
--- a/src/com/android/messaging/datamodel/data/SelfParticipantsData.java
+++ b/src/com/android/messaging/datamodel/data/SelfParticipantsData.java
@@ -20,6 +20,8 @@
import androidx.collection.ArrayMap;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import com.android.messaging.util.OsUtil;
@@ -61,6 +63,15 @@
list.add(self);
}
}
+ Collections.sort(
+ list,
+ new Comparator() {
+ public int compare(Object o1, Object o2) {
+ int slotId1 = ((ParticipantData) o1).getSlotId();
+ int slotId2 = ((ParticipantData) o2).getSlotId();
+ return slotId1 > slotId2 ? 1 : -1;
+ }
+ });
return list;
}
diff --git a/src/com/android/messaging/ui/conversation/SimIconView.java b/src/com/android/messaging/ui/conversation/SimIconView.java
index e2e446c..6799bad 100644
--- a/src/com/android/messaging/ui/conversation/SimIconView.java
+++ b/src/com/android/messaging/ui/conversation/SimIconView.java
@@ -19,6 +19,7 @@
import android.graphics.Outline;
import android.net.Uri;
import android.util.AttributeSet;
+import android.view.MotionEvent;
import android.view.View;
import android.view.ViewOutlineProvider;
@@ -44,6 +45,14 @@
}
@Override
+ public boolean onTouchEvent(MotionEvent event) {
+ if (isClickable()) {
+ return super.onTouchEvent(event);
+ }
+ return true;
+ }
+
+ @Override
protected void maybeInitializeOnClickListener() {
// TODO: SIM icon view shouldn't consume or handle clicks, but it should if
// this is the send button for the only SIM in the device or if MSIM is not supported.