Commit Graph

41524 Commits

Author SHA1 Message Date
dcashman
a210e7b46d am 74023057: Merge "Initial KeySet API."
* commit '740230577a37984ee39a2b7baeb87c743af1f1bf':
  Initial KeySet API.
2014-07-14 19:17:01 +00:00
Alan Viverette
a3c16df3dd am 8ce5c32a: Fix switch text position when thumb is null
* commit '8ce5c32a37db3c6c5182047053ee0651fc93eff2':
  Fix switch text position when thumb is null
2014-07-14 19:16:53 +00:00
Tadashi G. Takaoka
80ba85db92 am 41020598: Make InputMethodUtils.getLanguageFromLocaleString public
* commit '41020598ff45370c8441163d879842e3c6550238':
  Make InputMethodUtils.getLanguageFromLocaleString public
2014-07-14 19:16:49 +00:00
Yuncheol Heo
3c51ff4a23 am 31d92474: Add the system feature for HDMI-CEC.
* commit '31d92474638227b63b17a2d0984e83abc7dac45f':
  Add the system feature for HDMI-CEC.
2014-07-14 19:16:20 +00:00
Chris Craik
2aeee24eea am d15c3bd8: Merge "Disable setOutline() functionality, pending full removal"
* commit 'd15c3bd840b4a4f7a7a76372d5752d86a5fd3d63':
  Disable setOutline() functionality, pending full removal
2014-07-14 19:16:11 +00:00
Sreeram Ramachandran
209cb2db8e am 1f66a4e6: Remove unnecessary code and APIs.
* commit '1f66a4e632df31f6e7b718c48dbc8b1d806b05c0':
  Remove unnecessary code and APIs.
2014-07-14 19:16:02 +00:00
Adam Powell
77d1bb4c4b am 2e4f8306: Merge "Correctly set the window callback for ToolbarActionBar"
* commit '2e4f830677e675d947e0324415bc725be636d860':
  Correctly set the window callback for ToolbarActionBar
2014-07-14 19:15:32 +00:00
Jeff Sharkey
fe7e12cc25 am f0a0dabe: Merge "Progress toward installer public API: callbacks."
* commit 'f0a0dabe8f38989b49e2f28173423093c5d596fb':
  Progress toward installer public API: callbacks.
2014-07-14 19:15:24 +00:00
Adam Powell
65de6e633c am d4ca69be: Add ViewGroup#getClipToPadding()
* commit 'd4ca69be9af4b8371f15bdbf2750cf731a98918e':
  Add ViewGroup#getClipToPadding()
2014-07-14 19:15:04 +00:00
Alan Viverette
41c0785655 am 85c9f08f: Remove old listener when rebinding SwitchPreference
* commit '85c9f08fae4a3173672b76137e3b6379208b4567':
  Remove old listener when rebinding SwitchPreference
2014-07-14 19:14:50 +00:00
destradaa
8a3ad12a61 am 5fc6961e: Add support in the platform for Activity Recognition Hardware.
* commit '5fc6961e3a23ffc044beeefb7a1b2976a81edea3':
  Add support in the platform for Activity Recognition Hardware.
2014-07-14 19:14:45 +00:00
Sreeram Ramachandran
6b3a3bc864 am 1953eca2: Merge "Delete unused APIs in NetworkManagementService."
* commit '1953eca28076134648183744dc96ee9464ad2199':
  Delete unused APIs in NetworkManagementService.
2014-07-14 19:14:23 +00:00
Fabrice Di Meglio
d195411294 am c3b52889: Fix TimePicker behavior
* commit 'c3b528898371119444c76929925c7f360914544c':
  Fix TimePicker behavior
2014-07-14 19:14:12 +00:00
Christopher Tate
145e74f4fb am f908b61a: am ef3b35b4: Merge "Logging in LocalTransport on as default"
* commit 'f908b61abf0882ce97d6d5076ee1c84393ed1ecd':
  Logging in LocalTransport on as default
2014-07-14 18:17:11 +00:00
Alan Viverette
dec17299fe Fix switch text position when thumb is null
Change-Id: I05a107423fabf5a538258cf0562e0916c8be18b6
2014-07-12 00:26:36 -07:00
Tadashi G. Takaoka
77cbcb6637 Make InputMethodUtils.getLanguageFromLocaleString public
Change-Id: I3e26eded21e59106a3b0edcf9ad05afbe9a30670
2014-07-12 16:08:20 +09:00
Yuncheol Heo
a0c4a06ba3 Add the system feature for HDMI-CEC.
Change-Id: I2a985cedf49d50649c89f2ac5fbb80a81300156d
2014-07-12 11:13:48 +09:00
Sreeram Ramachandran
06b6cdaed5 Remove unnecessary code and APIs.
This stuff has been replaced by setNetworkForUser() in NetdClient.

Change-Id: If525ee259b74314191d1913f7c2a3e828e05c38f
2014-07-11 18:16:04 -07:00
Adam Powell
1c35b08c93 Add ViewGroup#getClipToPadding()
It's kind of silly that we've gone this long without a good way to
query this since it makes writing custom views that properly handle
EdgeEffects, etc. a real pain.

Change-Id: I08e1cdf9ec7b8ec3c287c22a5aa19d07a166a4e0
2014-07-11 16:12:53 -07:00
Alan Viverette
4d065a04ce Remove old listener when rebinding SwitchPreference
Also fixes switch animation during scrolling, unnecessary call to
requestLayout() on drawable invalidate, and potential NPE.

BUG: 16225972
BUG: 4312303
Change-Id: I015d1f03206dd2c812592b0abfa4214a3de73d3f
2014-07-11 23:03:52 +00:00
destradaa
a4fa3b5aa5 Add support in the platform for Activity Recognition Hardware.
Change-Id: I7c4fff3526583475a5edf1f4ba8fede4e9419ead
2014-07-11 15:58:36 -07:00
Fabrice Di Meglio
dfaa6c7439 Fix TimePicker behavior
- use Alert Theme and make the TimePickerDialog show its done button
in the legacy mode
- if targetSdkVersion < L or if TV UI show the legacy TimePicker

Change-Id: I19ca6dbbcb50599c7e230262a23956c185f53a5c
2014-07-11 22:48:26 +00:00
Chris Craik
a5d98da691 Merge "Disable setOutline() functionality, pending full removal" 2014-07-11 21:38:19 +00:00
Chris Craik
7b7ca3cdf2 Disable setOutline() functionality, pending full removal
bug:15283203
Change-Id: Ibf127fecfcda835117c6087180c64f622b3041e4
2014-07-11 19:02:28 -07:00
Sreeram Ramachandran
c344f9b800 Merge "Delete unused APIs in NetworkManagementService." 2014-07-11 21:38:19 +00:00
Sreeram Ramachandran
31ab41726b Delete unused APIs in NetworkManagementService.
Change-Id: Idc6c0ac0d3a4149821fc7820b7f37d4209fc55d3
2014-07-11 15:47:51 -07:00
Craig Mautner
a228ae95ea Add task affiliation
Introduces new flag Intent.FLAG_ACTIVITY_LAUNCH_BEHIND which
causes the newly launched task to affiliate with the launching task.
(Later this flag will also launch the task behind the current task).
This shows up in a new member of the RecentTaskInfo class. This also
causes the recents list returned by getRecentsInfo to be rearranged
so that affiliated tasks are together.

Fixes bug 16157517.

Change-Id: Ia1386af50da2f01809278b62d249f05c6a0de951
2014-07-11 21:18:27 +00:00
Igor Murashkin
30f01591c8 Merge "camera2: (LEGACY) Update flash modes to fix #testFlashControl CTS" 2014-07-11 17:04:34 +00:00
Igor Murashkin
396532ffb8 camera2: (LEGACY) Update flash modes to fix #testFlashControl CTS
Change-Id: I9b66a2b4393f4bc2272ecc94cd9a5c6273f3de59
2014-07-11 14:08:42 -07:00
Igor Murashkin
49a1d7b7de camera2: (legacy) Fixes for CaptureRequestTest#testAeModeAndLock
Change-Id: I5c1008cf34a9d98f67c36966e7cbf1c312979f97
2014-07-11 12:59:50 -07:00
Igor Murashkin
3e280b4bb2 camera2: (Legacy) Implement ae compensation step ranges and ae/awb locks
Characteristics:
* control.aeCompensationRange
* control.aeCompensationStep

Request/Result:
* control.aeExposureCompensation
* control.aeLock
* control.awbLock

Change-Id: I911616c9cf3e0e9a03a0cb383bcf232cab8ca772
2014-07-11 12:59:50 -07:00
Igor Murashkin
7ee78d1ee3 camera2: (legacy) Implement AF/AE regions for request and result
* Also stop lying about max AE regions (now reports the truth)

Change-Id: I567a1e6c58ed0bfb77cc09787393ea18eba5d613
2014-07-11 12:59:49 -07:00
Christopher Tate
f908b61abf am ef3b35b4: Merge "Logging in LocalTransport on as default"
* commit 'ef3b35b48c31919a7d6977e41db7f9d37654dec3':
  Logging in LocalTransport on as default
2014-07-11 01:44:36 +00:00
Barnaby James
12b6bb44c1 Merge "Add VoiceInteraction request type for successful actions." 2014-07-10 21:09:47 +00:00
Barnaby James
d3fdb8bed8 Add VoiceInteraction request type for successful actions.
Add CompleteVoiceRequest to VoiceInteractor to allow apps to indicate when a voice interaction was successfully completed.

Change-Id: I1481cfe96e9e2495d88a7a4fb62263bdd1e03c54
2014-07-11 10:34:50 -07:00
Svetoslav
15cbc8a032 Addressing comments for the print preview feature.
Change-Id: Ib72140a912e22f859258d970e0d1c4ef06e807d5
2014-07-11 16:46:46 +00:00
Jeff Sharkey
bb58067035 Progress toward installer public API: callbacks.
Instead of surfacing all the existing cryptic error codes, we're
going to classify them into broad categories when surfacing through
public API.  This change introduces InstallResultCallback and
UninstallResultCallback, and wires them up to existing AIDL
interfaces.

Also start defining general SessionObserver for apps interested
in general progress details, such as Launcher apps.  Details about
active sessions are returned through new InstallSessionInfo objects.

Bug: 14975160
Change-Id: I068e2b0c30135f6340f59ae0fff93c321047f8f9
2014-07-11 16:54:49 -07:00
dcashman
d2794789c8 Merge "Initial KeySet API." 2014-07-10 20:49:26 +00:00
dcashman
405912bce0 Initial KeySet API.
Bug: 6967056
Change-Id: I47a01bd5dc25591cc70f58f38920ad0a021094ae
2014-07-12 12:09:40 -07:00
Adam Powell
2ecfcd9b23 Merge "Correctly set the window callback for ToolbarActionBar" 2014-07-10 20:49:26 +00:00
Adam Powell
b40484bb30 Correctly set the window callback for ToolbarActionBar
Bug 16134781

Change-Id: I88ec0c2b5dc23767ab0f198ab26601fd46b95628
2014-07-11 17:17:33 -07:00
Chet Haase
685206cb03 Merge "Optimize gatherTransparentRegions to account for transparent bg" 2014-07-10 20:49:26 +00:00
Chet Haase
2b45a16b8b Optimize gatherTransparentRegions to account for transparent bg
gatherTransparentRegions() incorrectly takes the background into account
even when that background drawable is a completely transparent ColorDrawable
(which you can get by calling View.setBackgroundColor(0)). Checking
the opacity of the drawable allows us to ignore drawables that are not
visible.

Issue #13465427 Performance suggestion: View.setBackgroundColor(0) should set background to null

Change-Id: Ic552bf6a07cc9229fd32febc3ada73a0701cad0c
2014-07-11 13:38:51 -07:00
Wei Wang
af74e66e29 Unhide Bluetooth batch APIs. Deprecate BluetoothAdpater scan APIs. (1/2)
Change-Id: Ib0c4ea6c8372a15473269660355fb5ccf4284457
2014-07-11 11:06:10 -07:00
Dianne Hackborn
3c58775a12 Merge "Allow INTERACT_ACROSS_USERS for service access." 2014-07-10 20:49:26 +00:00
Makoto Onuki
a2295e65dc Enterprise caller-id: framework/base/Telephony
It's basically equivalent to http://ag/500455 and http://ag/499160.

Now "Send to voicemail" and the missed call notification uses the enterprise
lookup; they now work with a corp contact too.

Bug 15779911

Change-Id: I8a87f45ba7299cfbc516eb44326e02258e38cf63
2014-07-11 17:34:55 +00:00
Dianne Hackborn
409297da18 Allow INTERACT_ACROSS_USERS for service access.
But only if the two users are in the same profile.  Also
apply the same rule for the recently allowed interaction
across content providers.

The activity manager now keeps track of which users are in
the same profile group, and the handleIncomingUser function has
an option to allow a non-full caller to do the interaction
if the two users are in the same profile group.

Spread this joy all over the place.

Also turn off multi-user on Svelte devices.

Change-Id: I231484ea2a6bfccbb3cd51357d7a387bd75039ea
2014-07-11 10:30:04 -07:00
Paul Jensen
5d59e785e1 Readjust location of NETID_UNSET definition.
This is a tweak to my 8ec11bb change I a-little-too-hastily committed.

Change-Id: Ibeee9382109994c66227d1c42aac749e2a274ed7
2014-07-11 16:53:39 +00:00
Yohei Yukawa
4267dbea26 Merge "Use a bit more descriptive name for a parameter" 2014-07-10 21:43:01 +00:00
Yohei Yukawa
bb9f624252 Use a bit more descriptive name for a parameter
The current parameter name "index" in
CursorAnchorInfo.Builder#setComposingText is a bit hard
to understand.

This CL names it with "composingTextStart" to clarify its usage.

Change-Id: I504939b8d2b48875d8baa9630b5a4f04a5d66dbe
2014-07-12 01:11:45 +09:00