60559 Commits

Author SHA1 Message Date
Mike Lockwood
bc06928ef3 ActivityManager: Make sure BOOT_COMPLETED Intent is sent when running headless
Change-Id: Ibf4ea989ef031a93d96ee0a0f7b24284edf2517c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:49 -04:00
Mike J. Chen
c15a71e59a MediaPlayer changes for Tungsten/Android@Home.
Squashed merge from master-tungsten of the following changes:

commit e8b156c6b224f0fe5b6a81d5f92bade36275027c
Author: Jason Simmons <jsimmons@google.com>
Date:   Fri Aug 12 10:28:48 2011 -0700

    Add a null check to handle failure of android::createPlayer

    Change-Id: Iacbbc90369a825838d4374b1f774c8880b25753b

commit 43be3231034ff8537fdd84422a7954780038671f
Author: John Grossman <johngro@google.com>
Date:   Mon Jun 27 18:59:12 2011 -0700

    Move libaah_rtp over from the vendor directory.

    Also move factor PipeEvent out into utils.

    Change-Id: Id3877c66efe22d771cf3ef4877107e431b828e37

commit 17526eb3148c9c3d4365b6d5b47e8dc13bca71b6
Author: John Grossman <johngro@google.com>
Date:   Mon Jun 27 17:06:49 2011 -0700

    Name changes for the TRTP Players s/tungsten/aah/g

    Change-Id: I55e9ad13003f6aa6a36955b54426a7efbe31ac51

commit cbf2903ab6893b6e662514e2f6d670e268a419df
Author: John Grossman <johngro@google.com>
Date:   Fri Apr 15 09:27:54 2011 -0700

    Migrate Tungsten code from the HC-Tungsten to the Master-Tungsten branch.

    Change-Id: I95372d913a0761d90168edb4016f5ece0ea74502

Change-Id: I73f3be191cd974933acddf52892e5600d253cc03
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>
2011-10-28 10:14:49 -04:00
Mike J. Chen
06e04e4c17 Add media/libaah_rtp
RTP library used to broadcast media from one device to a collection
of listeners.  Handles failures/retries/etc.

This is a squashed merge from master-tungsten of the following changes:

commit e1a5101fe627d71739a7c4263bb3a65c7bc44385
Author: Jason Simmons <jsimmons@google.com>
Date:   Fri Aug 12 13:24:21 2011 -0700

    Hold ThreadWrapper in a ref-counting pointer

    Change-Id: Iaf3343182e37bcc0ca99fbaf8f9bbb8c4984072a

commit 89b90d62e164ff3db27c9cba85255fc476d2dd96
Author: Jason Simmons <jsimmons@google.com>
Date:   Wed Aug 10 13:08:25 2011 -0700

    Update the Tungsten TX player to use HTTPBase

    Change-Id: I9f7ecf1b4b496cec1815284dbcdb958a43284169

commit 43be3231034ff8537fdd84422a7954780038671f
Author: John Grossman <johngro@google.com>
Date:   Mon Jun 27 18:59:12 2011 -0700

    Move libaah_rtp over from the vendor directory.

    Also move factor PipeEvent out into utils.

    Change-Id: Id3877c66efe22d771cf3ef4877107e431b828e37

Change-Id: I5fe1ea941c09204d7b33f15f4e2b2ab320dc468b
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>
Signed-off-by: Jason Simmons <jsimmons@google.com>
2011-10-28 10:14:49 -04:00
Mike Lockwood
2a9c3c9488 Quick and dirty test app for new SerialPort API
Change-Id: Ie1ae6e7387b9f1e2788b798de29a06d551a44d1d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:49 -04:00
Mike Lockwood
e0ded6710a New Serial Manager API:
SerialManager: provides access to serial ports
SerialPort: for reading and writing data to and from serial ports

IO with both array based and direct ByteBuffers is supported.

Accessing serial ports requires android.permission.SERIAL_PORT permission

Each platform must configure list of supported serial ports in the
config_serialPorts resource overlay
(this is needed to prevent apps from accidentally accessing the bluetooth
or other system UARTs).

In addition, the platform uevent.rc file must set the owner to the
/dev/tty* files to "system" so the framework can access the port.

Change-Id: I8d75ca7d6592223ea6c47f8a17fa180dfed1aad0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:49 -04:00
John Grossman
6fd7789abc Make the LocalClock HAL wrapper use a singleton HAL instance.
Change the local clock helper wrapper to hold just a single copy of the local
time HAL instead of having each wrapper hold their own HAL instance.

Change-Id: I978bf70236095251941776be86abb6a27cc4bf5d
2011-10-28 10:14:48 -04:00
John Grossman
10bd439022 Reintroduce a line of code which disappeared during reformatting.
Reintroduce a line of code which went missing during a global reformat for style
reasons.

Change-Id: I9f8f8a88cd9e490197963a1287555afc2906ea62
2011-10-28 10:14:48 -04:00
John Grossman
8659bd107f Add a missing NULL check.
The get_next_write_timestamp method introduced to the audio HAL is optional.
HALs which do not implement it leave it set to NULL.  Callers (there is
currently only one in the AudioMixer code) need to be certain to check for NULL
before invoking it.

Change-Id: I88ba43bb53bec081c98c9a8842936c4fbfdd44f6
2011-10-28 10:14:48 -04:00
Mike J. Chen
7bce396226 Media framework changes for Tungsten.
Squashed merge from master-tungsten of the following changes:

commit 73d09e18c4557e583a1684d44d598a1a02fd0cf2
Author: John Grossman <johngro@google.com>
Date:   Mon Jun 20 13:57:44 2011 -0700

    Remove TungstenMisc and rename LinearTransform

    Change-Id: Ie8aa3e24e09fdbf6ef8996c26deb9c5640e20d1b

commit 3114aabe76ad733b59929d87e49c68229f5ae2e8
Author: John Grossman <johngro@google.com>
Date:   Fri Jun 3 10:47:16 2011 -0700

    Name changes and spelling fixes.

    + Replace the term TungstenTime with the Eugene-approved term CommonTime.
    + Fix a spelling error in a comment I noticed.

    Change-Id: I8c10d618206826d16055f78c7724e24443bb03fd

commit cbf2903ab6893b6e662514e2f6d670e268a419df
Author: John Grossman <johngro@google.com>
Date:   Fri Apr 15 09:27:54 2011 -0700

    Migrate Tungsten code from the HC-Tungsten to the Master-Tungsten branch.

    Change-Id: I95372d913a0761d90168edb4016f5ece0ea74502

commit bc7c46aa629f9883e959ef23de8da297f9eb508b
Author: Jason Simmons <jsimmons@google.com>
Date:   Mon Jun 20 13:59:17 2011 -0700

    Create a separate class for timed AudioTracks

commit 43be3231034ff8537fdd84422a7954780038671f
Author: John Grossman <johngro@google.com>
Date:   Mon Jun 27 18:59:12 2011 -0700

    Move libaah_rtp over from the vendor directory.

    Also move factor PipeEvent out into utils.

    Change-Id: Id3877c66efe22d771cf3ef4877107e431b828e37

commit 17526eb3148c9c3d4365b6d5b47e8dc13bca71b6
Author: John Grossman <johngro@google.com>
Date:   Mon Jun 27 17:06:49 2011 -0700

    Name changes for the TRTP Players s/tungsten/aah/g

    Change-Id: I55e9ad13003f6aa6a36955b54426a7efbe31ac51

commit 423fc1bfc0fda799c421a650c83c4b9293b1a08c
Author: Jason Simmons <jsimmons@google.com>
Date:   Mon Jun 20 17:56:09 2011 -0700

    More timed AudioFlinger changes requested by code review:
    * change trimTimedBufferQueue to trimTimedBufferQueue_l
    * create one timed audio buffer heap per client process instead of one per track
    * grow the silence buffer on demand
    * some error handling fixes in timed getNextBuffer
    * calculate the next output PTS in all mixer and track hooks

    Change-Id: Ifc51a08b55029b7c48902ab2f22933ad7bafe1ad

commit a148e2674b1d3cb73289b82b85c333f0a66824a9
Author: John Grossman <johngro@google.com>
Date:   Mon Jun 20 17:02:24 2011 -0700

    Move the A@H time service into frameworks/base

    Change-Id: I5c570cde70e8931e205516cb33517585804ce841

commit dfa438fa49bdaeeb2ec5fd0d17b30d881608b6b1
Author: John Grossman <johngro@google.com>
Date:   Mon Jun 20 11:55:36 2011 -0700

    Fix the build after Mike's code moving.

    Change-Id: Ia883643ded252168bcc5a70584ab6ce97bb05266

commit 04489474ec8e73efe1bf52918831f41659033162
Author: John Grossman <johngro@google.com>
Date:   Fri Jun 17 14:19:50 2011 -0700

    Refactor the local/common clock services.

    This change is one of a set of 5 changes made to different repositories.  Look
    for this comment in all of them.

    Refactor the local/common clock services in tungsten to match android best
    practice.  Notable changes include

    + The kernel no longer knows anything about common time.  Common time has been
      moved completely up into user land.  This has an impact on the accuracy of the
      timesync debugging code, and the netfilter assisted approach to network based
      timesync is going to have to be modified.
    + The timesync driver used by A@H is now just local time driver.
    + The kernel no longer needs access to the linear transform math code, and it
      has been removed.
    + A new HAL has been introduced to expose the concept of local time to the
      system.
    + A non-slewable stub implementation of the local time HAL based on
      CLOCK_MONOTONIC has been added.
    + The TungstenTime library has been eliminated.  Its functionality has been
      distributed among the common time binder service, the local time hal and the
      linear transform utility code.
    + All clients of the old TungstenTime library have been changed to be clients of
      the binder service, the hal and the utility code.
    + The reset_tt utilities have been removed, they no longer have a purpose in the
      system.
    + more progress has been made in eliminating the word "tungsten" from the code.

    Things left to do include
    + Finish getting rid of tungsten from the time service.
    + Move the time service into the framework; AudioFlinger's new timed mode
      depends on it and the service cannot continue to live in vendor tungsten.

    Change-Id: I999b6cfb4a9d267818a86d747c35eecfc6693101

commit d48194545eed1116a84d81e2fb53315d2b0701a7
Author: Jason Simmons <jsimmons@google.com>
Date:   Thu Jun 16 14:22:46 2011 -0700

    Change the interface of the AudioMixer and AudioBufferProvider to accept a presentation timestamp

    Change-Id: Ice2df5628d45a7f77100e7008103b35b3d3160a4

commit 02561419db82b01ffb28df38000716c612988427
Author: John Grossman <johngro@google.com>
Date:   Tue May 10 14:00:21 2011 -0700

    Put in a hack for controling master volume in the policy manager.
    Fix initial master volume reporting.

    Change-Id: Ia6caf2bbc6083c5f99fab852baa40fff10fc5fc7

commit 549cdc3ba115dc654cdade261fb055c72c6cdb79
Author: John Grossman <johngro@google.com>
Date:   Wed May 4 11:46:17 2011 -0700

    Make certain the logic for computing the output stream mixing point is hardened
    against underflow and overflow when input and output sample rates don't match.

    Change-Id: I5ebea07c9938107b435bec7413418622767e4e16

commit 8043d8ed63f51e76d452d22be7d453d4a7794530
Author: Jason Simmons <jsimmons@google.com>
Date:   Wed Apr 27 18:06:27 2011 -0700

    Add the patch for timed audio support to the mono resampler

    Change-Id: I526f34ae9d1e8e3b0ed2fb05af3d024d5c5fe711

commit 2be89486ef23f0b0b0cc2dc25a4c0ee691043f00
Author: John Grossman <johngro@google.com>
Date:   Wed Apr 27 10:38:57 2011 -0700

    Extend the AudioHWInterface to allow it to specify the initial master volume used by AudioFlinger.

    Change-Id: I8823330801c927494cf7ca31a6b8f9264fbfbb26

commit ff89a4d5e37e6a05a2b03f79ab4e97833dd66393
Author: John Grossman <johngro@google.com>
Date:   Wed Apr 27 09:07:14 2011 -0700

    Fix an issue with inconsistent volume reporting.

    Changed masterVolume() to return the same value as the last call
    to setMasterVolume when the HW layer is implementing master
    volume control.  The masterVolume/setMasterVolume API seems to be
    an idea which was abandonded a long time ago; as of today the
    system only ever sets it to 1.0 at startup and then never changes
    it.  Until we can figure out how the concept of external
    amplifier gain control fits into the Android audio framework,
    Tungsten is exposing this API via a hack-tastic invoke back door
    in the TungstenRXPlayer and needs the getter/setter results to be
    consistent.

    Change-Id: I2ac730fa8fc9ee28c88f1a8e6f2e493eb5b65544

commit 086511b2d19cceb976747ac23e12b73fc7c28bea
Author: Jason Simmons <jsimmons@google.com>
Date:   Mon Apr 25 16:07:19 2011 -0700

    Add handling of timed audio tracks in the generic resampling mixer

    Change-Id: Ic3be1d21b1117f1b233808be543c28a0dcec4792

Change-Id: I6ec5d2bca9b8ebc0acd395a7dd92e1a48fcdfa9b
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>
Signed-off-by: Jason Simmons <jsimmons@google.com>
2011-10-28 10:14:48 -04:00
Mike J. Chen
d8dbdf7ead Add service/aah_timesrv
This is a common time service used by Tungsten for synchronizing
distributed playback.

This is a squashed merge from master-tungsten of the following changes:

commit 43be3231034ff8537fdd84422a7954780038671f
Author: John Grossman <johngro@google.com>
Date:   Mon Jun 27 18:59:12 2011 -0700

    Move libaah_rtp over from the vendor directory.

    Also move factor PipeEvent out into utils.

    Change-Id: Id3877c66efe22d771cf3ef4877107e431b828e37

commit a148e2674b1d3cb73289b82b85c333f0a66824a9
Author: John Grossman <johngro@google.com>
Date:   Mon Jun 20 17:02:24 2011 -0700

    Move the A@H time service into frameworks/base

    Change-Id: I5c570cde70e8931e205516cb33517585804ce841

commit 86c94c7d6780fcfa4e1146325706fb78bc30544c
Author: Jason Simmons <jsimmons@google.com>
Date:   Mon Jun 20 15:44:31 2011 -0700

    Update the service manager UID table to match the new name of the common clock service

    Change-Id: I5a65e84e8dff743c69d182e9851e58fc68791564

commit 6ab14c34be8c1b10b1258bdebbba1e52743ff5b9
Author: Jason Simmons <jsimmons@google.com>
Date:   Fri Jun 3 18:19:40 2011 -0700

    Add tungsten_timesrv to init.rc

    Change-Id: I851aa990612440e1df1af992ed6e4d64b54a4951

Change-Id: Id832a0a00d447aa562bb7476902799bfa5bbda8d
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>
2011-10-28 10:14:48 -04:00
Mike J. Chen
a94f7642a8 Add lib/aah_timesrv
aah_timesrv is a library that provides access to the local clock
and the common time service.

This is a squashed merge from master-tungsten of the following changes:

commit a59f6fce4ad7bb664270b70484958210780a9bdd
Author: John Grossman <johngro@google.com>
Date:   Fri Aug 12 11:49:03 2011 -0700

    Adapt to a change in the local time HAL.

    Changed the definition of the slew function in the local time HAL to take an
    int16 instead of an int32 and to use the full range of the int instead of
    attempting to imply any particular PPM range.

    Change-Id: Ie8825a4f7ae36aeeb2b23a1613f84b1672f37a26

commit f7e0cdac72592be1e24f08803e922f7be696d14b
Author: John Grossman <johngro@google.com>
Date:   Mon Jun 27 17:29:21 2011 -0700

    Remove "primary" from the local_time HAL.

    Interface instances are a pattern which should only be used by audio.  Remove
    its use from the local_time HAL.

    Change-Id: Ib96faaacc7f5b9f10f4bfd67e491316e99dc3c96

commit a148e2674b1d3cb73289b82b85c333f0a66824a9
Author: John Grossman <johngro@google.com>
Date:   Mon Jun 20 17:02:24 2011 -0700

    Move the A@H time service into frameworks/base

    Change-Id: I5c570cde70e8931e205516cb33517585804ce841

Change-Id: I0a840e5803f015659d3d21d5be287f98712c75eb
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>
2011-10-28 10:14:48 -04:00
Mike J. Chen
24570d1fa3 Add the ability to pass float extras to AM.
Merged from master-tungsten:

commit 43a2825a283e29c0f70100146394957af0598b0e
Author: John Grossman <johngro@google.com>
Date:   Wed Apr 27 09:03:53 2011 -0700

    Add the ability to pass float extras to AM.

    Change-Id: I970ad3f76a65bd781099204019095c73ed8c09db

Change-Id: I824de23e244d0fc23112e0af4548524ae2c313e5
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>
2011-10-28 10:14:48 -04:00
Dan Morrill
2587492062 Adding a feature to indicate specific support for Bluetooth API.
Change-Id: Ib8ce4c6917362a9a1ab120c532203d60f2743e88
2011-10-28 10:14:48 -04:00
Mike Lockwood
7a7670a520 SystemServer: Add support for disabling AudioService and MountService
Using the same convention in system_init.cpp, you can disable these
services by setting system properties:

	system_init.startaudioservice=0
	system_init.startmountservice=0

Change-Id: If5acd19600d6f6165262c6ae0966d4028977d7a1
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:47 -04:00
Mike Lockwood
4e95fa388b BatteryService: Don't fail to register native methods if kernel power supply driver is missing
Change-Id: Idfe3bd3d57c4f45a13bd70b687b7aa12adfeaa69
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:47 -04:00
Mike Lockwood
a0a8b249bc Add headless mode for running the framework without the surface flinger
Enabled by setting system property ro.config.headless to 1
This will allow the framework to run without starting activities,
system UI and the keyguard.
Framework can still run services, content providers and broadcast receivers.

Change-Id: I96606609a4ede57a2c4c7fb2b6ff060ebf31e3b4
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:47 -04:00
Bill Gruber
a903932948 am 6c60e9a3: docs cherrypick from hc-mr2: Change-Id: Id8dd0a0baa2fcc88bcfc8171e2be5882d0f06479 Doc update: publishing topics Also fixes bug 5279672
* commit '6c60e9a3ba3555590d7e7bdaf3634c9daaf8b33b':
  docs cherrypick from hc-mr2: Change-Id: Id8dd0a0baa2fcc88bcfc8171e2be5882d0f06479 Doc update: publishing topics Also fixes bug 5279672
2011-10-27 17:45:36 +00:00
Bill Gruber
6c60e9a3ba docs cherrypick from hc-mr2: Change-Id: Id8dd0a0baa2fcc88bcfc8171e2be5882d0f06479
Doc update: publishing topics
Also fixes bug 5279672

Change-Id: Ifb06f7f56ee372a9680a63bdb659f495698fe794
2011-10-27 10:40:13 -07:00
Scott Main
3c81fc9e50 am 56539858: Merge "docs: add guide for optimizing tablet apps for handsets deprecate "optimizing for 3.0" doc" into ics-mr0
* commit '5653985830f35184ea772b2ccc8333d6ef634761':
  docs: add guide for optimizing tablet apps for handsets deprecate "optimizing for 3.0" doc
2011-10-27 17:04:52 +00:00
Scott Main
5653985830 Merge "docs: add guide for optimizing tablet apps for handsets deprecate "optimizing for 3.0" doc" into ics-mr0 2011-10-27 10:03:10 -07:00
Eric Fischer
80d67c66ce Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-10-27 09:43:23 -07:00
Andreas Huber
1388aced2a Merge "Fix a reference to a stale pointer in AwesomePlayer." into ics-mr1 2011-10-27 09:07:23 -07:00
Scott Main
12f9900bfb am 737c3dd9: Merge "docs: add package description for wifi.p2p and update the one for wifi" into ics-mr0
* commit '737c3dd9f116ae68bcb9b5ce6855afaf2f59738b':
  docs: add package description for wifi.p2p and update the one for wifi
2011-10-27 15:51:21 +00:00
Scott Main
737c3dd9f1 Merge "docs: add package description for wifi.p2p and update the one for wifi" into ics-mr0 2011-10-27 08:49:48 -07:00
Mike Lockwood
d085df318a am aac4184a: Merge "Revert "PowerManagerService: Enable light sensor debug output"" into ics-mr0
* commit 'aac4184a5a0ab969140a11e1ef258fcb4cba07a9':
  Revert "PowerManagerService: Enable light sensor debug output"
2011-10-27 13:51:04 +00:00
Mike Lockwood
aac4184a5a Merge "Revert "PowerManagerService: Enable light sensor debug output"" into ics-mr0 2011-10-27 06:49:12 -07:00
Jason Sams
27812a8f14 am 28e4f87f: Fix bug where CPU could be stuck spinning Required the wallpaper be animating and the system to have run slowly during the last frame when rendering stopped.
* commit '28e4f87f38cae799b494e160467d732e988bad89':
  Fix bug where CPU could be stuck spinning Required the wallpaper be animating and the system to have run slowly during the last frame when rendering stopped.
2011-10-27 01:25:38 +00:00
Jason Sams
28e4f87f38 Fix bug where CPU could be stuck spinning
Required the wallpaper be animating and
the system to have run slowly during the
last frame when rendering stopped.

bug 5180240

Change-Id: I38c2b6f07a1e36019dd05c77a58973e36d12728c
2011-10-26 17:56:00 -07:00
Eric Fischer
440cfec872 Import revised translations. DO NOT MERGE
Change-Id: I2a75aaed297a6abd14a40d03c01c1ce0ea4abf1e
2011-10-26 17:38:16 -07:00
Jim Miller
11bfc0c431 Merge "Fix 5369428: Use full battery state information when determining charge status" into ics-mr1 2011-10-26 17:05:13 -07:00
Jaikumar Ganesh
c307d1aea2 am 01d24784: Merge "Fix auto connection of headset profile." into ics-mr0
* commit '01d24784a5ddece8bb7c5d088bf93c99faa0dc7e':
  Fix auto connection of headset profile.
2011-10-26 23:20:48 +00:00
Jaikumar Ganesh
01d24784a5 Merge "Fix auto connection of headset profile." into ics-mr0 2011-10-26 16:19:13 -07:00
Justin Ho
1825e51b2d am d24b020e: Merge "Brighter sysbar assets Bug: 5509557" into ics-mr0
* commit 'd24b020e5e6911591f3535815ef9f86b0d57f65c':
  Brighter sysbar assets Bug: 5509557
2011-10-26 23:18:32 +00:00
Justin Ho
d24b020e5e Merge "Brighter sysbar assets Bug: 5509557" into ics-mr0 2011-10-26 16:16:52 -07:00
Justin Ho
9d7ae974b3 Brighter sysbar assets
Bug: 5509557

Change-Id: I487bbb62ed7a9f39aab4dca0260e5f06de729d43
2011-10-26 16:06:20 -07:00
Jaikumar Ganesh
6ae5912175 Fix auto connection of headset profile.
Sometimes when headset service doesn't get bound, the auto
connection fails.

Based on a patch by: Chunho Park <chun.ho.park@samsung.com>

Change-Id: Ia24613b47487717f51895953c7e8bc52abffecb5
2011-10-26 16:00:28 -07:00
Jim Miller
2333a02e15 Merge "Convert the outer lockscreen ring to a shape drawable. DO NOT MERGE" into ics-mr1 2011-10-26 15:40:08 -07:00
Jeff Sharkey
fd61e702e3 Merge "Only populate stack when StrictMode will use it." into ics-mr1 2011-10-26 15:37:34 -07:00
Justin Ho
b8c76afe7a am ed124603: Merge "Updated Roboto HHEA table Bug: 5516773" into ics-mr0
* commit 'ed12460301cf0e04ac61993aaf1142f75f504814':
  Updated Roboto HHEA table Bug: 5516773
2011-10-26 22:24:36 +00:00
Justin Ho
ed12460301 Merge "Updated Roboto HHEA table Bug: 5516773" into ics-mr0 2011-10-26 15:22:57 -07:00
Scott Main
5e44f68a66 docs: add guide for optimizing tablet apps for handsets
deprecate "optimizing for 3.0" doc

Change-Id: I290ff5cd22c714e639fb820251c9e1d763f750df
2011-10-26 15:21:40 -07:00
Robert Ly
4d48303fd8 am 37f4310d: fix build
* commit '37f4310d4af51fe6e2e35d27b9375a31fc98c803':
  fix build
2011-10-26 22:15:20 +00:00
Justin Ho
44e10f0add am 7901a2c3: Merge "Adding alternate sound set and corresponding mk file Bug: 5502770" into ics-mr0
* commit '7901a2c3a1bfefdefd957d3d9b28dee1ca88787d':
  Adding alternate sound set and corresponding mk file Bug: 5502770
2011-10-26 22:15:19 +00:00
Justin Ho
9894c862db Adding alternate sound set and corresponding mk file
Bug: 5502770

Change-Id: I245e6775417df9dfe493f9501542f2cc6aaeb0b4
2011-10-26 22:12:25 +00:00
Robert Ly
37f4310d4a fix build
Change-Id: Ia82910e34da2613473ad2875330fbfdd48822eca
2011-10-26 15:11:30 -07:00
Justin Ho
d4297c3de7 Updated Roboto HHEA table
Bug: 5516773

Change-Id: Ia8da7be2be4345260dadb66b1abec1bd7cd66409
2011-10-26 15:01:25 -07:00
Svetoslav Ganov
8c80707639 Merge "NumberPicker does not not fit on Crespo in landscape." into ics-mr1 2011-10-26 14:49:29 -07:00
Svetoslav Ganov
b0267e2870 Merge "AccessibilityNodeInfo makes incorrect check before calling into the system." into ics-mr1 2011-10-26 14:47:49 -07:00
Justin Ho
7901a2c3a1 Merge "Adding alternate sound set and corresponding mk file Bug: 5502770" into ics-mr0 2011-10-26 14:46:15 -07:00
Jim Miller
16464b8e55 Fix 5369428: Use full battery state information when determining charge status
This is a fix for a bug where we'd show "connect charger" when the device was
connected but not charging due to the battery being in an unchargeable state
(too hot, cold, etc).

It now maintains a full copy of the battery state and uses the plugged status
to determine if the device is plugged in.

Change-Id: I60fa4e4566a45663b130f0ff4863bcc595ae3c4a
2011-10-26 14:42:19 -07:00