In order to unbundle System Update, we need some to expose in the SDK
some way to reboot the device into recovery. Add a reboot() method to
PowerManager, protected by the android.permission.REBOOT permission.
Merge commit '86103cd7dbcf3b5a949711d2b0b21b01ed90cb74'
* commit '86103cd7dbcf3b5a949711d2b0b21b01ed90cb74':
resolved conflicts for merge of ee3fd99a to eclair-mr2-plus-aosp
Merge commit '1ff57418a7d58887301766031554a146c1ededd1'
* commit '1ff57418a7d58887301766031554a146c1ededd1':
Move map tiles to no-dpi since they are dpi-independent.
Merge commit '340733697fcb0b73a707eb544b958af3121cdf60' into eclair-mr2-plus-aosp
* commit '340733697fcb0b73a707eb544b958af3121cdf60':
Move map tiles to no-dpi since they are dpi-independent.
Merge commit '69e0b6646f109d17a5cff4b8c32582e3d3a3f544' into eclair-mr2
* commit '69e0b6646f109d17a5cff4b8c32582e3d3a3f544':
Move map tiles to no-dpi since they are dpi-independent.
This change allows applications to nest children RemoteViews
inside an existing set of RemoteViews. These nested views
are inflated and treated as addView() calls.
This change also allows ViewFlipper through RemoteViews, and
adds logic surpress flipping when the parent window is
detached or behind the lockscreen. Also fixes ViewAnimator
to observe the measureAllChildren flag when set.
Fixes http://b/2239905
Merge commit '16a9d9a736a1bfdc12aa54c549508dd12596247f' into eclair-mr2
* commit '16a9d9a736a1bfdc12aa54c549508dd12596247f':
Fix 2209086: Fix missing callback that was preventing tab bar text from updating.
Merge commit 'e5608f5ea55fadb4c99664207865b1220ad0f73b' into eclair-mr2
* commit 'e5608f5ea55fadb4c99664207865b1220ad0f73b':
Fix 2262069: Cosmetic change - shift DigitalClock down to provide room for carrier.
Merge commit '3eb76e1669807c737e883c5a5f094a170f55a3b9'
* commit '3eb76e1669807c737e883c5a5f094a170f55a3b9':
Fix the full-weekday date format strings to actually use the full weekday.
Merge commit '65f27f8721ae648ceffffb59a83e2af0d4641920' into eclair-mr2
* commit '65f27f8721ae648ceffffb59a83e2af0d4641920':
Fix the full-weekday date format strings to actually use the full weekday.
Merge commit '73f8aa678055598738dfba54c60a1674bcbf02b1' into eclair-mr2
* commit '73f8aa678055598738dfba54c60a1674bcbf02b1':
Removed the fixed height in the sim unlock screen's header.
Merge commit '0b81ce217ea56290f10a301cfca1c9fdce876d43'
* commit '0b81ce217ea56290f10a301cfca1c9fdce876d43':
Make WRITE_GSERVICES into system-or-signature (instead of just signature),
Merge commit 'fcd2917a3550e2b4f5c6ff2038ae5de91c81d28c'
* commit 'fcd2917a3550e2b4f5c6ff2038ae5de91c81d28c':
Add support for making a LiveWallpaper the default
Merge commit 'fd13fb7a9cbda152c25f28989cb3ce2e316406d3'
* commit 'fd13fb7a9cbda152c25f28989cb3ce2e316406d3':
docs: document the 'showSearchIconAsBadge" flag and
* changes:
Make WRITE_GSERVICES into system-or-signature (instead of just signature), as a temporary measure so unbundled Google components (GSF, etc.) can hold it. (In the longer term, WRITE_GSERVICES won't be a system permission at all, but it or something like it will be defined directly by GSF.)
Merge commit '27d6e65b71f515deafbd93d5aa98732898c34ddf' into eclair-mr2
* commit '27d6e65b71f515deafbd93d5aa98732898c34ddf':
Add support for making a LiveWallpaper the default
Merge commit 'd05fd6c33518e60664ffdf1bb6cb425f36c2b82f' into eclair-mr2
* commit 'd05fd6c33518e60664ffdf1bb6cb425f36c2b82f':
docs: document the 'showSearchIconAsBadge" flag and
Merge commit 'dbc7e27ef10349f11ac940d59ff4f812319fce51' into eclair
* commit 'dbc7e27ef10349f11ac940d59ff4f812319fce51':
docs: document the 'showSearchIconAsBadge" flag and
as a temporary measure so unbundled Google components (GSF, etc.) can hold
it. (In the longer term, WRITE_GSERVICES won't be a system permission at
all, but it or something like it will be defined directly by GSF.)
