182774 Commits

Author SHA1 Message Date
Mike Lockwood
b673770f71 Add MIDI Manager API tweaks:
- Change the package name from android.midi to android.media.midi

- Add option for specifying a Handler for DeviceCallback notifications

Change-Id: Ia9e9817a651c06299f4e02ee1da3c9666ff64cb9
2015-02-23 14:32:23 -08:00
Mike Lockwood
c3c2ff70a2 Add support for USB notification when connected as a MIDI peripheral
Change-Id: Ib3efcda6af976c878e63b0d35a8e47a3ea9435a3
2015-02-20 15:10:20 -08:00
Yohei Yukawa
e55524ef04 Merge "Add tests for Ibb9eb9f65323795d139 and I6571d464a46453934f0" 2015-02-20 15:28:35 +00:00
Adrian Roos
1156da8c0d am 309b71e5: am 823bf307: am b5e787c1: am 26b0d973: Merge "Fix change IME content description" into lmp-mr1-dev
* commit '309b71e53086c9bd3b7610799836d66d64aed654':
  Fix change IME content description
2015-02-20 14:53:48 +00:00
Adrian Roos
309b71e530 am 823bf307: am b5e787c1: am 26b0d973: Merge "Fix change IME content description" into lmp-mr1-dev
* commit '823bf307a248f332f708fd8b359008df837722eb':
  Fix change IME content description
2015-02-20 14:46:45 +00:00
Yohei Yukawa
e72d1c8274 Add tests for Ibb9eb9f65323795d139 and I6571d464a46453934f0
This CL adds several unit tests for following CLs, both of which enabled
InputMethodUtils (and dependent IMF logic) to handle 3 letter language codes
and conversion from deprecated two-letter codes to new ones correctly.
- Ibb9eb9f65323795d139b16d76b7e7e36a4e0568c
- I6571d464a46453934f0a8f5e79018a67a9a3c845

As described in tests, the input method framework has already been able to
recognize 3 letter language codes.  However, there remain inconsistencies
when we use deprecated 2-letter code to query subtype like "in" but the
subtype has new language codes like "id".  Subsequent CLs are supposed to
address remaining issues.

bug: 10090157
Change-Id: I7d932e60311b80c05be8f02c9e803f18da0e0054
2015-02-20 23:41:36 +09:00
Adrian Roos
823bf307a2 am b5e787c1: am 26b0d973: Merge "Fix change IME content description" into lmp-mr1-dev
* commit 'b5e787c1c5a1845e0b8de53f1452a7a6cdeb4c93':
  Fix change IME content description
2015-02-20 14:39:30 +00:00
Adrian Roos
b5e787c1c5 am 26b0d973: Merge "Fix change IME content description" into lmp-mr1-dev
* commit '26b0d973d8c2b05e6141fb4808fbb0a28cb7f713':
  Fix change IME content description
2015-02-20 14:32:44 +00:00
Adrian Roos
26b0d973d8 Merge "Fix change IME content description" into lmp-mr1-dev 2015-02-20 14:28:38 +00:00
Tom Hudson
806a6f07a3 Fix onDrawText for non-absolute positioning
If we were drawing text with drawTextAbsolutePos() false, we would
draw the first character at 0,0 but subsequent characters would get
improperly offset by y. (or x if vertical text)

Change-Id: I4e76cd9d95bf1bb6ac021d99ef7cdd6333a290ba
2015-02-20 13:08:47 +00:00
Nicolas Prevot
f580c91618 Merge "Dump the profile/device owner when dumping device policy state." 2015-02-20 10:33:18 +00:00
Clara Bayarri
7415d6667e Merge "Floating Toolbars: Wrap the ActionMode creation in DecorView" 2015-02-20 10:26:15 +00:00
Santos Cordon
c86703f575 Merge "Add PHONE_ACCOUNT_ADDRESS to the call log DB." 2015-02-20 08:45:49 +00:00
Santos Cordon
d4ceaf6167 Add PHONE_ACCOUNT_ADDRESS to the call log DB.
Also update some javadoc comments.

Change-Id: If0f8fa0148b3aed74ed434b1017a279ce29b3842
2015-02-19 23:43:12 -08:00
Santos Cordon
e37e615258 Merge "Small update to PhoneAccountHandle ID javadoc." 2015-02-20 07:26:52 +00:00
Santos Cordon
8b338d47e0 Small update to PhoneAccountHandle ID javadoc.
Change-Id: I31832347689e1e9291cd6b9c100918668fa4b056
2015-02-19 22:45:30 -08:00
Santos Cordon
6a9a89acd0 Merge "Add Sub-ID-from-phone-account converter method." 2015-02-20 05:20:38 +00:00
Dianne Hackborn
5f83382c40 Merge "Add some detailed data as part of battery history." 2015-02-20 01:41:29 +00:00
Dianne Hackborn
d1eccbea38 Add some detailed data as part of battery history.
Every time the battery level changes, a new extended
detailed use data structure is written to the history.
This currently only contains delta CPU use since the
last detailed entry (total CPU and to three uids), but
it gives us the infrastructure for adding more detailed
data in the future.

A detail entry for regular history looks like:

     Details: cpu=15730u+2307s (u0a57=11312u+502s, 1000=2344u+701s, 0=473u+991s)
              /proc/stat=15377 usr, 1797 sys, 197 io, 0 irq, 8 sirq, 23103 idle (42.9% of 6m 44s 820ms)

u is user-space cpu time, s is system/kernel time.

The equivalent check-in output is:

9,h,0,Dcpu=15730:2307/10057:11312:502/1000:2344:701/0:473:991
9,h,0,Dpst=15377,1797,197,0,8,23103

Also add a new "unplug" command to the battery service,
to easily put it into a state where it always considers
the device to be running on battery.

Change-Id: Ic76d966f11e592b9dd671879977bf999ebc11eef
2015-02-19 17:37:12 -08:00
Craig Mautner
4f9796e028 Merge changes Ib2def344,Ifd15736b
* changes:
  Permit layout when stopped if reporting draw
  Refactor computeScreenConfigurationLocked and more.
2015-02-20 01:35:17 +00:00
Wale Ogunwale
df33727718 Merge "Fixed issue with focused stack frame not displaying in multi-window." 2015-02-20 01:06:14 +00:00
Eino-Ville Talvala
7ecd2601c0 Merge "ImageReader: Switch to RAW16 from RAW_SENSOR" 2015-02-20 01:03:42 +00:00
Eino-Ville Talvala
64cc1d0359 ImageReader: Switch to RAW16 from RAW_SENSOR
Change-Id: I6362a997b0895686f988896de0463d834354f238
2015-02-19 17:02:48 -08:00
Craig Mautner
72d6f21943 Permit layout when stopped if reporting draw
When a device was woken up in a different orientation than what it
went to sleep in, the window manager would force a resize to get it to
predraw in the new orientation. The predraw was done in the old
orientation however because layouts are skipped when the activity was
stopped.

This change allows layouts to proceed when the activity is stopped if
the flag to report resize events is true.

Fixes bug 18444400.

Change-Id: Ib2def3449dd67918f6fb838bdb1fe5cc6ec57f8e
2015-02-19 16:51:26 -08:00
Craig Mautner
b605f4af14 Refactor computeScreenConfigurationLocked and more.
- Recognizing that computeScreenConfigurationLocked() only returned
false if mDisplayReady was false allows multiple code
simplifications.
- Make computeNewConfigurationLocked() always return a non-null
value.
- Remove unused Session parameter from removeWindowInnerLocked().
- Just allocate mForceRemoves one time.
- Since ADJUST_WALLPAPER_VISIBILITY_CHANGED was unused have
adjustWallpaperWindowsLocked() return a boolean.
- Remove unused long parameter from handleNotObscuredLocked().

Change-Id: Ifd15736b163ab6e989f8ca32cf8f94b316386216
2015-02-19 16:51:12 -08:00
Amith Yamasani
081eba6e66 Merge "Backup/restore owner info from locksettings" 2015-02-20 00:48:27 +00:00
Bill Yi
2bc7a2fa89 am 8c087c04: am 4fecab57: Merge commit \'32acf753e8989766f67fd5300d3eb467f707cc79\' into HEAD
* commit '8c087c04471fb4b871272d572a56555e9058e42f':
2015-02-20 00:37:05 +00:00
Bill Yi
8c087c0447 am 4fecab57: Merge commit \'32acf753e8989766f67fd5300d3eb467f707cc79\' into HEAD
* commit '4fecab570da64a1956352aedf1b3245d3ba26030':
2015-02-20 00:23:09 +00:00
Scott Kennedy
d390401373 Merge "Mark Service#onBind() @Nullable" 2015-02-19 23:54:03 +00:00
Paul McLean
d52ff5e037 Merge "Changing AudioManager.listAudioDevicePorts to take a ArrayList<AudioDevicePort> argument." 2015-02-19 23:45:03 +00:00
Paul McLean
ceb47aae5a Changing AudioManager.listAudioDevicePorts to take a ArrayList<AudioDevicePort> argument.
Change-Id: Ide9a2f58a7544e263600e100ba4274403201c5fa
2015-02-19 15:33:34 -08:00
Scott Kennedy
7db73ed198 Mark Service#onBind() @Nullable
Change-Id: I6e600dd018e1cb2b51b666ec5acf56b2885c0083
2015-02-19 15:31:11 -08:00
Santos Cordon
ed4ca5ca2c Add Sub-ID-from-phone-account converter method.
There are several places in the code that currently attempt to parse the
sub ID directly from the phone account which is undesireable.  Before we
can change from using the subID to using an ICC ID with the phone
accounts, we need to create a conversion method so that no other
components are parsing the sub ID out of the phone account directly.

Change-Id: I74547fe0807da2fe13f3ff4422cd1d0a7a20d04c
2015-02-19 15:19:16 -08:00
Scott Kennedy
004a46eb17 Merge "Annotate the parameter in TextUtils#isEmpty() as @Nullable" 2015-02-19 23:19:07 +00:00
Paul McLean
83b40599bb Merge "Audio Device Enumeration API." 2015-02-19 23:09:07 +00:00
Paul McLean
0e4242f9cb Audio Device Enumeration API.
Change-Id: Ic78fda8b2a6f6ac0f37a1f665b29f3359cfc5ecc
2015-02-19 15:03:53 -08:00
Fyodor Kupolov
fcc87275e3 Merge "Code cleanup" 2015-02-19 22:53:26 +00:00
Fyodor Kupolov
22029f0a50 Code cleanup
Use preconditions for argument checking.

Change-Id: I2e9dcd8da1e0bdac917393376d1a7442ab63a638
2015-02-19 14:50:44 -08:00
Clara Bayarri
ed2a54cfd3 Floating Toolbars: Wrap the ActionMode creation in DecorView
This change will allow us to create ActionMode representations on the
fly after onCreateActionMode by using the Decorator pattern. The new
ActionModeWrapper will be responsible for the creating the
appropriate ActionMode depending on the type chosen by the client,
and setting it up.

Things pending that are NOT addressed by this CL:
- ActionModes created by callback.onWindowStartingActionMode(). This
includes all current usages in an existing ActionBar, as it is
handled by Activity. This requires some additional refactoring.
- Representing the floating type
- Moving the view creation code specific to StandaloneActionMode
from DecorView to ActionModeWrapper, decoupling DecorView from
StandaloneActionMode completely
- Supporting two ActionModes in parallel in DecorView, one of each type

Change-Id: I1a8db711f53b771eac74f0e6496106acf1ca2727
2015-02-19 22:40:31 +00:00
Bill Yi
4fecab570d Merge commit '32acf753e8989766f67fd5300d3eb467f707cc79' into HEAD 2015-02-19 14:31:36 -08:00
kmccormick
96fb6d811f am f077f476: am c808f6a6: am a8dbdb1c: am bb1c03e9: am a4fce24d: am e16f4393: am 506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.
* commit 'f077f476898e16623df4cb39d4cf0739c5e3efd2':
  Doc Update: fixed unescaped angle brackets in code snippets.
2015-02-19 22:30:51 +00:00
kmccormick
f077f47689 am c808f6a6: am a8dbdb1c: am bb1c03e9: am a4fce24d: am e16f4393: am 506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.
* commit 'c808f6a6a24a979b1301692352a5649767328f2a':
  Doc Update: fixed unescaped angle brackets in code snippets.
2015-02-19 22:24:01 +00:00
kmccormick
c808f6a6a2 am a8dbdb1c: am bb1c03e9: am a4fce24d: am e16f4393: am 506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.
* commit 'a8dbdb1c5a019ac6fbcd8c20d7837d80fc9e41b7':
  Doc Update: fixed unescaped angle brackets in code snippets.
2015-02-19 22:16:52 +00:00
kmccormick
a8dbdb1c5a am bb1c03e9: am a4fce24d: am e16f4393: am 506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.
* commit 'bb1c03e9500e2a13044925c78a11d3c48a3a47ef':
  Doc Update: fixed unescaped angle brackets in code snippets.
2015-02-19 22:11:29 +00:00
kmccormick
bb1c03e950 am a4fce24d: am e16f4393: am 506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.
* commit 'a4fce24d6652e3869f70ca9f549ef45661608114':
  Doc Update: fixed unescaped angle brackets in code snippets.
2015-02-19 22:04:51 +00:00
kmccormick
a4fce24d66 am e16f4393: am 506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.
* commit 'e16f439310b784bf46d033634e4a9e59a6a35c98':
  Doc Update: fixed unescaped angle brackets in code snippets.
2015-02-19 21:58:53 +00:00
kmccormick
e16f439310 am 506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.
* commit '506cba8b51474e5dc5cdcf381d0a25dc118c2aca':
  Doc Update: fixed unescaped angle brackets in code snippets.
2015-02-19 21:51:30 +00:00
Andrew Lee
7870433c65 Merge "Add intent for configuring RespondViaSms." 2015-02-19 21:27:08 +00:00
Rich Slogar
56725501fe am 925be07b: am 87ea3f79: am cdd5ebec: am 7319ea27: am cc883a1f: am 1e0face2: am b87aa6cb: Merge "docs: mipmap link updates" into lmp-docs
* commit '925be07b26d10a902507931a4371335cb6cf44a9':
  docs: mipmap link updates
2015-02-19 20:53:56 +00:00
Rich Slogar
c315f08a3d am d4eadffd: am 6a9e48ac: am 3a0483e2: am 73cd35f2: am f213a8c9: am 14bb9188: am f4f059d4: docs: studio 1.1 downloads
* commit 'd4eadffd991e2e25cc666e8cc570b7f20eb3e120':
  docs: studio 1.1 downloads
2015-02-19 20:27:39 +00:00