Commit Graph

58471 Commits

Author SHA1 Message Date
The Android Automerger
1233316955 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-06 20:52:50 -07:00
Christopher Tate
a0c39e28e5 DO NOT MERGE: fix wallpaper restore
Following a restore of the wallpaper data files, the settingsRestored()
method was binding the new wallpaper by passing null as the component,
because once upon a time that meant just use the configuration that had
just been loaded from the [newly restored] settings filed.  However, at
some point this broke when the load from settings was made a staging
operation, not also the commitment of the changes.

This CL passes the newly-determined component configuration explicitly
to the bind, overriding the product default that may already have been
emplaced by the time the restore happens.

Will not merge cleanly downstream; the parallel (small) change will
be made explicitly there.

Bug 5416839

Change-Id: I50b5d57fafd176529ac7a90cac8116bbc9f696fd
2011-10-06 17:24:54 -07:00
Justin Ho
65162b1ee4 Merge "Adding 3 additional notification sounds Bug: 5416299" into ics-factoryrom 2011-10-06 15:51:43 -07:00
Justin Ho
fe993cf132 Adding 3 additional notification sounds
Bug: 5416299

Change-Id: I69c6ddd1c4202f640ce14a2a7e4a233e1d93e53d
2011-10-06 15:23:23 -07:00
Jeff Sharkey
a50d0f8985 Merge "Hide quota APIs until finalized." into ics-factoryrom 2011-10-06 11:19:29 -07:00
Jeff Sharkey
44a3e0d497 Hide quota APIs until finalized.
Bug: 5383656
Change-Id: Ia2a978a6ff2ee642b0ea4d7d6b8857b7efffd612
2011-10-06 10:50:09 -07:00
Eric Fischer
2fc826ec94 Import translations for late permission additions.
Change-Id: I80c968b0f6fd74cc52443a3729d02490c77aef30
2011-10-06 10:28:28 -07:00
The Android Automerger
0a71485079 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-05 06:39:22 -07:00
Dave Santoro
7d535138c1 DO NOT MERGE New permissions for social stream.
These permissions are needed to separate the (potentially invasive)
access to the user's social stream from the existing read/write
contacts permission.

Per discussion with Android release team, we are also hiding the
stream item API until we figure out a better way to guard the data.

Bug 5406886

Change-Id: I8339d743c3ebe8923c7ee47f2900444efcf82a52
2011-10-04 15:09:54 -07:00
The Android Automerger
dac3a04312 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-04 06:28:35 -07:00
Justin Ho
121e805af4 Merge "Adding additional variety to sound set 7" into ics-factoryrom 2011-10-03 16:49:58 -07:00
Justin Ho
18f3656eb5 Adding additional variety to sound set 7
Change-Id: I3f8c806258e47dc3b78ce81fd582722753573b54
2011-10-03 16:06:09 -07:00
The Android Automerger
a9f2571b10 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-03 14:53:50 -07:00
Xavier Ducrohet
6c465bbe80 Cherry-pick f1dee1 from master for SDK. do not merge.
Layoutlib: add support for ITextServicesManager.

This include a fix in layoutlib_create to properly handle
delegating a static method of an inner class (was broken and
only worked on non static method).

Added a few comments here and there to *_Accessor classes so
that it's a bit more obvious what they are for and how they are
used.

Change-Id: I186ce33236e4de08d0205f75fb8d20d74c92da34
2011-10-03 09:54:57 -07:00
The Android Automerger
f630839d34 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-30 13:12:46 -07:00
repo sync
8b42fcef5a Fix wifi data activity icons
Bug: 5393252
Change-Id: I6ca650b4f722b2c8cc4d17b1bc6ec2f2c0b7e10d
2011-09-30 10:14:38 -07:00
The Android Automerger
d435a0d076 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-29 18:46:30 -07:00
Mathias Agopian
5d9a4f33d3 Merge "improve hwc log output" into ics-factoryrom 2011-09-29 18:34:22 -07:00
Mathias Agopian
1f84f44bfa improve hwc log output
we now print the handle of each buffer

Change-Id: I4104cd6d3a0a303baf44c5c69de3bf36c237892e
2011-09-29 18:12:20 -07:00
The Android Automerger
1b7c745bbe merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-29 15:21:22 -07:00
Dima Zavin
e8b7f4a20c eventhub: print debugginf info when removing device
Change-Id: I40bbbd3867e8c7ac7d6fb38e1c72432bb4963316
Signed-off-by: Dima Zavin <dima@android.com>
2011-09-29 11:28:17 -07:00
The Android Automerger
7a9eb86c9e merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-29 06:29:20 -07:00
Dianne Hackborn
9547d03ef1 Fix build.
Change-Id: Ife2b4b207270f8017d3acd80c76eaf1c7a50986d
2011-09-28 20:48:41 -07:00
Dianne Hackborn
1fd6c33620 Fix issue #5312624: Lock screen very flickery
The key thing was to fix isVisibleOrBehindKeyguardLw() so that it
wouldn't count a window as not visible if it was just currently
in the process of drawing due to an orientation change.

Also improve logic in deciding when to turn screen on to better ensure
the screen is in a stable state, in particular treating screen off
as a frozen screen and not allowing it to turn on until the
update of the screen due to any config change is done.

Change-Id: If82199f3773270b2d07f9c7de9da2dad8c7b28d7
2011-09-28 19:46:39 -07:00
Dianne Hackborn
6ea4da95d9 Fix issue #5242779: Device not responding to touch on unlock screen
Rework how we decide when it is okay to turn on the screen by having
the policy call back to the power manager when it knows the lock screen
has been drawn.

Change-Id: Ie8f3f72111dcf7f168723e6dce24e0343b4afe5d
2011-09-28 19:46:34 -07:00
Eric Fischer
d908b40d0b Merge "Import revised translations." into ics-factoryrom 2011-09-28 17:35:18 -07:00
The Android Automerger
f9afd18726 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-28 17:34:28 -07:00
Eric Fischer
9e2e026ff2 Import revised translations.
Bug 5384730

Change-Id: I796fdb4e953595d8dc6a8577f4a633b5d4ff91ca
2011-09-28 17:29:42 -07:00
Eric Fischer
a94489b439 Merge "Don't lose product variant strings that also vary between locales." into ics-factoryrom 2011-09-28 17:01:39 -07:00
Eric Fischer
5c12c03931 Merge "Import revised translations. DO NOT MERGE." into ics-factoryrom 2011-09-28 16:55:33 -07:00
Eric Fischer
6cbc7d6ad9 Import revised translations. DO NOT MERGE.
Change-Id: Ic1c1290adfac7dd0eabba74e8d290bcc8567d91e
2011-09-28 16:32:06 -07:00
Justin Ho
24664c0003 Merge "Updated menu icon Bug: 5388009" into ics-factoryrom 2011-09-28 15:24:09 -07:00
Justin Ho
3b5a379dda Merge "Updated overflow menu icon Bug: 5388009" into ics-factoryrom 2011-09-28 15:23:57 -07:00
Justin Ho
5fba7e525e Updated menu icon
Bug: 5388009

Change-Id: I3bc43a707f4fdb38021cf0cf9f76784f5e1192d9
2011-09-28 14:56:47 -07:00
Justin Ho
55cea04465 Updated overflow menu icon
Bug: 5388009

Change-Id: I667d6ecf0e897c073c669b2b88ffe06a71ca704d
2011-09-28 14:55:01 -07:00
Xia Wang
b2d17234b7 Merge "Reorganize media framework functional tests. Group tests into sub-packages" into ics-factoryrom 2011-09-28 12:38:15 -07:00
Fred Quintana
272101b308 Merge "Fix a bug in the account chooser where relaunching an in-progress flow results in a blank screen." into ics-factoryrom 2011-09-28 11:45:52 -07:00
The Android Automerger
72d7b36c25 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-28 06:09:16 -07:00
Fred Quintana
9bbdd0bf50 Fix a bug in the account chooser where relaunching an in-progress flow
results in a blank screen.

The fix involves making the first activity just call the account
type chooser to get the account type to add, rather than having
the account type chooser also kick off the AccountManager.addAccount()
request itself. Instead the first activity will get the type
back and then call AccountManager.addAccount()

Bug: 5346810
Change-Id: I4a0cf2370971b98f8ee0910f5401d97e999e546b
2011-09-27 17:24:32 -07:00
Eric Fischer
914f7e683a Don't lose product variant strings that also vary between locales.
Localized strings with product variants were not being included in the APK,
apparently because the check to ensure that a different variation of the
string had not already been included in the APK was matching the version
of it from the default, untranslated configuration.

Now check to make sure that the string not only exists but also exists in
the correct configuration.

Bug 5372711

Change-Id: I52975570b75e0f11827dc6bcf1cb4a987d0541aa
2011-09-27 16:09:41 -07:00
Xia Wang
db6028508c Reorganize media framework functional tests.
Group tests into sub-packages

Change-Id: I878e14487142de495fc646037d5d0b51e39341bd
2011-09-27 16:00:20 -07:00
Romain Guy
0e8fb15da2 CherryPick 043a6b from master: do not merge.
Don't use OpenGL ES 2.0 to render the wallpaper on the emulator.
Bug #5352896

The emulator doesn't support OpenGL ES 2.0.

Change-Id: I3d60f8e4b5c5431e9e21471c576f4a9382f4693f
2011-09-27 15:59:53 -07:00
Eric Fischer
ce9756d06d Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom 2011-09-27 14:54:12 -07:00
Eric Fischer
006e6ef2e6 Import revised translations. DO NOT MERGE
Change-Id: Ifb1966956dcc9fe4e082708bb3fb30d5224308e7
2011-09-27 14:29:36 -07:00
The Android Automerger
42670ff37e merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-27 13:32:06 -07:00
Daniel Sandler
25bb73eb1b Merge "Remove "excessive sync" icon." into ics-factoryrom 2011-09-27 13:06:01 -07:00
Jamie Gennis
da42e0faaa Merge "SurfaceFlinger: fix setting default buffer size" into ics-factoryrom 2011-09-27 12:28:59 -07:00
Justin Ho
5fd141c245 Merge "Updated stat_sys icons" into ics-factoryrom 2011-09-27 09:54:40 -07:00
Daniel Sandler
abff032e78 Draw smaller system status icons without scaling.
Bug: 5297795
Change-Id: I11dc3a21b2e1111963b1cd9621434747f1757a67
2011-09-27 11:20:17 -04:00
The Android Automerger
a3365668f2 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-27 03:52:49 -07:00