1571 Commits

Author SHA1 Message Date
Daniel Sandler
dce7cf9831 am 339716e0: am f99e27da: Merge "Make android:immersive public." into gingerbread
Merge commit '339716e03c293c1ab29492e38936643f08d797fa'

* commit '339716e03c293c1ab29492e38936643f08d797fa':
  Make android:immersive public.
2010-07-09 09:20:27 -07:00
Steve Block
59c76b87fd Update Browser useragent string to reflect WebKit merge at r62496
Change-Id: I502ae0d565ef9bd4bd3746685b2452da12ec61d6
2010-07-09 11:42:42 +01:00
Daniel Sandler
841b176dc0 Make android:immersive public.
This exposes the AndroidManifest attribute
android:immersive, introduced in Change I967bb10b, to the
SDK.

Change-Id: Iccbc99590cd0fd4c570b9b9670ef93036f9d849e
2010-07-08 15:39:22 -04:00
Joe Onorato
52c1dc2fd9 buttons on the bottom
Change-Id: I52184ad2752c38bcc4c7646b404f3f305e0ac4b6
2010-07-07 18:33:14 -04:00
Kristian Monsen
d94ccc0dca Merge WebKit at r61871: Update UA string to match WebKit version.
Change-Id: Ia9fd58a78e3372ae4f939a0dc74982dbf225b773
2010-07-02 11:12:53 +01:00
Amith Yamasani
169741b708 DO NOT MERGE: Add a battery capacity value to the power profile.
Can be accessed through PowerProfile.getBatteryCapacity()

Individual device profiles need to be updated with their capacities.

(merged from master)

Change-Id: Ie76ab6de47c44807a46934331665e077a7226566
2010-07-01 13:42:59 -07:00
Daniel Sandler
9529f2ce8a am 9b4b74be: am 294c9fb8: Improved graphics for the intruder alert.
Merge commit '9b4b74becf0e99b0a9090758d6337c6615cff1d1'

* commit '9b4b74becf0e99b0a9090758d6337c6615cff1d1':
  Improved graphics for the intruder alert.
2010-06-30 15:48:41 -07:00
Michael Kolb
a172e7d0d9 user agent string change: remove "Mobile" for large screen configuration
bug: http://b/issue?id=2778676

Change-Id: I268d8c0f8834bdbd099d59fdbc462da26234241a
2010-06-30 14:50:02 -07:00
Daniel Sandler
294c9fb899 Improved graphics for the intruder alert.
Change-Id: I9aa6c8995da39f332b724fabe67ed5efe584552f
2010-06-30 15:32:26 -04:00
Adam Powell
0e94b5151d Add subtitles for action bars and context modes.
Fix an issue where context mode content was cleared before animating out.

Change-Id: Ie7a065e65bc18e3da32de07543d0f71d2a2d648c
2010-06-29 19:00:15 -07:00
Adam Powell
9f0fda8430 Merge "Added context modes to ActionBar API." 2010-06-29 14:37:41 -07:00
Adam Powell
89e0645b41 Added context modes to ActionBar API.
Change-Id: I7c3e782cbf01be7bc671b377fb4d706040888833
2010-06-29 14:04:58 -07:00
Mike Lockwood
dad497e598 am 0d929d7f: am 059f009d: Make android.hardware.action.USB_STATE a protected broadcast.
Merge commit '0d929d7f094f2ea743c9ce2e17d5e40780cfe757'

* commit '0d929d7f094f2ea743c9ce2e17d5e40780cfe757':
  Make android.hardware.action.USB_STATE a protected broadcast.
2010-06-29 11:10:33 -07:00
Joe Onorato
c5c2f5b5e5 resolved conflicts for merge of 32b739b6 to master
Change-Id: I5a1791d12ca57ee682e46ade7d24b21e9f59aff2
2010-06-29 13:57:19 -04:00
Joe Onorato
6443de56f3 resolved conflicts for merge of 7f9ede96 to master
Change-Id: Iaa688e5f7adaa363c88e0824b44233c8906e9e26
2010-06-29 12:58:39 -04:00
Mike Lockwood
059f009d97 Make android.hardware.action.USB_STATE a protected broadcast.
Change-Id: I84160e9342025228c1f810077f5aa25f5cc83023
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-29 12:12:04 -04:00
Joe Onorato
1c95ecb47a recombine StatusBarService and PhoneStatusBarService
Change-Id: I64178209985bfac283740d6a667211d2f962f71a
2010-06-29 11:00:04 -04:00
Joe Onorato
b54ef61434 Separate the status bar height from the icon size.
Change-Id: I9cc8c5e8ed2c48d03b7c1c89f1bf7f94cc119171
2010-06-29 09:45:54 -04:00
Patrick Dubroy
d2db2a5794 Add a new attribute to allow widgets to specify a preview image.
Change-Id: I0d79c85c6a2fc477af17eda05eabaa3151b0bef5
2010-06-28 16:39:19 -07:00
Dianne Hackborn
445646c521 Improvements to ListFragment.
Now deals correctly with a content view containing just a list,
and adds a lot more built-in functionality: ability to show
custom text for an empty list, and indeterminant progress while
populating the list.

In addition, reworks transaction committing to be more aggressive
about committing the transactions as the containing activity
moves between its states (rather than waiting for the activity's
handler to process the transaction message whenever that may
finally happen).  And fixed a bug with saving/restoring state of
transaction replace operations.

Change-Id: I9617a0c4f248b50a61b319910323639b6de24f73
2010-06-28 15:17:44 -07:00
Wei Huang
623e78b792 am 5b422186: am 9c4c98b1: Merge "new presence icons for video/audio chats." into gingerbread
Merge commit '5b422186f3740a228620210db6d0be0a9838be51'

* commit '5b422186f3740a228620210db6d0be0a9838be51':
  new presence icons for video/audio chats.
2010-06-28 15:11:05 -07:00
Wei Huang
0b0997cc99 new presence icons for video/audio chats.
Change-Id: I1d011060dc6cb5e04d3a86def03ca55cd318e721
2010-06-28 14:38:25 -07:00
Chih-Chung Chang
1df11fc8f1 am cbbc035b: am de1057c4: Unhide new API for supporting multiple cameras.
Merge commit 'cbbc035b640790650d0e377a2d6291cc523a2a35'

* commit 'cbbc035b640790650d0e377a2d6291cc523a2a35':
  Unhide new API for supporting multiple cameras.
2010-06-27 20:54:36 -07:00
Chih-Chung Chang
de1057c4a6 Unhide new API for supporting multiple cameras.
Change-Id: I916a536c80330444a15986ba380205a6deed2390
2010-06-28 11:12:45 +08:00
David Brown
e3df791ff2 am a0a58235: am 01719a22: Merge "Placeholder icons for the "ringing" variant of stat_sys_phone_call." into gingerbread
Merge commit 'a0a582355ba10454d2625ce2968015e50a12a3e3'

* commit 'a0a582355ba10454d2625ce2968015e50a12a3e3':
  Placeholder icons for the "ringing" variant of stat_sys_phone_call.
2010-06-25 16:07:05 -07:00
David Brown
841b6add6b Placeholder icons for the "ringing" variant of stat_sys_phone_call.
(For now, these are just copies of the standard green "in call" icon.)

Bug: 2768760
Change-Id: I1412ae251f14023889ec235699a2940edfc4c527
2010-06-25 12:13:57 -07:00
Steve Block
3d9bdc3979 Merge "Add a splash screen to the webruntime." 2010-06-24 10:47:15 -07:00
Ben Murdoch
b5c49c8bb1 Add a splash screen to the webruntime.
Bug: 2766920
Change-Id: Ie40627aa50e849b49177f79aa129242eb1d2f2a8
2010-06-24 18:45:34 +01:00
Mike Lockwood
57c798ade1 Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.
We now broadcast Usb.ACTION_USB_CONNECTED and Usb.ACTION_USB_DISCONNECTED
when USB is connected or disconnected.
The ACTION_USB_CONNECTED extras indicate the enabled/disabled state of
all USB functions.

Change-Id: I919fcd5aa8d640d051cec87053f474a9843ed545
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-24 13:14:05 -04:00
Mike Lockwood
2423607a32 Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.
We now broadcast Usb.ACTION_USB_CONNECTED and Usb.ACTION_USB_DISCONNECTED
when USB is connected or disconnected.
The ACTION_USB_CONNECTED extras indicate the enabled/disabled state of
all USB functions.

Change-Id: I11495d039429dbe22bd738067296e39ae415befa
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-24 09:36:50 -04:00
Mike Lockwood
9163d42a50 DO NOT MERGE Add new permission to allow access to USB devices
Adds permission android.permission.ACCESS_USB.
This is a partial cherry pick of a change from master.
It adds the permission, but not the support for associating it
the AID_USB group.

Change-Id: If5816721a4fc88bf444141a7b717da65ea37d5f4
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-24 09:36:35 -04:00
Daniel Sandler
6c55b8b143 am 71764c4c: am 613dde4a: Revised "immersive mode" API.
Merge commit '71764c4ce5b248a79542238b171a783e82e0fe37'

* commit '71764c4ce5b248a79542238b171a783e82e0fe37':
  Revised "immersive mode" API.
2010-06-23 10:31:21 -07:00
Daniel Sandler
613dde4aa6 Revised "immersive mode" API.
No longer a window bit, FLAG_IMMERSIVE is now set on
ActivityInfo.flags and in the Activity's manifest as
android:immersive="true" (ActivityInfo).

[An "immersive" activity is one that wishes to avoid being
paused by full-screen notifications (like an incoming call).
An activity that sets FLAG_IMMERSIVE/android:immersive is
sending a signal to the notification manager, status bar,
etc. that they should try to find some other way to get the
user's attention in high-priority situations.]

[Originally: change Ie290c2e.]

Change-Id: I967bb10b930b8f0772b10f81f2957a03fa3f1736
2010-06-22 12:30:12 -04:00
Daniel Lehmann
2c63fe44f4 Remove ContactHeaderWidget, because it lives directly in the Contacts App from now on
Change-Id: I1d3646f2744e01a1e64db8787b4cd7dd746d540e
2010-06-21 16:27:49 -07:00
Kenny Root
9a76eb568d am 0fcfa0a5: am f25c560d: am 30cf330f: Import revised translations
Merge commit '0fcfa0a53f92f32d50870c246763da30a106d13a'

* commit '0fcfa0a53f92f32d50870c246763da30a106d13a':
  Import revised translations
2010-06-21 11:37:10 -07:00
Kenny Root
f25c560dcd am 30cf330f: Import revised translations
Merge commit '30cf330fae137587d51aa4c026459db146705ba9' into gingerbread

* commit '30cf330fae137587d51aa4c026459db146705ba9':
  Import revised translations
2010-06-21 11:17:07 -07:00
Kenny Root
30cf330fae Import revised translations
Change-Id: I4b91aea9c53332569a7123fdb32141530ede6d3d
2010-06-21 11:03:50 -07:00
Kenny Root
ab8aa51aa6 am b2ce04c2: am cfe3d205: am c4e38577: Import revised translations
Merge commit 'b2ce04c2ea2f4628d665127f8737d535e5b352de'

* commit 'b2ce04c2ea2f4628d665127f8737d535e5b352de':
  Import revised translations
2010-06-21 10:16:48 -07:00
Kenny Root
cfe3d205b0 am c4e38577: Import revised translations
Merge commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17' into gingerbread

* commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17':
  Import revised translations
2010-06-21 09:02:13 -07:00
Kenny Root
c4e38577f4 Import revised translations
Change-Id: Ife82312cc21acc144a70718f79afcafbdd7eda7a
2010-06-20 18:54:45 -07:00
Adam Powell
7ade1be822 Action bar button layout changes.
Theme attribute added for spacing between action buttons. Action
buttons are now allowed to fill up to half of the total action bar's
width.

Change-Id: Iabbc67e695684529dfae9681d4d9580cd30839d0
2010-06-18 10:12:20 -07:00
Adam Powell
96675b1df3 Merging ActionBar menu with options menu.
Options menu items may now specify if they would like to appear in the
action bar. Menu items defined in xml may set the showAsAction
attribute to one of "never"(default), "ifRoom", or "always". Action
buttons are populated as follows:

* All showAsAction="always" items become action buttons, even if it
  would crowd the navigation area of the action bar.

* If there is space remaining, showAsAction="ifRoom" items are added
  until no more will fit comfortably.

Action button click events are now handled by the
onOptionsItemSelected method used by the standard options menu.

The construction of options menus now happens earlier in order to
provide data to the action bar. Activities with an action bar can now
expect to have onCreateOptionsMenu called when activity start-up is
complete.

Activity#invalidateOptionsMenu can be used to force a refresh of menu
items where the previous API would use ActionBar#updateActionMenu.

Change-Id: If52ddf1cf9f6926206bcdeadf42072ea2c24fab9
2010-06-17 11:35:43 -07:00
Mason Tang
f70036bc91 Modified first animation and visibility change behavior for ViewFlipper
- Where previously ViewAnimator only exposed inAnimation and outAnimation as
   XML attributes, modified to also include the animateFirstView flag so that
   widgets can optionally choose to omit the animation for the first child
   view.

 - Changed the behavior of ViewFlipper so that simple visibility changes do not
   trigger extraneous and distracting animations.

Change-Id: I34b3abad33102978a94f0aed5aaab9af30ba49c7
2010-06-16 13:38:15 -07:00
Robert Greenwalt
14f2ef4c9d Move the net transition wakelock to ConnService.
When the default network goes down we lose the wake-on-incoming-data capability
until the new net is brought up and apps rebuild their connections.  We fixed this
in Wifi, but it's a general connectivity issue, not a wifi issue so moving the
mechanism to connecitivty so other networks can use it.

bug:2734419
Change-Id: I39b5d825eb6b548bd9bb8f179b89254f4db53147
2010-06-16 11:04:37 -07:00
Wei Huang
ce718947db am 5907ffa4: am a6c52938: Merge "add new video/audio presence icons in the framework resource dirs, and make them public." into gingerbread
Merge commit '5907ffa453cf92f2f0de760354e4013df4ea6b69'

* commit '5907ffa453cf92f2f0de760354e4013df4ea6b69':
  add new video/audio presence icons in the framework resource dirs, and make them public.
2010-06-15 16:01:32 -07:00
Wei Huang
2b24ecfbb2 add new video/audio presence icons in the framework resource dirs, and make them public.
- add definitions for

presence_video_away
presence_video_busy
presence_video_online
presence_audio_away
presence_audio_busy
presence_audio_online

in the public.xml, and update current.xml

- the actual icons for the audio versions are not yet done, so I used the video versions as placeholders.

Change-Id: I9e2be5dd05619cbdbbb61dc231e9da1984ddbb36
2010-06-15 15:19:40 -07:00
Romain Guy
9295ada0ec Allow the use of styles with LinearLayout, make "useLargestChild" attr public.
Change-Id: I044f3f5bd9b90c684ded7a37ff85e3aa8d15af96
2010-06-15 14:00:52 -07:00
Steve Block
dbf72e21a4 Merge "Add the basic outline of the web runtime used to display installed web applications" 2010-06-14 09:32:38 -07:00
Steve Block
4deb139b8e Add the basic outline of the web runtime used to display installed web applications
This is still a work in progress.

Bug: 2766920

Change-Id: I2d3dd4b3b88bf84d8d66386e43a21c4085627c4d
2010-06-14 16:58:10 +01:00
Brad Fitzpatrick
b60c941811 resolved conflicts for merge of f37cbe6b to master
Change-Id: I529b17e55b9668f900f685f92e9831e14a82db05
2010-06-10 15:58:22 -07:00