148209 Commits

Author SHA1 Message Date
Nicolas Prevot
f52233df74 Merge "When forwarding intents, ignoring the package set in the intent." into lmp-dev 2014-08-16 04:29:45 +00:00
Ji-Hwan Lee
0c3b4ad7b6 Merge "TIF: Remove session state when hardware wrapper input crashes" into lmp-dev 2014-08-16 04:25:55 +00:00
Ji-Hwan Lee
4835497886 TIF: Remove session state when hardware wrapper input crashes
Change-Id: I2306cc407a19892c1895ee70bd6bd52b1a3bd4f3
2014-08-17 04:51:18 +09:00
Dianne Hackborn
249a7fdf44 Merge "Temporary: raise overflow limit, print all wake locks." into lmp-dev 2014-08-16 04:32:18 +00:00
Dianne Hackborn
acc4a12074 Temporary: raise overflow limit, print all wake locks.
Change-Id: I02baa775b8e0659bd9cd4547b8671730f056cb86
2014-08-18 16:33:44 -07:00
Michael Wright
468fef6870 Merge "Persist Show IME option." into lmp-dev 2014-08-18 23:27:42 +00:00
Michael Wright
8b987196ca Merge "Update MenuItem#setShortcut docs" into lmp-dev 2014-08-18 21:31:41 +00:00
Michael Wright
d1858574d0 Merge "Add callbacks for MediaProjection start / stop." into lmp-dev 2014-08-18 23:27:42 +00:00
Michael Wright
7b69e056fd Update MenuItem#setShortcut docs
Change-Id: I6b73992b0c8d590e8c9884bec377c7c0c1e35720
2014-08-17 17:58:53 -07:00
Michael Wright
7b5a96ba83 Persist Show IME option.
Add a new setting to persist whether to show the IME when a hard
keyboard is connected.

Bug: 14066881
Change-Id: I2237ded850a0d4ab43ca441d0b7df13e0958e630
2014-08-17 17:51:19 -07:00
Michael Wright
665366a305 Change 'disable hardware keyboard' to 'show input method'
Previously it implied that the hardware keyboard would be disabled,
but really the toggle would just enable showing the IME even if a
hardware keyboard was present. Changed the string and swapped the
semantics to be more clear about the behavior.

Bug: 14066881
Change-Id: I9c8a7eb98b5277f1d09cc19fa7402e9b4cf51d92
2014-08-17 17:51:19 -07:00
Michael Wright
d86ecd26d7 Add callbacks for MediaProjection start / stop.
Also, enforce that there is only one valid MediaProjection at a time.

Bug: 16488053
Change-Id: Id05445d798c98cb208bc4dab186296392e15d30b
2014-08-17 16:06:56 -07:00
Svetoslav
33903c839c Merge "Update the print spooler icon." into lmp-dev 2014-08-16 04:32:18 +00:00
Svetoslav
309f6a0e1b Update the print spooler icon.
Removed a duplicate resource also defined in the platform
resources. Added a tint to the print spooler icon.

bug:16568027

Change-Id: I1c0b9a7bd75bc59d1d86653c05d8fc2bb77056c1
2014-08-18 23:37:56 +00:00
Jae Seo
5b1caaf7d8 TIF: Fix some comment warnings
Also fixed some other obvious warnings from Eclipse

Bug: 16876068
Change-Id: Ic9c44caf3fd53e965043aa96039d5f3a5655eaff
2014-08-18 23:25:48 +00:00
Adam Powell
8f4a21e466 Merge "Fix a bug propagating navigation button events from ToolbarActionBar" into lmp-dev 2014-08-18 21:00:53 +00:00
Adam Powell
14e1afe0d8 Fix a bug propagating navigation button events from ToolbarActionBar
Add a simple internal wrapper for dealing with window callback events.
This should also make working with things like action modes from
ToolbarActionBar significantly easier in later changes.

Bug 16980711

Change-Id: I2c3d7525489a21847f4af9b80f6ebf9b34b4dd58
2014-08-18 15:58:23 -07:00
Jungshik Jang
3b57e1d129 Merge "Remove parameter field in HdmiCecKeycode." into lmp-dev 2014-08-16 04:25:55 +00:00
Jungshik Jang
5691b2f229 Remove parameter field in HdmiCecKeycode.
Since we don't support mapping between android key and parameterized
cec keycode, remove parameter fields in HdmiCecKeycode.

Bug: 17099253
Change-Id: I8b6b6b361f0c343b0a263240b49e41bf289d36ca
2014-08-19 09:49:30 +09:00
Terry Heo
5e85359a36 Merge "CEC: Broadcast language setting whenever it changes" into lmp-dev 2014-08-16 04:15:21 +00:00
Terry Heo
1ca0a43251 CEC: Broadcast language setting whenever it changes
Bug: 16995278
Change-Id: Id695d4d2f213cd8039c9915f3d4e451e829e715c
2014-08-18 11:16:05 +09:00
Jungshik Jang
b26fcf68e1 Merge "Disable device when it's removed or disabled." into lmp-dev 2014-08-16 04:15:21 +00:00
Jungshik Jang
0ec59fa2b3 Disable device when it's removed or disabled.
Bug: 17122583
Change-Id: Iabda3123ab7e3366c53ae39d9887cb0dd90bdd89
2014-08-20 14:36:54 +09:00
Jae Seo
50afbb308d Fix the signature of nativeSendScratchpadCommand
Change-Id: Ie90a7317f4cf368bf84a64d72e3d8b0de2458b50
2014-08-19 20:40:03 -07:00
Sascha Prueter
3d848bbef6 Merge "Compress miscellaneous fonts." into lmp-dev 2014-08-20 01:43:56 +00:00
Jeff Brown
4720ada123 Merge "Use the CAST_SETTINGS activity for Cast Screen / More Settings." into lmp-dev 2014-08-16 04:32:18 +00:00
Jeff Brown
184926239b Use the CAST_SETTINGS activity for Cast Screen / More Settings.
Change-Id: Ifc2e505896ecf17ac2d0d24a3fec07c10d604448
2014-08-19 20:08:52 -07:00
Jeff Brown
b135d06cb8 Remove incomplete media router API. (DO NOT MERGE)
Change-Id: I310fadafb5a6b8190a32e5d87f3e1823c87bcef7
2014-08-19 20:08:52 -07:00
Jeff Brown
6dd10edae5 Merge "Remove incomplete media router API. (DO NOT MERGE)" into lmp-dev 2014-08-16 04:32:18 +00:00
Wenchao Tong
36ecb30b87 Merge "Annotate @SystemApi on some WifiManager methods." into lmp-dev 2014-08-19 02:43:23 +00:00
Etan Cohen
155bbf1ea4 Enable VoLTE with overlay configuration allowing disabling.
Bug: 17134661
Change-Id: Ie6262b2b39848a13729a4b9d6acad10ebb91636b
2014-08-20 02:42:49 +00:00
Wenchao Tong
4d11492071 Annotate @SystemApi on some WifiManager methods.
Bug: 17112931
Change-Id: I5980bc46bc1f16316caecd7fcc6cd771b8ca6cdf
2014-08-19 09:42:41 -07:00
Adam Powell
240ecfe54f Merge "Update text selection handles to have a minimum touch target size." into lmp-dev 2014-08-16 04:32:18 +00:00
Adam Powell
3fceabd64c Update text selection handles to have a minimum touch target size.
The text selection handles were traditionally sized based on the size
of the provided drawables. When these drawables are visually small, do
not restrict the size of the touch target beyond a certain minimum.

Bug 16851360

Change-Id: If6a468c7b3a9a1a21913006633f00699637751c0
2014-08-19 18:28:31 -07:00
Jungshik Jang
8e6e1e2e82 Merge "Use id to find proper HdmiDeviceInfo instead of ojbect itself." into lmp-dev 2014-08-16 04:25:55 +00:00
Jungshik Jang
cf445877c6 Use id to find proper HdmiDeviceInfo instead of ojbect itself.
TvInputHardwareManager manages internal device info and update
it by remove or add method of List collection. However,
HdmiDeviceInfo overrides equals method and remove may not work
if incoming HdmiDeviceInfo has different power status.
Instead, this change iterates all HdmiDeviceInfo and compares
id of HdmiDeviceInfo.

Bug: 17145753
Change-Id: Ia5de3e33cf05b28fa2bd108d99e78de09b838fb3
2014-08-20 15:06:01 +09:00
Jinsuk Kim
9727b33297 Merge "CEC: Hook up device select API to MHL device RAP" into lmp-dev 2014-08-16 04:25:55 +00:00
Jinsuk Kim
87f22a2870 CEC: Hook up device select API to MHL device RAP
This lets the input selection on UI perform MHL RAP signalling, and
CEC routing control.

Bug: 17141884
Change-Id: Ic1605175c5779a9a3c43df954baf9fdb6f154d36
2014-08-20 12:35:32 +09:00
Terry Heo
03861d0721 Merge "CEC: Handle Remote Control command" into lmp-dev 2014-08-16 04:12:14 +00:00
Terry Heo
3e1564ee39 CEC: Handle Remote Control command
Generate an Android key event when a UserControl message is received.
And report menu state active when a MenuRequest message is received to
notify sender can send a UserControl message.

Bug: 16938007
Change-Id: Id8f393dc254508b9e7a6fa203f8e817fbe807e38
2014-08-18 16:09:10 +09:00
Jungshik Jang
5ba6906768 Merge "Clean up MHL local devices when HdmiControlService turns into disabled state" into lmp-dev 2014-08-16 04:12:14 +00:00
Jungshik Jang
2738e2d872 Implement missing mhl apis
1. get_supported_features
2. get_ecbug_device_rols
3. set_option in native.
4. get_mhl_version
5. get_peer_mhl_version
6. send_scratchpad_command
 - it includes send_scratchpad_command but does not include
  java side implementation. It will be added when we implement
  scratchpad.

Bug: 17096490

Change-Id: Iacb4a41234cbbd2d832908b48d188bd81a301b0f
2014-08-20 10:11:34 +09:00
Jungshik Jang
350e68d0b8 Clean up MHL local devices when HdmiControlService turns into disabled state
Bug: 17122583
Change-Id: Id8f17faf9891952c762f86b46a89732f1497c5fc
2014-08-19 18:56:21 +09:00
Ji-Hwan Lee
15c56aac98 TIF: Call setMain(false) when session is released.
Also, rename setMainTvView() and setMainSession() to setMain(), except
ITvInputManager.

Change-Id: I586e3fd42720f07a75d6f31b1ee955ce5c29dd68
2014-08-19 06:11:04 +00:00
Jinsuk Kim
8809f1e547 Merge "CEC: Invoke events listener upon MHL device state change" into lmp-dev 2014-08-16 04:25:55 +00:00
Andrew Solovay
fc6b01f463 am eb60d0f1: am 94174ff7: am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs
* commit 'eb60d0f1937392351ef81f10b651749bd47f7898':
  docs: Documented new fields returned by getSkuDetails().
2014-08-19 05:52:57 +00:00
Jinsuk Kim
ed0864557b CEC: Invoke events listener upon MHL device state change
With this change, mobile devices state changes are propagated through
TIF to UI, hence the input pickers shows the mobile devices as
expected.

Bug: 16986744
Change-Id: Id633207acf4f814f57d43cc1de5f8cb88ac23ad6
2014-08-19 13:41:51 +09:00
Terry Heo
a890ec19d0 Merge "CEC: Fix JNI initialization error of HdmiMhlController" into lmp-dev 2014-08-16 04:12:14 +00:00
Terry Heo
4926b87243 CEC: Fix JNI initialization error of HdmiMhlController
Correct signature of nativeSendScratchpadCommand.

Bug: 17096490
Change-Id: I9694cb3b10724e34d507588fc3946318bb378398
2014-08-20 03:26:47 +00:00
Jaewan Kim
67d666f604 Merge "Fix NPE when passing null TvContentRating" into lmp-dev 2014-08-16 04:12:14 +00:00