drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
137,537 Commits 1 Branch 0 Tags
Commit Graph

137537 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jungshik Jang
fe773e37eb am 20626284: (-s ours) Merge "DO NOT MERGE: Fix a couple of bugs in CEC services" into lmp-preview-dev 
* commit '20626284d9d71abdbef9e8457325b32de9e5644a':
  DO NOT MERGE: Fix a couple of bugs in CEC services
 2014-06-02 11:43:49 +00:00
Jungshik Jang
e1b34048fb am d378fa85: (-s ours) Merge "DO NOT MERGE: Fix a bug calling a wrong HDMI-CEC Binder API" into lmp-preview-dev 
* commit 'd378fa8522e128513bed3cb0cf8e9b8f38da1e79':
  DO NOT MERGE: Fix a bug calling a wrong HDMI-CEC Binder API
 2014-06-02 11:43:45 +00:00
Jungshik Jang
d6519f859a am aa40beb6: (-s ours) Merge "DO NOT MERGE: Add cec message handler to hdmi cec jni implementation" into lmp-preview-dev 
* commit 'aa40beb64d1f5a415910992bf41eee5f121add47':
  DO NOT MERGE: Add cec message handler to hdmi cec jni implementation
 2014-06-02 11:43:40 +00:00
Jungshik Jang
0b19196509 am 367cd5b6: (-s ours) Merge "DO NOT MERGE: Fix a bug using wrong addresses for CEC logical address allocation" into lmp-preview-dev 
* commit '367cd5b67b403c253833267e8e139595ed410f91':
  DO NOT MERGE: Fix a bug using wrong addresses for CEC logical address allocation
 2014-06-02 11:43:34 +00:00
Jungshik Jang
d18fef5976 am 18021f98: (-s ours) Merge "DO NOT MERGE: Hook up the CEC playback API to service internal logic." into lmp-preview-dev 
* commit '18021f98b16b609ee6941c0935e5569198bc629d':
  DO NOT MERGE: Hook up the CEC playback API to service internal logic.
 2014-06-02 11:43:29 +00:00
Jungshik Jang
ad65c15ab4 am b282ed12: (-s ours) Merge "DO NOT MERGE: Add HdmiCecDeviceInfo to HdmiCecLocalDevice" into lmp-preview-dev 
* commit 'b282ed1272bb1089a2e8c22a0cf06b0551ca7220':
  DO NOT MERGE: Add HdmiCecDeviceInfo to HdmiCecLocalDevice
 2014-06-02 11:43:24 +00:00
Jungshik Jang
6b5e9d5b76 am c578c567: (-s ours) Merge "DO NOT MERGE: Implement <Polling Message>." into lmp-preview-dev 
* commit 'c578c567abe0bea8d48420a0c27c0f271b859eec':
  DO NOT MERGE: Implement <Polling Message>.
 2014-06-02 11:43:19 +00:00
Jungshik Jang
1ff3c2b941 am dd1adf17: (-s ours) Merge "DO NOT MERGE: Add the constants for the callback result of SendCecCommand()." into lmp-preview-dev 
* commit 'dd1adf172245c8910b5e4877d10234a4b56df782':
  DO NOT MERGE: Add the constants for the callback result of SendCecCommand().
 2014-06-02 11:43:14 +00:00
Jungshik Jang
7b4f00e847 am 13f62fa5: (-s ours) Merge "DO NOT MERGE: CEC Initialization per device type" into lmp-preview-dev 
* commit '13f62fa592146f7319727cd7f4306bf7080f0035':
  DO NOT MERGE: CEC Initialization per device type
 2014-06-02 11:43:09 +00:00
Jungshik Jang
353a9b4a77 am eaa1c574: (-s ours) Merge "DO NOT MERGE: Add SendMessageCallback to Hdmi control service." into lmp-preview-dev 
* commit 'eaa1c574512758b30c1ee164a5f597e41be4b3d7':
  DO NOT MERGE: Add SendMessageCallback to Hdmi control service.
 2014-06-02 11:43:04 +00:00
Jungshik Jang
9bb6fbb743 Merge "DO NOT MERGE: Fix a couple of bugs in CEC services" into lmp-preview-dev 2014-06-02 04:35:58 +00:00
Jungshik Jang
1dcef4f9cd Merge "DO NOT MERGE: Fix a bug calling a wrong HDMI-CEC Binder API" into lmp-preview-dev 2014-06-02 04:35:45 +00:00
Jungshik Jang
37554062ed Merge "DO NOT MERGE: Add cec message handler to hdmi cec jni implementation" into lmp-preview-dev 2014-06-02 04:35:35 +00:00
Jungshik Jang
dc6adf5c62 Merge "DO NOT MERGE: Fix a bug using wrong addresses for CEC logical address allocation" into lmp-preview-dev 2014-06-02 04:35:21 +00:00
Jungshik Jang
15bbf99a52 Merge "DO NOT MERGE: Hook up the CEC playback API to service internal logic." into lmp-preview-dev 2014-06-02 04:34:56 +00:00
Jungshik Jang
f7ecc88b81 Merge "DO NOT MERGE: Add HdmiCecDeviceInfo to HdmiCecLocalDevice" into lmp-preview-dev 2014-06-02 04:34:36 +00:00
Jungshik Jang
a8b57081f8 Merge "DO NOT MERGE: Implement <Polling Message>." into lmp-preview-dev 2014-06-02 04:34:19 +00:00
Jungshik Jang
5a0d97b1c2 Merge "DO NOT MERGE: Add the constants for the callback result of SendCecCommand()." into lmp-preview-dev 2014-06-02 04:34:02 +00:00
Jungshik Jang
3a551cb536 Merge "DO NOT MERGE: CEC Initialization per device type" into lmp-preview-dev 2014-06-02 04:33:50 +00:00
Jungshik Jang
b79ddaf16e Merge "DO NOT MERGE: Add SendMessageCallback to Hdmi control service." into lmp-preview-dev 2014-06-02 04:33:29 +00:00
Amith Yamasani
dc31af2d4f Merge "Handle saving and restoring ints in application restrictions" 2014-06-02 03:18:46 +00:00
Amith Yamasani
5b5aa4072f Handle saving and restoring ints in application restrictions 
Unit tests for restrictions types and proper escaping.

Change-Id: Iac35521faf5798398a89fecbad82fcdd256a4146
 2014-06-01 20:17:37 -07:00
Jinsuk Kim
a8fd44b74b DO NOT MERGE: Fix a couple of bugs in CEC services 
- Correct conversion for byte to int for cec opcode
- Use the right Handler.obtainMessage() to pass an integer variable

Change-Id: Ie3e86225f1702decce454aeb197911a371f51c17
 2014-06-02 10:58:02 +09:00
Jinsuk Kim
304b4a7281 DO NOT MERGE: Fix a bug calling a wrong HDMI-CEC Binder API 
Change-Id: I75e5de3ab820288f0fe6bebdc63d6dd680e18f8a
 2014-06-02 10:56:57 +09:00
Jungshik Jang
c47e26ca2f DO NOT MERGE: Add cec message handler to hdmi cec jni implementation 
Notification for incoming cec message can be issued
from any thread but jni can call java method
in the thread that jni knows like service thread.
So this change delegates incoming message to
jni-friendly thread, service thread by exploit
looper of service thread.

Change-Id: If3b141d917df3e209912af1778eb509777199969
 2014-06-02 10:55:50 +09:00
Jinsuk Kim
2c2a301762 DO NOT MERGE: Fix a bug using wrong addresses for CEC logical address allocation 
Change-Id: I41da586c16dca4f325d147bb3abe5d4e09f7b91c
 2014-06-02 10:54:53 +09:00
Jinsuk Kim
16e24a2d14 DO NOT MERGE: Hook up the CEC playback API to service internal logic. 
This change enables CEC playback API (oneTouchPlay, queryDisplayStatus).
Also updated local device list type to SparseArray to make it easy
to get one based on device type.

Change-Id: I6f88b2dac2d873c493a90411549a4e5719a5e460
 2014-06-02 10:53:58 +09:00
Jungshik Jang
562ef5c513 DO NOT MERGE: Add HdmiCecDeviceInfo to HdmiCecLocalDevice 
As HdmiCecLoclaDevice is a wrapper for local devices
it should include cec device info.

Change-Id: I479665b2aa6bd56470b79dbbb7fb1015f6356090
 2014-06-02 10:50:37 +09:00
Jungshik Jang
9d499bfe4a DO NOT MERGE: Implement <Polling Message>. 
When Device Discovery is launched or Hot-plug detection is
launched, the first step of it is to send <Polling Message>
to all remote devices. According to type of feature,
it may have different retry count for sending <Polling Message>.

As <Polling Message> to all devices should be serialized operation
it runs on io thread as single operation.

Along with this, added assertRunOnIoThread and
assertRunOnServiceThread used to make sure that all methods are
called in proper thread.

Change-Id: I2d2df0216867c188e99ba24b216ec73f3396eeae
 2014-06-02 10:48:57 +09:00
Yuncheol Heo
61ced38d61 DO NOT MERGE: Add the constants for the callback result of SendCecCommand(). 
- Move the send failure warning messages into HdmiCecController.sendCommand()
  from each Actions.
- Stringfy with more detail messages for some opcodes.

Change-Id: Ib7ce24dd2a1f290e6c3a0b26738772ef1d4a9630
 2014-06-02 10:46:36 +09:00
Jinsuk Kim
47927f756a DO NOT MERGE: CEC Initialization per device type 
CEC initialization may vary from device type to type. Changed logical address
map to HdmiCecLocalDevice map to handle it. These per-type classes for local
device will be extended also to take care of incoming CEC commands that should
require different action based on device type.

Change-Id: Ia59a464607b14e942fcf83e63aa1d6310ca6a575
 2014-06-02 10:45:18 +09:00
Jungshik Jang
404d704158 DO NOT MERGE: Add SendMessageCallback to Hdmi control service. 
As we have separate IO thread, we should have async callback
mechanism to get result of send request.
For that, I added SendMessageCallback interface to HdmiControl
Service
Along with this, replace message-based IO handling with
post Runnable based one for consistency

Change-Id: I61cf5b751b4f2af3b34956060869f3512f161d11
 2014-06-02 10:42:03 +09:00
Alan Viverette
af01a7f4cf Merge "Fix build" 2014-06-02 01:37:28 +00:00
Alan Viverette
a81ff42474 Fix build 
Change-Id: Id5dde81d71c164c5537c48b383c7b37f2b2a7327
 2014-06-01 18:37:01 -07:00
Alan Viverette
4febf92f01 am 31c460ab: Merge "Smaller dialog margin, update button width & font weight" into lmp-preview-dev 
* commit '31c460ab4e011536c58e6128f071ce76e602483e':
  Smaller dialog margin, update button width & font weight
 2014-06-02 00:55:29 +00:00
Alan Viverette
07cd153e35 Merge "Smaller dialog margin, update button width & font weight" into lmp-preview-dev 2014-06-02 00:51:18 +00:00
Alan Viverette
b8e6dbe361 Smaller dialog margin, update button width & font weight 
BUG: 15310835
BUG: 15317713
BUG: 15316689
Change-Id: Iaab92eefa3fdba85dfa9cc3931234135e8a0bc5c
 2014-06-01 17:41:55 -07:00
Alan Viverette
52a557fae5 am cc179e25: Merge "Allow ripple bounds to change during enter animation" into lmp-preview-dev 
* commit 'cc179e25ccab51cddd16bd3be064590a4c5bb58b':
  Allow ripple bounds to change during enter animation
 2014-06-02 00:36:59 +00:00
Alan Viverette
0f77b116e1 Merge "Allow ripple bounds to change during enter animation" into lmp-preview-dev 2014-06-02 00:32:13 +00:00
Adam Powell
535499204b am 16b0baa4: Merge "Further implementation for ToolbarActionBar" into lmp-preview-dev 
* commit '16b0baa45bd68bb05863d3a6e92b7e8e0b452cb2':
  Further implementation for ToolbarActionBar
 2014-06-02 00:25:41 +00:00
Adam Powell
9558232a2e Merge "Further implementation for ToolbarActionBar" into lmp-preview-dev 2014-06-02 00:23:16 +00:00
Adam Powell
07a74548ae Further implementation for ToolbarActionBar 
Integrate activity options menu and inline Toolbars. Fix a series of
small associated bugs.

Activities now (privately) offer several menu-related events directly
to the associated ActionBar. In the future this should help us
untangle some of the menu-based pasta in PhoneWindow.

Bug 15344598

Change-Id: I76211ad17d2bcbb58cf1d88914e855416d084ded
 2014-06-01 17:15:42 -07:00
Alan Viverette
dc6046fca3 Allow ripple bounds to change during enter animation 
BUG: 15315168
Change-Id: I7588be96648318473998cfd5deba678224f1db51
 2014-06-01 16:48:31 -07:00
Alan Viverette
6a407b0d48 am 8709eeb9: Merge "Fix padding for GradientDrawable" into lmp-preview-dev 
* commit '8709eeb9ed08a70550b308e4e79cadf884e2e2d3':
  Fix padding for GradientDrawable
 2014-06-01 23:45:51 +00:00
Alan Viverette
c65c7ae635 Merge commit '6682183b' into manualmerge 
Conflicts:
	core/res/res/values/public.xml

Change-Id: Ic91db6ee85dcd8a6b13716b600b04c78ceac4b33
 2014-06-01 16:44:28 -07:00
Alan Viverette
c6c967b68a Merge "Fix padding for GradientDrawable" into lmp-preview-dev 2014-06-01 23:23:51 +00:00
Alan Viverette
c3710eb20d Merge "Fixes hotspot list transitions, update to use a single hotspot" into lmp-preview-dev 2014-06-01 23:14:25 +00:00
Dongwon Kang
240b8368ce am 41e5f190: Merge "Add a path for generic event from a session to an application in Tv Input Framework." into lmp-preview-dev 
* commit '41e5f1907dc029ab5117b9f8bcbc69c7a0abaa11':
  Add a path for generic event from a session to an application in Tv Input Framework.
 2014-06-01 23:13:44 +00:00
Alan Viverette
982c59a55f Fix padding for GradientDrawable 
BUG: 15197745
Change-Id: Ibd1c20dd8ba8c7ffbf65031be4ca9813304d4d0f
 2014-06-01 16:11:32 -07:00
Dongwon Kang
0bf8a21464 Merge "Add a path for generic event from a session to an application in Tv Input Framework." into lmp-preview-dev 2014-06-01 23:09:31 +00:00