diff options
Diffstat (limited to 'packages')
17 files changed, 59 insertions, 65 deletions
diff --git a/packages/DocumentsUI/res/values-ur-rPK/strings.xml b/packages/DocumentsUI/res/values-ur-rPK/strings.xml index 6684133..c54cb03 100644 --- a/packages/DocumentsUI/res/values-ur-rPK/strings.xml +++ b/packages/DocumentsUI/res/values-ur-rPK/strings.xml @@ -66,8 +66,8 @@ </plurals> <string name="copy_preparing" msgid="3896202461003039386">"کاپی کیلئے تیار ہو رہا ہے…"</string> <plurals name="copy_error_notification_title" formatted="false" msgid="4911333304372840735"> - <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> فائلز کاپی کرنے میں خرابی پیس آ گئی۔</item> - <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> فائل کاپی کرنے میں خرابی پیس آ گئی۔</item> + <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> فائلز کاپی کرنے میں خرابی پیش آ گئی۔</item> + <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> فائل کاپی کرنے میں خرابی پیش آ گئی۔</item> </plurals> <string name="notification_touch_for_details" msgid="4483108577842961665">"تفصیلات دیکھنے کیلئے ٹچ کریں"</string> <string name="retry" msgid="7564024179122207376">"دوبارہ کوشش کریں"</string> diff --git a/packages/DocumentsUI/res/values-zh-rCN/strings.xml b/packages/DocumentsUI/res/values-zh-rCN/strings.xml index 0097017..c0a0a40 100644 --- a/packages/DocumentsUI/res/values-zh-rCN/strings.xml +++ b/packages/DocumentsUI/res/values-zh-rCN/strings.xml @@ -38,8 +38,7 @@ <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"隐藏SD卡"</string> <string name="menu_file_size_show" msgid="3240323619260823076">"显示文件大小"</string> <string name="menu_file_size_hide" msgid="8881975928502581042">"隐藏文件大小"</string> - <!-- no translation found for button_copy (8706475544635021302) --> - <skip /> + <string name="button_copy" msgid="8706475544635021302">"复制"</string> <string name="mode_selected_count" msgid="459111894725594625">"已选择<xliff:g id="COUNT">%1$d</xliff:g>项"</string> <string name="sort_name" msgid="9183560467917256779">"按名称"</string> <string name="sort_date" msgid="586080032956151448">"按修改日期"</string> @@ -66,13 +65,12 @@ <item quantity="one">正在复制 <xliff:g id="COUNT_0">%1$d</xliff:g> 个文件。</item> </plurals> <string name="copy_preparing" msgid="3896202461003039386">"正在准备复制…"</string> - <!-- no translation found for copy_error_notification_title (4911333304372840735) --> - <!-- no translation found for notification_touch_for_details (4483108577842961665) --> - <skip /> - <!-- no translation found for retry (7564024179122207376) --> - <skip /> - <!-- no translation found for copy_failure_alert_title (616726451967793549) --> - <skip /> - <!-- no translation found for copy_failure_alert_content (2655232627616241542) --> - <skip /> + <plurals name="copy_error_notification_title" formatted="false" msgid="4911333304372840735"> + <item quantity="other">复制 <xliff:g id="COUNT_1">%1$d</xliff:g> 个文件时出错。</item> + <item quantity="one">复制 <xliff:g id="COUNT_0">%1$d</xliff:g> 个文件时出错。</item> + </plurals> + <string name="notification_touch_for_details" msgid="4483108577842961665">"触摸可查看详情"</string> + <string name="retry" msgid="7564024179122207376">"重试"</string> + <string name="copy_failure_alert_title" msgid="616726451967793549">"复制文件时出错"</string> + <string name="copy_failure_alert_content" msgid="2655232627616241542">"以下文件未复制成功：<xliff:g id="LIST">%1$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml index 587a240..fe52d59 100644 --- a/packages/SystemUI/res/values-en-rAU/strings.xml +++ b/packages/SystemUI/res/values-en-rAU/strings.xml @@ -146,8 +146,7 @@ <string name="accessibility_no_sim" msgid="8274017118472455155">"No SIM."</string> <string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth tethering"</string> <string name="accessibility_airplane_mode" msgid="834748999790763092">"Aeroplane mode"</string> - <!-- no translation found for accessibility_carrier_network_change_mode (4017301580441304305) --> - <skip /> + <string name="accessibility_carrier_network_change_mode" msgid="4017301580441304305">"Carrier network changing."</string> <string name="accessibility_battery_level" msgid="7451474187113371965">"Battery <xliff:g id="NUMBER">%d</xliff:g> per cent."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"System settings"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Notifications."</string> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index 587a240..fe52d59 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -146,8 +146,7 @@ <string name="accessibility_no_sim" msgid="8274017118472455155">"No SIM."</string> <string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth tethering"</string> <string name="accessibility_airplane_mode" msgid="834748999790763092">"Aeroplane mode"</string> - <!-- no translation found for accessibility_carrier_network_change_mode (4017301580441304305) --> - <skip /> + <string name="accessibility_carrier_network_change_mode" msgid="4017301580441304305">"Carrier network changing."</string> <string name="accessibility_battery_level" msgid="7451474187113371965">"Battery <xliff:g id="NUMBER">%d</xliff:g> per cent."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"System settings"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Notifications."</string> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index 587a240..fe52d59 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -146,8 +146,7 @@ <string name="accessibility_no_sim" msgid="8274017118472455155">"No SIM."</string> <string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth tethering"</string> <string name="accessibility_airplane_mode" msgid="834748999790763092">"Aeroplane mode"</string> - <!-- no translation found for accessibility_carrier_network_change_mode (4017301580441304305) --> - <skip /> + <string name="accessibility_carrier_network_change_mode" msgid="4017301580441304305">"Carrier network changing."</string> <string name="accessibility_battery_level" msgid="7451474187113371965">"Battery <xliff:g id="NUMBER">%d</xliff:g> per cent."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"System settings"</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Notifications."</string> diff --git a/packages/SystemUI/res/values-ka-rGE/strings.xml b/packages/SystemUI/res/values-ka-rGE/strings.xml index 049873c..3561311 100644 --- a/packages/SystemUI/res/values-ka-rGE/strings.xml +++ b/packages/SystemUI/res/values-ka-rGE/strings.xml @@ -146,8 +146,7 @@ <string name="accessibility_no_sim" msgid="8274017118472455155">"SIM არ არის."</string> <string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth-ის ჩართვა"</string> <string name="accessibility_airplane_mode" msgid="834748999790763092">"თვითმფრინავის რეჟიმი"</string> - <!-- no translation found for accessibility_carrier_network_change_mode (4017301580441304305) --> - <skip /> + <string name="accessibility_carrier_network_change_mode" msgid="4017301580441304305">"ოპერატორის ქსელის შეცვლა"</string> <string name="accessibility_battery_level" msgid="7451474187113371965">"ბატარეა: <xliff:g id="NUMBER">%d</xliff:g> პროცენტი."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"სისტემის პარამეტრები."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"შეტყობინებები"</string> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 597ada0..37d563b 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -304,7 +304,7 @@ <string name="description_direction_up" msgid="7169032478259485180">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>하려면 위로 슬라이드"</string> <string name="description_direction_left" msgid="7207478719805562165">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>하려면 왼쪽으로 슬라이드"</string> <string name="zen_no_interruptions_with_warning" msgid="4396898053735625287">"어떤 방해도 받지 않습니다. 알람도 울리지 않습니다."</string> - <string name="zen_priority_introduction" msgid="7253045784560169993">"지정한 알람, 알림, 이벤트, 발신자를 제외하고 소리와 진동의 방해를 받지 않습니다."</string> + <string name="zen_priority_introduction" msgid="7253045784560169993">"지정한 알람, 알림, 이벤트, 발신자를 제외하고 소리와 진동을 끕니다."</string> <string name="zen_priority_customize_button" msgid="7948043278226955063">"맞춤설정"</string> <string name="zen_no_interruptions" msgid="7970973750143632592">"모든 알림 차단"</string> <string name="zen_important_interruptions" msgid="3477041776609757628">"최우선 알림만 수신"</string> diff --git a/packages/SystemUI/res/values-lo-rLA/strings.xml b/packages/SystemUI/res/values-lo-rLA/strings.xml index f8ac1b9..f018e08 100644 --- a/packages/SystemUI/res/values-lo-rLA/strings.xml +++ b/packages/SystemUI/res/values-lo-rLA/strings.xml @@ -146,8 +146,7 @@ <string name="accessibility_no_sim" msgid="8274017118472455155">"ບໍ່ມີຊິມ."</string> <string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"ການປ່ອຍສັນຍານ Bluetooth."</string> <string name="accessibility_airplane_mode" msgid="834748999790763092">"ໂໝດໃນຍົນ."</string> - <!-- no translation found for accessibility_carrier_network_change_mode (4017301580441304305) --> - <skip /> + <string name="accessibility_carrier_network_change_mode" msgid="4017301580441304305">"ການປ່ຽນແປງເຄືອຂ່າຍບໍລິສັດເຄືອຂ່າຍມືຖື."</string> <string name="accessibility_battery_level" msgid="7451474187113371965">"ແບັດເຕີຣີ <xliff:g id="NUMBER">%d</xliff:g> ເປີເຊັນ."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"ການຕັ້ງຄ່າລະບົບ."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"ການແຈ້ງເຕືອນ."</string> diff --git a/packages/SystemUI/res/values-mn-rMN/strings.xml b/packages/SystemUI/res/values-mn-rMN/strings.xml index 716fc22..8f3bcf6 100644 --- a/packages/SystemUI/res/values-mn-rMN/strings.xml +++ b/packages/SystemUI/res/values-mn-rMN/strings.xml @@ -144,8 +144,7 @@ <string name="accessibility_no_sim" msgid="8274017118472455155">"SIM байхгүй."</string> <string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Блютүүт модем болж байна."</string> <string name="accessibility_airplane_mode" msgid="834748999790763092">"Нислэгийн горим"</string> - <!-- no translation found for accessibility_carrier_network_change_mode (4017301580441304305) --> - <skip /> + <string name="accessibility_carrier_network_change_mode" msgid="4017301580441304305">"Дамжуулагч сүлжээг өөрчилж байна."</string> <string name="accessibility_battery_level" msgid="7451474187113371965">"Батерей <xliff:g id="NUMBER">%d</xliff:g> хувьтай."</string> <string name="accessibility_settings_button" msgid="799583911231893380">"Системийн тохиргоо."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Мэдэгдэл."</string> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index 0af2684..522fa1b 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -305,7 +305,7 @@ <string name="description_direction_left" msgid="7207478719805562165">"Sogeza kushoto kwa <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> ."</string> <string name="zen_no_interruptions_with_warning" msgid="4396898053735625287">"Hakuna kukatizwa. Hata kama ni kengele."</string> <string name="zen_priority_introduction" msgid="7253045784560169993">"Hutasumbuliwa na sauti na mitetemo, isipokuwa kengele, vikumbusho, matukio na wapigaji simu utakaobainisha."</string> - <string name="zen_priority_customize_button" msgid="7948043278226955063">"Weka mapendeleo"</string> + <string name="zen_priority_customize_button" msgid="7948043278226955063">"Badilisha kukufaa"</string> <string name="zen_no_interruptions" msgid="7970973750143632592">"Hakuna kukatizwa"</string> <string name="zen_important_interruptions" msgid="3477041776609757628">"Mambo yenye kipaumbele pekee yakatize"</string> <string name="zen_alarms" msgid="5055668280767657759">"Kengele pekee"</string> @@ -341,9 +341,9 @@ <string name="guest_wipe_session_message" msgid="8476238178270112811">"Je, unataka kuendelea na kipindi chako?"</string> <string name="guest_wipe_session_wipe" msgid="5065558566939858884">"Anza tena"</string> <string name="guest_wipe_session_dontwipe" msgid="1401113462524894716">"Ndiyo, endelea"</string> - <string name="guest_notification_title" msgid="1585278533840603063">"Mtumiaji aliyealikwa"</string> - <string name="guest_notification_text" msgid="7513706222848825467">"Ondoa aliyealikwa ili ufute programu na data"</string> - <string name="guest_notification_remove_action" msgid="8820670703892101990">"ONDOA ALIYEALIKWA"</string> + <string name="guest_notification_title" msgid="1585278533840603063">"Mtumiaji mgeni"</string> + <string name="guest_notification_text" msgid="7513706222848825467">"Ondoa mgeni ili ufute programu na data"</string> + <string name="guest_notification_remove_action" msgid="8820670703892101990">"ONDOA MGENI"</string> <string name="user_add_user_title" msgid="4553596395824132638">"Ungependa kuongeza mtumiaji?"</string> <string name="user_add_user_message_short" msgid="2161624834066214559">"Unapomwongeza mtumiaji mpya, mtu huyo anahitaji kusanidi nafasi yake.\n\nMtumiaji yoyote anaweza kusasisha programu kwa ajili ya watumiaji wengine wote."</string> <string name="battery_saver_notification_title" msgid="237918726750955859">"Kiokoa betri kimewashwa"</string> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index 84785eb..e9e2d6a 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -341,9 +341,9 @@ <string name="guest_wipe_session_message" msgid="8476238178270112811">"Bạn có muốn tiếp tục phiên của mình không?"</string> <string name="guest_wipe_session_wipe" msgid="5065558566939858884">"Bắt đầu lại"</string> <string name="guest_wipe_session_dontwipe" msgid="1401113462524894716">"Có, tiếp tục"</string> - <string name="guest_notification_title" msgid="1585278533840603063">"Người dùng phiên khách"</string> - <string name="guest_notification_text" msgid="7513706222848825467">"Xóa phiên khách để xóa ứng dụng và dữ liệu"</string> - <string name="guest_notification_remove_action" msgid="8820670703892101990">"XÓA PHIÊN KHÁCH"</string> + <string name="guest_notification_title" msgid="1585278533840603063">"Người dùng khách"</string> + <string name="guest_notification_text" msgid="7513706222848825467">"Xóa khách để xóa ứng dụng và dữ liệu"</string> + <string name="guest_notification_remove_action" msgid="8820670703892101990">"XÓA KHÁCH"</string> <string name="user_add_user_title" msgid="4553596395824132638">"Thêm người dùng mới?"</string> <string name="user_add_user_message_short" msgid="2161624834066214559">"Khi bạn thêm người dùng mới, người dùng đó cần thiết lập dung lượng lưu trữ của mình.\n\nMọi người dùng đều có thể cập nhật ứng dụng cho tất cả người dùng khác."</string> <string name="battery_saver_notification_title" msgid="237918726750955859">"Trình tiết kiệm pin đang bật"</string> diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java index f4fd6a2..b5c1ca8 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java @@ -338,6 +338,7 @@ public class QSPanel extends ViewGroup { r.detailAdapter = r.tile.getDetailAdapter(); if (r.detailAdapter == null) return; } + r.tile.setDetailListening(show); int x = r.tileView.getLeft() + r.tileView.getWidth() / 2; int y = r.tileView.getTop() + r.tileView.getHeight() / 2; handleShowDetailImpl(r, show, x, y); diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java index 5a84db5..b9574dc 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java @@ -149,6 +149,10 @@ public abstract class QSTile<TState extends State> implements Listenable { return mState; } + public void setDetailListening(boolean listening) { + // optional + } + // call only on tile worker looper private void handleSetCallback(Callback callback) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java index 70746c7..d589366 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java @@ -67,9 +67,16 @@ public class WifiTile extends QSTile<QSTile.SignalState> { public void setListening(boolean listening) { if (listening) { mController.addNetworkSignalChangedCallback(mCallback); - mWifiController.addAccessPointCallback(mDetailAdapter); } else { mController.removeNetworkSignalChangedCallback(mCallback); + } + } + + @Override + public void setDetailListening(boolean listening) { + if (listening) { + mWifiController.addAccessPointCallback(mDetailAdapter); + } else { mWifiController.removeAccessPointCallback(mDetailAdapter); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java index dccf2e2..b4e4773 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManager.java @@ -314,7 +314,8 @@ public class HeadsUpManager implements ViewTreeObserver.OnComputeInternalInsetsL * @return whether the touch is valid and should not be discarded */ public boolean shouldSwallowClick(String key) { - if (mClock.currentTimeMillis() < mHeadsUpEntries.get(key).postTime) { + HeadsUpEntry entry = mHeadsUpEntries.get(key); + if (entry != null && mClock.currentTimeMillis() < entry.postTime) { return true; } return false; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/AmbientState.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/AmbientState.java index f2b971f..4a7ea96 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/AmbientState.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/AmbientState.java @@ -23,7 +23,6 @@ import com.android.systemui.statusbar.ExpandableNotificationRow; import com.android.systemui.statusbar.policy.HeadsUpManager; import java.util.ArrayList; -import java.util.TreeSet; /** * A global state to track all input states for the algorithm. @@ -130,10 +129,6 @@ public class AmbientState { mHeadsUpManager = headsUpManager; } - public TreeSet<HeadsUpManager.HeadsUpEntry> getSortedHeadsUpEntries() { - return mHeadsUpManager.getSortedEntries(); - } - public float getStackTranslation() { return mStackTranslation; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java index d98bcfe..2a49a4c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java @@ -29,7 +29,6 @@ import com.android.systemui.statusbar.policy.HeadsUpManager; import java.util.ArrayList; import java.util.List; -import java.util.TreeSet; /** * The Algorithm of the {@link com.android.systemui.statusbar.stack @@ -155,7 +154,7 @@ public class StackScrollAlgorithm { scrollY = Math.max(0, scrollY); algorithmState.scrollY = (int) (scrollY + mCollapsedSize + bottomOverScroll); - updateVisibleChildren(resultState, algorithmState, ambientState); + updateVisibleChildren(resultState, algorithmState); // Phase 1: findNumberOfItemsInTopStackAndUpdateState(resultState, algorithmState, ambientState); @@ -337,27 +336,18 @@ public class StackScrollAlgorithm { * Update the visible children on the state. */ private void updateVisibleChildren(StackScrollState resultState, - StackScrollAlgorithmState state, AmbientState ambientState) { + StackScrollAlgorithmState state) { ViewGroup hostView = resultState.getHostView(); int childCount = hostView.getChildCount(); state.visibleChildren.clear(); state.visibleChildren.ensureCapacity(childCount); int notGoneIndex = 0; - TreeSet<HeadsUpManager.HeadsUpEntry> headsUpEntries - = ambientState.getSortedHeadsUpEntries(); - for (HeadsUpManager.HeadsUpEntry entry: headsUpEntries) { - ExpandableView v = entry.entry.row; - notGoneIndex = updateNotGoneIndex(resultState, state, notGoneIndex, v); - } for (int i = 0; i < childCount; i++) { ExpandableView v = (ExpandableView) hostView.getChildAt(i); if (v.getVisibility() != View.GONE) { + notGoneIndex = updateNotGoneIndex(resultState, state, notGoneIndex, v); if (v instanceof ExpandableNotificationRow) { ExpandableNotificationRow row = (ExpandableNotificationRow) v; - if (row.isHeadsUp()) { - continue; - } - notGoneIndex = updateNotGoneIndex(resultState, state, notGoneIndex, v); // handle the notgoneIndex for the children as well List<ExpandableNotificationRow> children = @@ -372,8 +362,6 @@ public class StackScrollAlgorithm { } } } - } else { - notGoneIndex = updateNotGoneIndex(resultState, state, notGoneIndex, v); } } } @@ -507,15 +495,25 @@ public class StackScrollAlgorithm { childViewState.yTranslation += ambientState.getTopPadding() + ambientState.getStackTranslation(); } - updateHeadsUpStates(resultState, ambientState); + updateHeadsUpStates(resultState, algorithmState, ambientState); } - private void updateHeadsUpStates(StackScrollState resultState, AmbientState ambientState) { - TreeSet<HeadsUpManager.HeadsUpEntry> headsUpEntries = ambientState.getSortedHeadsUpEntries(); - for (HeadsUpManager.HeadsUpEntry entry: headsUpEntries) { - ExpandableNotificationRow row = entry.entry.row; + private void updateHeadsUpStates(StackScrollState resultState, + StackScrollAlgorithmState algorithmState, AmbientState ambientState) { + int childCount = algorithmState.visibleChildren.size(); + ExpandableNotificationRow topHeadsUpEntry = null; + for (int i = 0; i < childCount; i++) { + View child = algorithmState.visibleChildren.get(i); + if (!(child instanceof ExpandableNotificationRow)) { + break; + } + ExpandableNotificationRow row = (ExpandableNotificationRow) child; + if (!row.isHeadsUp()) { + break; + } else if (topHeadsUpEntry == null) { + topHeadsUpEntry = row; + } StackViewState childState = resultState.getViewStateForView(row); - ExpandableNotificationRow topHeadsUpEntry = ambientState.getTopHeadsUpEntry(); boolean isTopEntry = topHeadsUpEntry == row; if (!row.isInShade()) { childState.yTranslation = 0; @@ -537,7 +535,6 @@ public class StackScrollAlgorithm { childState.yTranslation = Math.min(childState.yTranslation, bottomPosition); } - } } @@ -897,9 +894,6 @@ public class StackScrollAlgorithm { } private View findFirstVisibleChild(ViewGroup container) { - if (mHeadsUpManager != null && mHeadsUpManager.getTopEntry() != null) { - return mHeadsUpManager.getTopEntry().entry.row; - } int childCount = container.getChildCount(); for (int i = 0; i < childCount; i++) { View child = container.getChildAt(i); |