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

120165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
a53466479c am 14dee803: am c7fdfe6b: am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '14dee803f8a3b532e86613bb18d5cb572d113df9':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-04-04 02:21:29 +00:00
Deepanshu Gupta
14dee803f8 am c7fdfe6b: am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'c7fdfe6b67d81a62d79912780b585673043148ab':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-04-04 02:13:59 +00:00
Deepanshu Gupta
c7fdfe6b67 am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '99939cce702b6b5a01be351f1a0b406a16509103':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-04-04 02:07:28 +00:00
Deepanshu Gupta
99939cce70 am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '6094daa2626e57c6bd24409f0934090581541e49':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-04-04 02:01:42 +00:00
Deepanshu Gupta
6094daa262 am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'ba0ce05688ff7ebf91e16f5cb741701feb706fc2':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-04-04 01:54:00 +00:00
Deepanshu Gupta
ba0ce05688 Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev 2014-04-04 00:43:08 +00:00
Xavier Ducrohet
76c484de88 am d93b0b67: am e448bcf7: Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into klp-dev 
* commit 'd93b0b67754f6d06407086278298f44156458216':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-04-03 22:17:10 +00:00
Xavier Ducrohet
d93b0b6775 am e448bcf7: Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into klp-dev 
* commit 'e448bcf71adec7b94e2a67ed06d0a725b80c31d8':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-04-03 22:10:38 +00:00
Xavier Ducrohet
e448bcf71a Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into klp-dev 2014-04-03 22:05:25 +00:00
Jeff Brown
8db6d9af58 Merge "Clean up certain state transitions in DreamService." into klp-modular-dev 2014-04-03 03:20:01 +00:00
Jeff Brown
344812d2f3 Clean up certain state transitions in DreamService. 
Instead of posting onDreamingStarted() to a handler from attach(), do
the work immediately.  This ensures that the dream is actually in the
expected state when the callback runs.  Previously it was possible
for the callback to run after detach() occurred which could cause
exceptions and unexpected behavior.  As it happens, there's no need
to post this callback since attach() already runs on the UI thread.

Handle certain races involving the window token lifecycle a little
better.  When the dream manager shuts down a dream, it removes the
window token.  This can happen before the dream completes its attach()
phase in which case a BadTokenException is thrown.  We now handle this
exception and abort the dream in anticipation of receiving a request
to finish it immediately.

Add a safeguard to getDozeHardware() to handle the case where it
might inadvertently be called at the wrong point in the lifecycle.

Bug: 13475612
Bug: 13760290
Change-Id: I9bc9c154370d08d7727b568d398c460a38592099
 2014-04-02 20:17:32 -07:00
Jeff Tinker
4995d72520 Merge "Add signature|system permission to MediaDrm signer APIs" into klp-modular-dev 2014-04-03 01:30:42 +00:00
Jinsuk Kim
31518f745f Merge "Use build property for CEC device OSD name" into klp-modular-dev 2014-04-03 00:35:09 +00:00
Jeff Tinker
65c94e6959 Add signature|system permission to MediaDrm signer APIs 
Also addresses style issues noted in post-submit review from
https://googleplex-android-review.git.corp.google.com/#/c/439054/

Change-Id: If177b11dbcc049bc271529c119bc5c36ae0107b5
related-to-bug: 12702350
 2014-04-02 16:43:10 -07:00
Jinsuk Kim
7b4c972577 Merge "Fix build breakage by updating current.txt" into klp-modular-dev 2014-04-02 23:12:09 +00:00
Katie McCormick
85588d19bd am cd536cb3: am 0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs 
* commit 'cd536cb32927d74ac8181c8636f2971cb39e7fda':
  docs: MediaRouteProvider Developer Guide
 2014-04-02 23:11:20 +00:00
Jinsuk Kim
196b6dd13e Fix build breakage by updating current.txt 
Change-Id: If9434850c24c8e97bdd49952fb3180d139cab101
 2014-04-03 08:10:55 +09:00
Katie McCormick
cd536cb329 am 0cdf6047: Merge "docs: MediaRouteProvider Developer Guide" into klp-docs 
* commit '0cdf60472be5efc1b6e8ef125f96ba014870b345':
  docs: MediaRouteProvider Developer Guide
 2014-04-02 23:05:04 +00:00
Jinsuk Kim
60b17cc094 Use build property for CEC device OSD name 
Previously OSD name was based on device type. This CL makes it
independent of device type. CEC spec says "A device that implements
more than one type of CEC functionality should respond with the same
OSD name for each logical address. It is recommended that the name
refers to the complete physical product rather than the individual
CEC functionality".

Now the default name comes from system build property. I removed
setOsdName() from aidl for now since it won't be in use.

Change-Id: I3c9fb877fad4bc5efef56268d155a3f37a865fc2
 2014-04-03 07:59:27 +09:00
Katie McCormick
0cdf60472b Merge "docs: MediaRouteProvider Developer Guide" into klp-docs 2014-04-02 22:58:57 +00:00
Jinsuk Kim
b1dca1624d Merge "Maintain display power status for playback device" into klp-modular-dev 2014-04-02 22:39:41 +00:00
Joe Fernandez
55b38fadd0 docs: MediaRouteProvider Developer Guide 
Change-Id: I04e63a8972e29d67af6035462fd2808a562ac241
 2014-04-02 15:35:15 -07:00
Michael Wright
4932a355f1 Merge "Misc. buttons aren't gamepad keys." into klp-modular-dev 2014-04-02 20:26:36 +00:00
Jinsuk Kim
4e90fcd190 Maintain display power status for playback device 
With this CL, the power status of TV/display is keep tracked of
by hdmi cec server part, specfically HdmiCecDevicePlayback.
Turned the HdmiCecDevice to abstract class from which classes of
concrete device type(HdmiCecDevicePlayback, HdmiCecDeviceTV) are
inherited. The display power status code is put in HdmiCecDevicePlayback
only. HdmiCecDeviceTv will have its own logic that manages power status of
devices connected to it. For now it only has a bare minimum code.
Will be worked on in follow up CLs.

Other changes:

    - Replaced sendGiveDevicePowerStatus() with isTvOn() so that the status
      can be queried by clients.

    - Defensively check the availability of HdmiCecService so that
      HdmiCecManager.getClient() returns null in case the service couldn't
      be initialized. This ensures clients of the service gets the nulled-out
      HdmiCecClient when called in the state/configuration where the service
      is not available, thus proceed accordingly.

Change-Id: Idaf69e73cfbd639c0b40b1bd4b6146f011246180
 2014-04-02 14:46:14 +09:00
Ricardo Cervera
c013eaad57 am 5a218b18: am 8e183798: Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs 
* commit '5a218b186735534925d7fedb63f1c78a3a3ff543':
  docs: Added notes to use the last SDK version to the Build your First App class.
 2014-04-02 00:15:31 +00:00
Ricardo Cervera
5a218b1867 am 8e183798: Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs 
* commit '8e183798d573ad4777a5f01fd6db8f86ca0e120f':
  docs: Added notes to use the last SDK version to the Build your First App class.
 2014-04-02 00:08:11 +00:00
Ricardo Cervera
8e183798d5 Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs 2014-04-02 00:03:00 +00:00
Michael Kolb
875eff832f Merge "Add circular anti-aliasing mask to circular display" into klp-modular-dev 2014-04-01 22:48:28 +00:00
Michael Wright
f46b5d466d Misc. buttons aren't gamepad keys. 
BUTTON_[1-9] are intended to be misc. buttons so the kernel will
assign them to non-gamepad devices.  As such, we shouldn't treat them
as belonging to gamepads at all.

Bug: 13432364
Change-Id: I9495760f2379e44785b9ce1cf018b6db7f6cb0f4
 2014-04-01 15:43:43 -07:00
Michael Kolb
39a6db7cd5 Add circular anti-aliasing mask to circular display 
Bug: 13635645

  Add a 2 px wide anti-aliased circle as a Layer to WindowManagerService

Change-Id: Ic8d319ca43c222f5b2e69af896749b8f2018ce3e
 2014-04-01 15:28:01 -07:00
Jeff Tinker
433a063309 Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev 2014-04-01 21:54:29 +00:00
Craig Mautner
2b6fe2990d am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev 
* commit 'c70f15fe298655de02c2e72023fafe6fc33d2a55':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 21:48:04 +00:00
Craig Mautner
c70f15fe29 am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev 
* commit '2fc798a2270cda98366776af489d45c1043e831d':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 21:41:15 +00:00
Jeff Tinker
e4095a80b6 Support CAST V2 Authentication in MediaDrm 
Java API version

Update frameworks to enable support for CAST
V2 Authentication in the DRM Plugin.

Change-Id: I23cfbbbc89c1226b7a3968ce8bc1e2d4bd41014a
related-to-bug: 12702350
 2014-04-01 14:25:35 -07:00
Craig Mautner
2fc798a227 resolved conflicts for merge of 8c6e6e73 to klp-dev 
Change-Id: I9fc9bc3d935e9e730ebca767d848b1c66203f3b4
 2014-04-01 13:57:37 -07:00
Michael Kolb
17bbd976c0 Merge "Add outset to decor view measuring" into klp-modular-dev 2014-04-01 20:40:35 +00:00
Craig Mautner
8c6e6e7372 am 13b75939: am d4d2aa51: am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit '13b75939596eec63c096fe9e85643b8c42a40b12':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 20:01:32 +00:00
Craig Mautner
13b7593959 am d4d2aa51: am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit 'd4d2aa519fb1a9d54c14da858a4ab7ab0880f34d':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:54:59 +00:00
Craig Mautner
d4d2aa519f am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit 'efbe7cc0ff5c85cc7956bb3099402c7ebbe20591':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:49:36 +00:00
Craig Mautner
efbe7cc0ff am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit 'd1c82f8fc22216e9b544e3a3b521bcad05bc113d':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:43:41 +00:00
Craig Mautner
d1c82f8fc2 am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit '1cb3c1d381c389c7ef903c1a871ff695cd406da4':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:36:48 +00:00
Craig Mautner
1cb3c1d381 am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit 'fc80fbe3d5b287c19e3dab89fc93ca4b8a812bb1':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:30:41 +00:00
Craig Mautner
fc80fbe3d5 am 7bd0b652: am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit '7bd0b65233d0ef34114ecb93d734dfe4351f470d':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:24:23 +00:00
Craig Mautner
7bd0b65233 am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working 
* commit '4bdab6bb4c55661d4915518b1190e30c4633c6a5':
  Fix FLAG_DISMISS_KEYGUARD not working
 2014-04-01 19:18:36 +00:00
Craig Mautner
4bdab6bb4c Fix FLAG_DISMISS_KEYGUARD not working 
Fixes bug 13672528.

Change-Id: I0292aee51d5d8755bbae926e5f0e6af1e22107dc
 2014-04-01 12:10:54 -07:00
quddusc
f425e5ea05 am c7f403f4: am 5321e9bd: Merge "docs: Fixed outdated link to Google Analytics docs. Bug: 13742301" into klp-docs 
* commit 'c7f403f46d824c17f9bd1fb6447425eacc2cccfe':
  docs: Fixed outdated link to Google Analytics docs. Bug: 13742301
 2014-04-01 18:30:33 +00:00
quddusc
c7f403f46d am 5321e9bd: Merge "docs: Fixed outdated link to Google Analytics docs. Bug: 13742301" into klp-docs 
* commit '5321e9bd48db680c618a490fb38c060c3c05beba':
  docs: Fixed outdated link to Google Analytics docs. Bug: 13742301
 2014-04-01 18:24:38 +00:00
quddusc
5321e9bd48 Merge "docs: Fixed outdated link to Google Analytics docs. Bug: 13742301" into klp-docs 2014-04-01 18:12:06 +00:00
Scott Main
c37960733a am c8b6feb2: am 35682006: Merge "laptop image with redacted" into klp-docs 
* commit 'c8b6feb2007259cdc4053a9774e31847ee60d592':
  laptop image with redacted
 2014-04-01 17:59:12 +00:00
Scott Main
3bd0a44bbf am a7afd38f: am 1afdbb93: Merge "dashbaord update for 4/1/14" into klp-docs 
* commit 'a7afd38f3021a15e0bd22674409c2cd6d83095c3':
  dashbaord update for 4/1/14
 2014-04-01 17:59:08 +00:00