Akwasi Boateng
1333742bed
am cb0db030: Merge branch \'ics-mr1-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp
...
* commit 'cb0db0306b5849a35d3d99eea1b34ce019c6f0d8':
Make the overridden ImageView#setVisibility remotable
Clamp non-monotonic stats instead of dropping.
DO NOT MERGE. Fix leak in LayoutTransition
Fix lastVisible/global rects
Fix Wimax-less build.
Fix leak in LayoutTransition
Deferring wallpaper update to improve workspace scrolling (issue 5506959)
Terminate EGL when an app goes in the background
boot animation is dithered and scaled
Fix NdefRecord byte-stream constructor.
PopupWindow dismiss() can get into a recursive loop.
Fold WiMAX state into the mobile RSSI.
Remove dedicated wimax icon to fix RSSI layout.
2011-11-11 15:34:19 +00:00
Jamie Gennis
0ed4c7f8cc
am 0c71e5ed: am ca5c8813: Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0
...
* commit '0c71e5ed820350a4ae0517dc73d1f46cd3534b55':
SystemUI: Disable HW acceleration for status bar
2011-11-11 15:34:19 +00:00
Jamie Gennis
0c71e5ed82
am ca5c8813: Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0
...
* commit 'ca5c881374d051361eb5f9a191d51b5716ef2366':
SystemUI: Disable HW acceleration for status bar
2011-11-11 14:46:21 +00:00
Jamie Gennis
787e2c276a
am ca5c8813: Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0
...
* commit 'ca5c881374d051361eb5f9a191d51b5716ef2366':
SystemUI: Disable HW acceleration for status bar
2011-11-11 08:02:26 +00:00
Daniel Sandler
992e77af11
Merge "Fold WiMAX state into the mobile RSSI." into ics-mr1
2011-11-10 20:16:47 -08:00
Daniel Sandler
8b50bd8c9b
Merge "Remove dedicated wimax icon to fix RSSI layout." into ics-mr1
2011-11-10 20:16:38 -08:00
Eric Fischer
c926911386
Merge "Import revised translations."
2011-11-10 14:06:21 -08:00
Tom Taylor
fb894276b1
am 0bbd151e: am faa81c82: Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1
...
* commit '0bbd151e1dab043226725d23f0ca26f4d09ee76f':
Revert "Add new secure setting for controlling Messaging notifications"
2011-11-10 21:16:54 +00:00
Eric Fischer
334f691fa3
Import revised translations.
...
Change-Id: Iac6e1ff785d898d65934cdfdaf3d92a56324282c
2011-11-10 11:20:21 -08:00
Tom Taylor
994da2ad32
Revert "Add new secure setting for controlling Messaging notifications"
...
This reverts commit 03da2f00aac04e6565a02cf5a9bf6bb1ec926930.
Committer: Tom Taylor <tomtaylor@google.com>
On branch revertsetting
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: api/current.txt
modified: core/java/android/provider/Settings.java
modified: core/java/android/provider/Telephony.java
modified: packages/SettingsProvider/res/values/defaults.xml
modified: packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
We've decided not to disable messaging notifications with a secure setting.
Instead, all the work will be done within the messaging app itself.
Change-Id: Icde6894e76da1007b6026c8ec7dc56e488453c06
2011-11-10 11:17:38 -08:00
Daniel Sandler
4e637a9fa5
am 9cc4efb3: am bca520a1: Merge "Use platform assets for brightness scrubber." into ics-mr1
...
* commit '9cc4efb39054557cfac11e0c7ba5887f102579d3':
Use platform assets for brightness scrubber.
2011-11-10 18:51:15 +00:00
Peter Ng
1c3ce05b7c
am cf83c070: am 34dd937b: Merge "Making quicksettings opaque again" into ics-mr1
...
* commit 'cf83c070e3caa3ee6e5df8a4e6545ae43cb08a35':
Making quicksettings opaque again
2011-11-10 16:14:40 +00:00
Daniel Sandler
0fee21703b
Fold WiMAX state into the mobile RSSI.
...
WiMAX will now be shown like any other 4G network.
Bug: 5584528
Change-Id: I33ef7b34b88ca006ce77a7ff1e55b7b38648d7d8
2011-11-10 00:36:23 -05:00
Daniel Sandler
633eabe56d
Remove dedicated wimax icon to fix RSSI layout.
...
We'll bring the wimax information back, but as part of the
mobile data indicator.
Bug: 5592198
Change-Id: I7d797db18b2d86ea4b8609642c6e09a5b2425459
2011-11-10 00:16:02 -05:00
Daniel Sandler
bca520a170
Merge "Use platform assets for brightness scrubber." into ics-mr1
2011-11-09 20:41:03 -08:00
Jamie Gennis
87abde8a52
SystemUI: Disable HW acceleration for status bar
...
This change switches the status bar rendering to use CPU rendering to an
RGB_565 window.
Change-Id: I45c03989efc9cc9ea71ff169fafedf048de9d612
2011-11-09 16:29:48 -08:00
Daniel Sandler
bec9f9e47f
am f01a9c04: am da738d63: Merge "Add day of week." into ics-mr1
...
* commit 'f01a9c0476191b3bbd9553c10421a1fee3c92353':
Add day of week.
2011-11-09 21:51:33 +00:00
Peter Ng
34dd937be1
Merge "Making quicksettings opaque again" into ics-mr1
2011-11-09 10:57:23 -08:00
Robert Greenwalt
c1b3cbe164
resolved conflicts for merge of ea54b760 to master
...
Change-Id: Ifcdfd6ffd82db1293936a8a3b5715dd767fb43f8
2011-11-09 09:03:59 -08:00
Daniel Sandler
e989b32b3a
Use platform assets for brightness scrubber.
...
Bug: 5544665
Change-Id: I063f930b15668c06a30b857e477f3227d1fe526f
2011-11-09 10:52:34 -05:00
Tom Taylor
81b10fd74e
am 1366c756: Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1
...
* commit '1366c756d28cdbb6c7c07959dfb4c93c81a9539d':
Add new secure setting for controlling Messaging notifications
2011-11-09 14:34:18 +00:00
Daniel Sandler
da738d638c
Merge "Add day of week." into ics-mr1
2011-11-08 20:35:45 -08:00
Peter Ng
f804e06078
Making quicksettings opaque again
...
Bug:5522957
Change-Id: I27e9e78f4e706333f9a363b3d97ae6f602321173
2011-11-08 17:28:56 -08:00
Daniel Sandler
ce18b91c60
Add day of week.
...
Bug: 5581707
Change-Id: Ifa881e6a4a7a54599eb4567c2458d1df27b68a3e
2011-11-08 14:26:00 -05:00
Robert Greenwalt
ea54b76085
Merge "Wimax : wimax framework related open source." into ics-mr1
2011-11-08 10:01:07 -08:00
Tom Taylor
1366c756d2
Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1
2011-11-08 09:00:22 -08:00
Daniel Sandler
7bfb5b51de
am c06669a3: Merge "Fix scaling on notification panel wifi/battery icons." into ics-mr1
...
* commit 'c06669a303f2122a71e83d4813ecf78e6ff2b5a5':
Fix scaling on notification panel wifi/battery icons.
2011-11-08 03:50:34 +00:00
Daniel Sandler
c06669a303
Merge "Fix scaling on notification panel wifi/battery icons." into ics-mr1
2011-11-07 19:47:51 -08:00
tk.mun
148c7d0de7
Wimax : wimax framework related open source.
...
Integrate wimax network related changes into Android Framework.
- In Connectivity service, start wimax service.
- 4G icon display in StatusBarPolicy.
- DHCP renew add.
- Add radio for wiamx
Change-Id: I2d9012247edfdf49d71ca7e1414afd0006f330ca
Signed-off-by: tk.mun <tk.mun@samsung.com>
bug:5237167
2011-11-07 14:47:40 -08:00
Tom Taylor
03da2f00aa
Add new secure setting for controlling Messaging notifications
...
Bug 5552615
We're adding a new intent to allow 3rd party apps to disable
the Messaging app's notification. We want any app to be able to query
the setting of whether sms notifications are on or off, but only allow
system apps, particularly the Messaging app, to change that setting.
Other apps can change the setting by firing off an intent which brings
up a dialog activity in the Messaging app that'll let them turn off
Messaging notifications.
Change-Id: I4d2721191b86010efb383a24c28d911496440657
2011-11-07 14:16:44 -08:00
Daniel Sandler
989b9f2100
Fix scaling on notification panel wifi/battery icons.
...
Still needs a redesign.
Bug: 5544770
Change-Id: I27f6ea9f788110d7027b3ea788ca98216fa4fe28
2011-11-07 17:09:57 -05:00
Eric Fischer
08be43a6d9
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-11-07 12:36:02 -08:00
Eric Fischer
2f6172e35a
Import revised translations. DO NOT MERGE
...
Change-Id: Ib095d85d01ffce5201d1e91d7c90c516f8c4c89c
2011-11-07 12:34:57 -08:00
Winson Chung
48dd388045
am 19c86cac: Merge "Fixing screenshot border asset." into ics-mr1
...
* commit '19c86cacb2f0ba04cc93084ba474662afb17d88f':
Fixing screenshot border asset.
2011-11-07 18:24:01 +00:00
Winson Chung
19c86cacb2
Merge "Fixing screenshot border asset." into ics-mr1
2011-11-07 10:20:37 -08:00
Daniel Sandler
4f631bbf97
am 010bb273: Merge changes I0da0f04f,I93197665 into ics-mr1
...
* commit '010bb273a58444f907bb82f62f8d7274f9637b49':
Offer the user an option to launch Dreams when docked.
Teach UiModeMgr about high-end and low-end desk docks.
2011-11-07 18:15:30 +00:00
Daniel Sandler
221733a45a
Offer the user an option to launch Dreams when docked.
...
SystemUI now registers for DESK_DOCK launches, so users with
other dock apps installed can still opt to use those in this
new regime.
(Part of migrating users away from DeskClock as the dock app.)
Bug: 3155234
Change-Id: I0da0f04f8a0a89e7d237c092f16f4f27eb88c92c
2011-11-04 15:15:41 -04:00
Winson Chung
f01a58e271
Fixing screenshot border asset.
...
Change-Id: I004b09c380e8fabd5204c7d674e6270927f60389
2011-11-03 14:53:06 -07:00
Eric Fischer
2237e1e7b6
Import revised translations. DO NOT MERGE
...
Change-Id: I2f073cc6d62d757ba4e6565a0c7974ca9cecba4c
2011-11-02 15:14:43 -07:00
Eric Fischer
3138e21935
Merge "Import revised translations."
2011-11-02 14:16:29 -07:00
Peter Ng
9f360fde26
am 779c1b85: Merge "Make the notification panel header opaque." into ics-mr1
...
* commit '779c1b8507d939bd3bd6d3e758ded095d91bcd6f':
Make the notification panel header opaque.
2011-11-02 18:50:06 +00:00
Peter Ng
779c1b8507
Merge "Make the notification panel header opaque." into ics-mr1
2011-11-02 11:47:04 -07:00
Michael Jurka
0a698228e6
am 93430b3c: Merge "Fix: never show recents over lock screen" into ics-mr1
...
* commit '93430b3c6d170bf1db538c21666e0b508e8e48ec':
Fix: never show recents over lock screen
2011-11-02 17:31:33 +00:00
Peter Ng
27e7f797c0
am 80c3c87f: Merge "Asset updates for tablet notifications and layout fixes to quicksettings" into ics-mr1
...
* commit '80c3c87ff08e77c3bcbd14f003e296bed9adba55':
Asset updates for tablet notifications and layout fixes to quicksettings
2011-11-02 17:31:15 +00:00
Eric Fischer
2fbd56a652
Import revised translations.
...
Change-Id: I71efb16f2c6b257dfd444728c7e56ada662e6f77
2011-11-02 09:41:15 -07:00
Daniel Sandler
2f77eae947
Make the notification panel header opaque.
...
Bug: 5504753
Change-Id: If820e4cb0dca342ca2d39ea1eb198987915c58b7
2011-11-02 11:13:27 -04:00
Eric Fischer
abf7539642
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-11-01 13:53:14 -07:00
Michael Jurka
93430b3c6d
Merge "Fix: never show recents over lock screen" into ics-mr1
2011-11-01 13:53:02 -07:00
Peter Ng
80c3c87ff0
Merge "Asset updates for tablet notifications and layout fixes to quicksettings" into ics-mr1
2011-11-01 13:45:18 -07:00
Eric Fischer
9ac5d49125
Import revised translations. DO NOT MERGE
...
Change-Id: I43513501e2c0eee9339551d0f20411d14bd5eace
2011-11-01 13:33:04 -07:00