Skip to content

Commit 6d9d17f

Browse files
mikejurkaAndroid (Google) Code Review
authored andcommitted
Merge "Visual changes to recent apps" into ics-mr0
2 parents d6462ab + 92c88eb commit 6d9d17f

File tree

11 files changed

+83
-22
lines changed

11 files changed

+83
-22
lines changed
462 Bytes
Loading
354 Bytes
Loading
636 Bytes
Loading

packages/SystemUI/res/drawable/recents_thumbnail_bg.xml

Lines changed: 0 additions & 19 deletions
This file was deleted.

packages/SystemUI/res/drawable/recents_thumbnail_fg.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@
1616
<selector xmlns:android="http://schemas.android.com/apk/res/android">
1717
<item android:drawable="@drawable/recents_thumbnail_bg_press" android:state_selected="true" />
1818
<item android:drawable="@drawable/recents_thumbnail_bg_press" android:state_pressed="true" />
19+
<item android:drawable="@drawable/recents_thumbnail_bg_dragging" android:state_activated="true" />
1920
<item android:drawable="@*android:color/transparent"/>
2021
</selector>
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/*
4+
* Copyright 2011, The Android Open Source Project
5+
*
6+
* Licensed under the Apache License, Version 2.0 (the "License");
7+
* you may not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
*/
18+
-->
19+
<shape xmlns:android="http://schemas.android.com/apk/res/android">
20+
<gradient name="status_bar_recents_background"
21+
android:startColor="#cc000000"
22+
android:endColor="#66000000"
23+
android:angle="@integer/status_bar_recents_bg_gradient_degrees"
24+
/>
25+
</shape>
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/*
4+
** Copyright 2011, The Android Open Source Project
5+
**
6+
** Licensed under the Apache License, Version 2.0 (the "License");
7+
** you may not use this file except in compliance with the License.
8+
** You may obtain a copy of the License at
9+
**
10+
** http://www.apache.org/licenses/LICENSE-2.0
11+
**
12+
** Unless required by applicable law or agreed to in writing, software
13+
** distributed under the License is distributed on an "AS IS" BASIS,
14+
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
** See the License for the specific language governing permissions and
16+
** limitations under the License.
17+
*/
18+
-->
19+
20+
<!-- These resources are around just to allow their values to be customized
21+
for different hardware and product builds. -->
22+
<resources>
23+
<!-- Whether we're using the tablet-optimized recents interface (we use this
24+
value at runtime for some things) -->
25+
<integer name="status_bar_recents_bg_gradient_degrees">90</integer>
26+
</resources>
27+
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/*
4+
** Copyright 2011, The Android Open Source Project
5+
**
6+
** Licensed under the Apache License, Version 2.0 (the "License");
7+
** you may not use this file except in compliance with the License.
8+
** You may obtain a copy of the License at
9+
**
10+
** http://www.apache.org/licenses/LICENSE-2.0
11+
**
12+
** Unless required by applicable law or agreed to in writing, software
13+
** distributed under the License is distributed on an "AS IS" BASIS,
14+
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
** See the License for the specific language governing permissions and
16+
** limitations under the License.
17+
*/
18+
-->
19+
20+
<!-- These resources are around just to allow their values to be customized
21+
for different hardware and product builds. -->
22+
<resources>
23+
<!-- Whether we're using the tablet-optimized recents interface (we use this
24+
value at runtime for some things) -->
25+
<integer name="status_bar_recents_bg_gradient_degrees">90</integer>
26+
</resources>
27+

packages/SystemUI/res/values/colors.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<drawable name="notification_item_background_color_pressed">#ff257390</drawable>
2323
<drawable name="ticker_background_color">#ff1d1d1d</drawable>
2424
<drawable name="status_bar_background">#ff000000</drawable>
25-
<drawable name="status_bar_recents_background">#b3000000</drawable>
25+
<drawable name="status_bar_recents_background_solid">#b3000000</drawable>
2626
<drawable name="status_bar_recents_app_thumbnail_background">#88000000</drawable>
2727
<color name="status_bar_recents_app_label_color">#ffffffff</color>
2828
<drawable name="status_bar_notification_row_background_color">#ff090909</drawable>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ public void hide(boolean animate) {
230230

231231
public void handleShowBackground(boolean show) {
232232
if (show) {
233-
mRecentsScrim.setBackgroundResource(R.drawable.status_bar_recents_background);
233+
mRecentsScrim.setBackgroundResource(R.drawable.status_bar_recents_background_solid);
234234
} else {
235235
mRecentsScrim.setBackgroundDrawable(null);
236236
}

0 commit comments

Comments
 (0)