Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84819804 authored by Michael Jurka's avatar Michael Jurka Committed by Android (Google) Code Review
Browse files

Merge "Porting old code for min alpha for items in recents" into jb-mr1-dev

parents a1730fa4 adf0b215
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -29,5 +29,8 @@
    <!-- Whether recents thumbnails should stretch in both x and y to fill their
     ImageView -->
    <bool name="config_recents_thumbnail_image_fits_to_xy">true</bool>

    <!-- Min alpha % that recent items will fade to while being dismissed -->
    <integer name="config_recent_item_min_alpha">0</integer>
</resources>
+3 −0
Original line number Diff line number Diff line
@@ -78,5 +78,8 @@
    <integer name="navigation_bar_deadzone_decay">333</integer>
    
    <bool name="config_dead_zone_flash">false</bool>

    <!-- Min alpha % that recent items will fade to while being dismissed -->
    <integer name="config_recent_item_min_alpha">3</integer>
</resources>
+2 −0
Original line number Diff line number Diff line
@@ -136,6 +136,8 @@ public class RecentsActivity extends Activity {
        mRecentsPanel.setOnTouchListener(new TouchOutsideListener(mRecentsPanel));
        mRecentsPanel.setRecentTasksLoader(recentTasksLoader);
        recentTasksLoader.setRecentsPanel(mRecentsPanel, mRecentsPanel);
        mRecentsPanel.setMinSwipeAlpha(
                getResources().getInteger(R.integer.config_recent_item_min_alpha) / 100f);

        handleIntent(getIntent());
        mIntentFilter = new IntentFilter();
+0 −13
Original line number Diff line number Diff line
@@ -510,19 +510,6 @@ public class PhoneStatusBar extends BaseStatusBar {
        return lp;
    }

    /*
    protected void updateRecentsPanel() {
        super.updateRecentsPanel(R.layout.status_bar_recent_panel);
        // Make .03 alpha the minimum so you always see the item a bit-- slightly below
        // .03, the item disappears entirely (as if alpha = 0) and that discontinuity looks
        // a bit jarring
        mRecentsPanel.setMinSwipeAlpha(0.03f);
        if (mNavigationBarView != null) {
            mNavigationBarView.getRecentsButton().setOnTouchListener(mRecentsPanel);
        }
    }
    */

    @Override
    protected void updateSearchPanel() {
        super.updateSearchPanel();