2234 Commits

Author SHA1 Message Date
Daniel Sandler
75d8eb2a81 am 9b5d7a59: Merge "Dreams (now Screen Candy) development." into ics-mr1
* commit '9b5d7a59f336a96e73f5f485f6e366e078a70497':
  Dreams (now Screen Candy) development.
2011-11-19 20:44:36 -08:00
Daniel Sandler
2d54536d08 Dreams (now Screen Candy) development.
- support for global "disable" setting
- renamed settings provider keys to remove "DREAM"

Bug: 5591015
Change-Id: I31f31b3ca6001fec1e0032a49cdf0d10df7b0ec7
2011-11-18 08:00:04 -08:00
Adam Powell
9a842408c8 am 8c54182f: Merge "Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)" into ics-mr1
* commit '8c54182f0b6c706adc6247d6f1da7147b357920d':
  Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)
2011-11-17 19:45:50 -08:00
Adam Powell
8c54182f0b Merge "Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)" into ics-mr1 2011-11-17 19:44:14 -08:00
Adam Powell
c992087d09 Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)
Disable the window-level progress spinner; another is already shown while
connecting.

Use the correct Settings icon for SystemUI.

Specify the activity title for the USB mass storage screen in the
manifest to avoid title flashing during startup.

Change-Id: Ic57af56bf1661a5eaa91fff77471dc8447340d16
2011-11-17 18:01:07 -08:00
Amith Yamasani
9b8a465dbc am aefc0ed9: Merge "Don\'t upgrade some settings from GB to ICS." into ics-mr1
* commit 'aefc0ed9677233d5e8c991196f970222b4899dc3':
  Don't upgrade some settings from GB to ICS.
2011-11-17 10:02:29 -08:00
Amith Yamasani
aefc0ed967 Merge "Don't upgrade some settings from GB to ICS." into ics-mr1 2011-11-17 10:01:00 -08:00
Daniel Sandler
44a0c2968f am 293f861a: Merge "Activate Dreams (screen saver) when desk-docked." into ics-mr1
* commit '293f861aab64a0dbae00bb33c90e6e565a7fabfc':
  Activate Dreams (screen saver) when desk-docked.
2011-11-16 22:35:30 -08:00
Daniel Sandler
293f861aab Merge "Activate Dreams (screen saver) when desk-docked." into ics-mr1 2011-11-16 22:33:55 -08:00
Amith Yamasani
5cd1500cc4 Don't upgrade some settings from GB to ICS.
Copy the value of AUTO_TIME to AUTO_TIME_ZONE.
Don't upgrade screen timeout and auto brightness.

Bug: 5607851, 5217460

Also fix the default for vibrate mode. Bug: 5553900

Change-Id: I1b8d5215d55953f2b686e77bf55fd07110a08b8d
2011-11-16 18:09:15 -08:00
Daniel Sandler
83ae021c5d am f52a4482: Merge "Add a default Dreams component." into ics-mr1
* commit 'f52a4482dd3ca336f84fc6c533ea4a99a72b23dd':
  Add a default Dreams component.
2011-11-16 17:16:57 -08:00
Daniel Sandler
70cfd3afe9 am 5311917d: Merge "Remove day of week from phone notification panel." into ics-mr1
* commit '5311917df5fe9804105ff6070346b8fac4b102df':
  Remove day of week from phone notification panel.
2011-11-16 17:14:36 -08:00
Daniel Sandler
f52a4482dd Merge "Add a default Dreams component." into ics-mr1 2011-11-16 17:13:35 -08:00
Daniel Sandler
5311917df5 Merge "Remove day of week from phone notification panel." into ics-mr1 2011-11-16 17:13:16 -08:00
Daniel Sandler
532a0bbfa4 Activate Dreams (screen saver) when desk-docked.
SystemUI's DreamsDockLauncher now responds to low-level dock
events (Intent.ACTION_DOCK_EVENT) by immediately invoking
the user's selected screen saver.

(The high-level DESK_DOCK behavior is no longer enabled; see
change I7884f65.)

Bug: 5591015
Change-Id: I01a9bc6b181d55493f891ccc220631ddc461808a
2011-11-16 11:34:09 -08:00
Eric Fischer
d842391ad9 am 7dc81e06: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '7dc81e06e4d0554683595e8d2e318837548e249a':
  Import revised translations.  DO NOT MERGE
2011-11-16 11:01:06 -08:00
Eric Fischer
7dc81e06e4 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-16 10:57:45 -08:00
Eric Fischer
2f8e2e805d Import revised translations. DO NOT MERGE
Change-Id: I4ef67d81f61028da84c51ed0e48231f9cdc62679
2011-11-16 09:55:52 -08:00
Daniel Sandler
c224f76303 Add a default Dreams component.
Currently set to DeskClock's screensaver, but since it's a
(private) string in f/b/c/r/r/values/config.xml any product
could overlay this.

Bug: 5611008
Change-Id: I7a4623c9c667a6cff8ed80ad600a8a4460bfafb7
2011-11-15 22:55:03 -08:00
Daniel Sandler
589f3624e0 Remove day of week from phone notification panel.
It was added to the tablet, but was never intended for use
on the phone, where it can cause the label to get too wide,
preventing access to settings / clear-all.

Bug: 5621955
Change-Id: Ic023391aa22d7ba3edd815f602afcb3357eb2501
2011-11-15 21:28:55 -08:00
Adam Powell
a2c5baedbb am 45f05c95: Merge "Fix bug 5623642 - Status bar background incompatible with some legacy apps" into ics-mr1
* commit '45f05c9580739ffe2d665cec50efb0bb57d757ba':
  Fix bug 5623642 - Status bar background incompatible with some legacy apps
2011-11-15 19:53:10 -08:00
Adam Powell
45f05c9580 Merge "Fix bug 5623642 - Status bar background incompatible with some legacy apps" into ics-mr1 2011-11-15 19:51:56 -08:00
Adam Powell
29ea525d18 Fix bug 5623642 - Status bar background incompatible with some legacy apps
Give some background protection to custom layouts in legacy notifications.

Pre-HC it was extremely common for apps to hardcode text colors in
layouts. Since this can lead to black text on a dark background in
HC/ICS, give these older apps that target SDK < 11 a light gray
background.

Change-Id: Iab3dea4beb9172b2f9a5cae53991cf952d0c8cde
2011-11-15 19:04:33 -08:00
Winson Chung
2120eb3830 am e5129d7f: Merge "Defer adding large icon until when we compose the final notification. (Bug 5566846)" into ics-mr1
* commit 'e5129d7f49361df69e804a79696e28b213ea20b0':
  Defer adding large icon until when we compose the final notification. (Bug 5566846)
2011-11-15 12:43:49 -08:00
Winson Chung
e5129d7f49 Merge "Defer adding large icon until when we compose the final notification. (Bug 5566846)" into ics-mr1 2011-11-15 12:41:56 -08:00
Daniel Sandler
802e9227ab am ce33622a: Merge "Bring back the \'more notifications\' icon." into ics-mr1
* commit 'ce33622aed7fb25a14ef957cdc78b78cc4602be9':
  Bring back the 'more notifications' icon.
2011-11-15 09:26:04 -08:00
Michael Jurka
2502262ddf am 4b7494e0: Merge "Updating recent apps visuals on tablet" into ics-mr1
* commit '4b7494e07a44c0aa363379be463de70455a895f3':
  Updating recent apps visuals on tablet
2011-11-15 09:25:47 -08:00
Daniel Sandler
ce33622aed Merge "Bring back the 'more notifications' icon." into ics-mr1 2011-11-15 09:20:56 -08:00
Michael Jurka
bfd24acd31 Updating recent apps visuals on tablet
- getting rid of blue glow (5529032)
- moving app icon position
- show message if there are no recent apps (5533332)
- fixing rare IllegalStateException on orientation change (5584344)

Change-Id: I2210e584957869c8f02339e6841daf39364a9dad
2011-11-14 23:49:10 -08:00
Winson Chung
9c99aee5b9 Defer adding large icon until when we compose the final notification. (Bug 5566846)
Change-Id: I9f156d7b597112ce14e274f05df421100c9481e6
2011-11-14 14:13:35 -08:00
Peter Ng
496bf91290 am 20d8c5ed: Merge "Making the quicksettings notifications icon the right opacity" into ics-mr1
* commit '20d8c5ed96d6fb81d14cbce5221025ed6c954d6e':
  Making the quicksettings notifications icon the right opacity
2011-11-11 11:59:16 -08:00
Peter Ng
20d8c5ed96 Merge "Making the quicksettings notifications icon the right opacity" into ics-mr1 2011-11-11 11:57:41 -08:00
Jamie Gennis
c1c6d708ec am 787e2c27: am ca5c8813: Merge "SystemUI: Disable HW acceleration for status bar" into ics-mr0
* commit '787e2c276a5645ffbaddc5c23f4deb66d182e80d':
  SystemUI: Disable HW acceleration for status bar
2011-11-11 11:50:09 -08:00
Daniel Sandler
e7a95e4ade am 992e77af: Merge "Fold WiMAX state into the mobile RSSI." into ics-mr1
* commit '992e77af1168ddce232b9b7702d01e5ccc7a249b':
  Fold WiMAX state into the mobile RSSI.
2011-11-11 11:50:01 -08:00
Daniel Sandler
aff52bc85f am 8b50bd8c: Merge "Remove dedicated wimax icon to fix RSSI layout." into ics-mr1
* commit '8b50bd8c9ba594e2516014fcc4b950b8deb36312':
  Remove dedicated wimax icon to fix RSSI layout.
2011-11-11 11:49:59 -08: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
Peter Ng
1fe155251e Making the quicksettings notifications icon the right opacity
Change-Id: Ia732a63f02b80ca9ba88533c19a7c47f9b02fc0d
2011-11-10 15:42:57 -08:00
Jason Simmons
f0b82d61f5 resolved conflicts for merge of faa81c82 to ics-aah
Change-Id: I7464f16940058cc9b5a3dba5cb839bc67129009e
2011-11-10 14:29:46 -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
05e2414ef5 Bring back the 'more notifications' icon.
In fact, there's even more going on here. Icons were
appearing cut off because of the unusual width of icons on
the right-hand side of the status bar; we now take extra
steps to ensure that the IconMerger is only wide enough to
show an integral number of icons. But that causes problems
with the rest of the status bar the IconMerger makes itself
thinner than the overall layout requires, so there's now a
containing layout to absorb the additional horizontal space
properly.

Bug: 5136545

Change-Id: I8c4d1ee2bcd976c452510b33c196fbe0c3e8c660
2011-11-10 12:42:30 -05: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
922e70f4db am bca520a1: Merge "Use platform assets for brightness scrubber." into ics-mr1
* commit 'bca520a170f84c8be840e629841d0dc7d7cb273b':
  Use platform assets for brightness scrubber.
2011-11-10 04:43:01 +00: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
Peter Ng
02e075ae03 am 34dd937b: Merge "Making quicksettings opaque again" into ics-mr1
* commit '34dd937be1a325fd92d6479822960e4ca13f2420':
  Making quicksettings opaque again
2011-11-09 19:05:27 +00:00
Daniel Sandler
cc106d9d87 am da738d63: Merge "Add day of week." into ics-mr1
* commit 'da738d638cc2fee29d5936f21c6eadbcf173a718':
  Add day of week.
2011-11-09 18:59:34 +00:00
Peter Ng
34dd937be1 Merge "Making quicksettings opaque again" into ics-mr1 2011-11-09 10:57:23 -08:00