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

165481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yuncheol Heo
8991001fec Merge "CEC: Fix JavaDoc errors." into lmp-mr1-dev automerge: fa76518 
automerge: f235449

* commit 'f235449efb77f925262cb63e85ab3b197a94d2e5':
  CEC: Fix JavaDoc errors.
 2014-10-24 02:39:34 +00:00
Yuncheol Heo
f235449efb Merge "CEC: Fix JavaDoc errors." into lmp-mr1-dev 
automerge: fa76518

* commit 'fa7651877ff67b0729ced4fe2c449cba89b62221':
  CEC: Fix JavaDoc errors.
 2014-10-24 02:26:33 +00:00
Dongwon Kang
f6df7bff53 Merge "TIF: Define more cannonical genres in TvContract" into lmp-mr1-dev 2014-10-24 02:24:18 +00:00
Wonsik Kim
fe86d9247a Merge "TIF: fix wrong config comparison & confusing method name" into lmp-mr1-dev automerge: cfc7323 
automerge: d651007

* commit 'd6510073e7c969c49713f57c0625bb445f8ea210':
  TIF: fix wrong config comparison & confusing method name
 2014-10-24 02:08:06 +00:00
John Spurlock
6819902747 Merge "Volume: Make VolumeUI startup configurable." into lmp-mr1-dev automerge: 84f9ab2 
automerge: 3033e8e

* commit '3033e8eb2697044ccef68efc1504d06e88cf2744':
  Volume: Make VolumeUI startup configurable.
 2014-10-24 02:07:06 +00:00
Dongwon Kang
ef846dbe99 Merge "TIF: exclude tuner TV input not having a setup activity in the input list." into lmp-mr1-dev automerge: f9f7acf 
automerge: 08fe9fb

* commit '08fe9fbf56e8954ee4817c7ae69b1e6b059a864f':
  TIF: exclude tuner TV input not having a setup activity in the input list.
 2014-10-24 02:06:07 +00:00
Svetoslav
eed63916a1 am bd6fabe2: Merge "APIs for an accessibility service to put interaction tracking overlays." into lmp-mr1-dev 
automerge: 89e7ffe

* commit '89e7ffedadd20a3091e72b42f86c500452df193c':
  APIs for an accessibility service to put interaction tracking overlays.
 2014-10-24 02:04:11 +00:00
Svet Ganov
532f0a2954 am 9920a0dc: Merge "Set copies to one when saving to PDF." into lmp-mr1-dev 
automerge: 9dec5df

* commit '9dec5df3a3df9df1786a7a9e74f140e1c165272e':
  Set copies to one when saving to PDF.
 2014-10-24 02:03:10 +00:00
Tyler Gunn
7a8f8cec16 am b31868df: Merge "Remove TODO in TelecomManager." into lmp-mr1-dev 
automerge: eb0a058

* commit 'eb0a058ce1fd86464695d6848877ca42d23398a5':
  Remove TODO in TelecomManager.
 2014-10-24 02:02:14 +00:00
Adam Lesinski
705f2ac424 am 879f237a: Merge "Added some more Split density tests" into lmp-mr1-dev 
automerge: 93b43445

* commit '93b434451abd11ff58ada66abdcddb3f33bb5023':
  Added some more Split density tests
 2014-10-24 02:01:16 +00:00
Clay Murphy
44e203a6bf am ef20147e: Merge branch \'lmp-mr1-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev 
automerge: 3b3b378

* commit '3b3b378d93bf57db79f0f3b77f79ee201719e9d2':
  Remove SystemApi annotations.
 2014-10-24 02:00:08 +00:00
Luan Nguyen
fd5e2e56f1 am bc3b3439: am fd73db22: am 578210db: Merge "docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution." into lmp-dev 
automerge: c89b2ad

* commit 'c89b2ade48144901baf8b1d268a4adc1a02dab53':
  docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution.
 2014-10-24 01:58:57 +00:00
Wonsik Kim
d6510073e7 Merge "TIF: fix wrong config comparison & confusing method name" into lmp-mr1-dev 
automerge: cfc7323

* commit 'cfc73237e9af57e85b46a7e657c84f9c2cb4b641':
  TIF: fix wrong config comparison & confusing method name
 2014-10-24 01:51:58 +00:00
Yuncheol Heo
fa7651877f Merge "CEC: Fix JavaDoc errors." into lmp-mr1-dev 2014-10-24 01:50:38 +00:00
John Spurlock
3033e8eb26 Merge "Volume: Make VolumeUI startup configurable." into lmp-mr1-dev 
automerge: 84f9ab2

* commit '84f9ab2903be2ff45977d99340eafc64c4251b3a':
  Volume: Make VolumeUI startup configurable.
 2014-10-24 01:39:41 +00:00
Dongwon Kang
08fe9fbf56 Merge "TIF: exclude tuner TV input not having a setup activity in the input list." into lmp-mr1-dev 
automerge: f9f7acf

* commit 'f9f7acf2388e27250c94daf2e29e55a39fd95a84':
  TIF: exclude tuner TV input not having a setup activity in the input list.
 2014-10-24 01:38:34 +00:00
Winson Chung
0440067296 Ensuring that user-specific Recent tasks are removed. (Bug 18036610) 
- Also ensuring that the package event logic support multiple task stacks.

Change-Id: Ib08ab70dba1d3f9e5aa0a92f3c5e5382567c96ba
 2014-10-23 18:36:41 -07:00
Wonsik Kim
cfc73237e9 Merge "TIF: fix wrong config comparison & confusing method name" into lmp-mr1-dev 2014-10-24 01:34:05 +00:00
Winson Chung
353c0b91da Should use Activity.onEnterAnimationComplete. (Bug 18031283) 
- Additional code cleanup for previous performance CLs

Change-Id: I41c9be9b1541d0717e32732823f5bb0bedcf818f
 2014-10-23 18:33:54 -07:00
John Spurlock
84f9ab2903 Merge "Volume: Make VolumeUI startup configurable." into lmp-mr1-dev 2014-10-24 01:28:31 +00:00
Dongwon Kang
f9f7acf238 Merge "TIF: exclude tuner TV input not having a setup activity in the input list." into lmp-mr1-dev 2014-10-24 01:24:05 +00:00
Dongwon Kang
5168a7a0d3 TIF: exclude tuner TV input not having a setup activity in the input list. 
By doing this, developers can notice the flaw of the input in advance.

Bug: 17647146
Change-Id: I123a5538566959320a6201a4d7952e205602a28a
 2014-10-24 10:23:13 +09:00
Hochi Huang
4a7873f19a [FM]Fix FM App record fail Buganizer ID: 17975676 
Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
    Review: https://partner-android-review.git.corp.google.com/#/c/185235

Change-Id: I024db429b8ff56851c814857691b06ea5e69198a
 2014-10-24 00:47:54 +00:00
John Spurlock
f2565a8b48 Volume: Make VolumeUI startup configurable. 
Can now disable the default volume dialog in SystemUI with
a standard product overlay.

Bug: 17753150
Change-Id: I305015dbfc40cde2428fa593c89af0f4568e1b74
 2014-10-23 20:16:22 -04:00
Svetoslav
89e7ffedad am bd6fabe2: Merge "APIs for an accessibility service to put interaction tracking overlays." into lmp-mr1-dev 
* commit 'bd6fabe2ae535cf5d31fc7a1952e43ad6e653e2e':
  APIs for an accessibility service to put interaction tracking overlays.
 2014-10-23 23:20:55 +00:00
Svet Ganov
9dec5df3a3 am 9920a0dc: Merge "Set copies to one when saving to PDF." into lmp-mr1-dev 
* commit '9920a0dcf15ba2036cdcc5d6548efa6b4a8bc944':
  Set copies to one when saving to PDF.
 2014-10-23 23:20:48 +00:00
Svetoslav
bd6fabe2ae Merge "APIs for an accessibility service to put interaction tracking overlays." into lmp-mr1-dev 2014-10-23 23:17:21 +00:00
Svet Ganov
9920a0dcf1 Merge "Set copies to one when saving to PDF." into lmp-mr1-dev 2014-10-23 23:17:04 +00:00
Yuncheol Heo
5487ab07c7 CEC: Fix JavaDoc errors. 
- Removed the link tag to the non-public objects.

Bug: 18063758
Change-Id: I17c79510c184df8a62cde9a6a1d18109c299c15d
 2014-10-24 08:16:31 +09:00
Tyler Gunn
eb0a058ce1 am b31868df: Merge "Remove TODO in TelecomManager." into lmp-mr1-dev 
* commit 'b31868df32ef287a561134ecbc96592f657763a3':
  Remove TODO in TelecomManager.
 2014-10-23 23:15:37 +00:00
Tyler Gunn
b31868df32 Merge "Remove TODO in TelecomManager." into lmp-mr1-dev 2014-10-23 23:09:16 +00:00
Adam Lesinski
93b434451a am 879f237a: Merge "Added some more Split density tests" into lmp-mr1-dev 
* commit '879f237acb24394da8c4202a608d38c9683f2474':
  Added some more Split density tests
 2014-10-23 23:07:16 +00:00
Adam Lesinski
879f237acb Merge "Added some more Split density tests" into lmp-mr1-dev 2014-10-23 23:03:48 +00:00
Clay Murphy
3b3b378d93 am ef20147e: Merge branch \'lmp-mr1-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev 
* commit 'ef20147e2ba03c1532301f31027705f4a08e6b87':
  Remove SystemApi annotations.
 2014-10-23 23:02:56 +00:00
Luan Nguyen
c89b2ade48 am bc3b3439: am fd73db22: am 578210db: Merge "docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution." into lmp-dev 
* commit 'bc3b3439010128cfd422d6ab9c96a95042cee254':
  docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution.
 2014-10-23 23:02:52 +00:00
Adam Lesinski
6029319737 Added some more Split density tests 
Change-Id: I3b83515f1240e713bbcff5385cf054bba693f297
 2014-10-23 16:01:58 -07:00
Clay Murphy
ef20147e2b Merge branch 'lmp-mr1-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev 2014-10-23 22:58:41 +00:00
Santos Cordon
db7fc1e833 Merge "Remove SystemApi annotations." into lmp-mr1-dev 2014-10-23 22:58:29 +00:00
Luan Nguyen
bc3b343901 am fd73db22: am 578210db: Merge "docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution." into lmp-dev 
* commit 'fd73db22570bb1bf87b2f32685a31b4c295c848d':
  docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution.
 2014-10-23 22:58:28 +00:00
Luan Nguyen
fd73db2257 am 578210db: Merge "docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution." into lmp-dev 
* commit '578210db199f41dc7c14e53ba925956de835f3c0':
  docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution.
 2014-10-23 22:51:09 +00:00
Luan Nguyen
578210db19 Merge "docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution." into lmp-dev 2014-10-23 22:45:03 +00:00
Nancy Chen
225ace3b2b am 1c3553b5: am c1d001c3: Merge "Fix build breakage because missing API methods." into lmp-mr1-dev 
* commit '1c3553b57f455665deb32c328298ab70152410e8':
  Fix build breakage because missing API methods.
 2014-10-23 22:40:38 +00:00
Nancy Chen
1c3553b57f am c1d001c3: Merge "Fix build breakage because missing API methods." into lmp-mr1-dev 
* commit 'c1d001c3349e02fda7a23d93e101dff8c77441bf':
  Fix build breakage because missing API methods.
 2014-10-23 22:35:01 +00:00
Nancy Chen
c1d001c334 Merge "Fix build breakage because missing API methods." into lmp-mr1-dev 2014-10-23 22:27:27 +00:00
Trevor Johns
2cf2406d98 am 86272c9c: am 4c24abe9: am 2988436b: am fb28bd15: Merge "Docs: Add TOC page for Wearable samples" into lmp-dev 
* commit '86272c9c9c7bb0603cf1626b01f55ac4d94047dd':
  Docs: Add TOC page for Wearable samples
 2014-10-23 22:24:07 +00:00
Trevor Johns
86272c9c9c am 4c24abe9: am 2988436b: am fb28bd15: Merge "Docs: Add TOC page for Wearable samples" into lmp-dev 
* commit '4c24abe9489d35b965161b5375fbc6b8ace819b2':
  Docs: Add TOC page for Wearable samples
 2014-10-23 22:16:09 +00:00
John Reck
b64e4372bb am 82572cc4: am badac04d: Merge "Add some free zoom to lockHardwareCanvas" into lmp-mr1-dev 
* commit '82572cc458053e8cec292a708e18d0de7cfbead2':
  Add some free zoom to lockHardwareCanvas
 2014-10-23 22:15:46 +00:00
Trevor Johns
4c24abe948 am 2988436b: am fb28bd15: Merge "Docs: Add TOC page for Wearable samples" into lmp-dev 
* commit '2988436b65d5fbabff8a6b9cb7c9b56dcd31b84a':
  Docs: Add TOC page for Wearable samples
 2014-10-23 22:05:49 +00:00
John Reck
82572cc458 am badac04d: Merge "Add some free zoom to lockHardwareCanvas" into lmp-mr1-dev 
* commit 'badac04dfd445a1fd3e3ecea04815e83fad5226c':
  Add some free zoom to lockHardwareCanvas
 2014-10-23 22:05:40 +00:00
George Mount
890f20e8e8 am 039cc060: am 82fd8428: Merge "Protect against ImageView changing to a null Drawable during Transition." into lmp-mr1-dev 
* commit '039cc060493a88a603cc8f3224a9ac2fa31908be':
  Protect against ImageView changing to a null Drawable during Transition.
 2014-10-23 22:04:28 +00:00