Skip to content

Commit 8481980

Browse files
mikejurkaAndroid (Google) Code Review
authored andcommitted
Merge "Porting old code for min alpha for items in recents" into jb-mr1-dev
2 parents a1730fa + adf0b21 commit 8481980

File tree

4 files changed

+8
-13
lines changed

4 files changed

+8
-13
lines changed

packages/SystemUI/res/values-sw720dp/config.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,8 @@
2929
<!-- Whether recents thumbnails should stretch in both x and y to fill their
3030
ImageView -->
3131
<bool name="config_recents_thumbnail_image_fits_to_xy">true</bool>
32+
33+
<!-- Min alpha % that recent items will fade to while being dismissed -->
34+
<integer name="config_recent_item_min_alpha">0</integer>
3235
</resources>
3336

packages/SystemUI/res/values/config.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,8 @@
7878
<integer name="navigation_bar_deadzone_decay">333</integer>
7979

8080
<bool name="config_dead_zone_flash">false</bool>
81+
82+
<!-- Min alpha % that recent items will fade to while being dismissed -->
83+
<integer name="config_recent_item_min_alpha">3</integer>
8184
</resources>
8285

packages/SystemUI/src/com/android/systemui/recent/RecentsActivity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ protected void onCreate(Bundle savedInstanceState) {
136136
mRecentsPanel.setOnTouchListener(new TouchOutsideListener(mRecentsPanel));
137137
mRecentsPanel.setRecentTasksLoader(recentTasksLoader);
138138
recentTasksLoader.setRecentsPanel(mRecentsPanel, mRecentsPanel);
139+
mRecentsPanel.setMinSwipeAlpha(
140+
getResources().getInteger(R.integer.config_recent_item_min_alpha) / 100f);
139141

140142
handleIntent(getIntent());
141143
mIntentFilter = new IntentFilter();

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -510,19 +510,6 @@ protected WindowManager.LayoutParams getSearchLayoutParams(LayoutParams layoutPa
510510
return lp;
511511
}
512512

513-
/*
514-
protected void updateRecentsPanel() {
515-
super.updateRecentsPanel(R.layout.status_bar_recent_panel);
516-
// Make .03 alpha the minimum so you always see the item a bit-- slightly below
517-
// .03, the item disappears entirely (as if alpha = 0) and that discontinuity looks
518-
// a bit jarring
519-
mRecentsPanel.setMinSwipeAlpha(0.03f);
520-
if (mNavigationBarView != null) {
521-
mNavigationBarView.getRecentsButton().setOnTouchListener(mRecentsPanel);
522-
}
523-
}
524-
*/
525-
526513
@Override
527514
protected void updateSearchPanel() {
528515
super.updateSearchPanel();

0 commit comments

Comments
 (0)