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

157126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
95aac259de am 9847bcec: am b1183953: am 4ae8b8f3: Merge "docs: Fixing misc minor bugs." into lmp-dev 
* commit '9847bcec66ebea4c655f6144b0cb5c0d01a7f862':
  docs: Fixing misc minor bugs.
 2014-10-24 06:26:28 +00:00
Joe Fernandez
9847bcec66 am b1183953: am 4ae8b8f3: Merge "docs: Fixing misc minor bugs." into lmp-dev 
* commit 'b1183953461319d9ff2919d8ac9cb1bc3e24353b':
  docs: Fixing misc minor bugs.
 2014-10-24 06:13:44 +00:00
Joe Fernandez
b118395346 am 4ae8b8f3: Merge "docs: Fixing misc minor bugs." into lmp-dev 
* commit '4ae8b8f3652ed2382ee5593151ea72b315fb5384':
  docs: Fixing misc minor bugs.
 2014-10-24 06:02:31 +00:00
Joe Fernandez
4ae8b8f365 Merge "docs: Fixing misc minor bugs." into lmp-dev 2014-10-24 05:59:04 +00:00
Takayuki Hoshi
e6ad5f75fc am ee57224c: Merge "Fix a bug where LocationManager\'s addGpsStatusListener does not throw a SecurityException if LocationManagerService.mGpsStatusProvider is null even when ACCESS_FINE_LOCATION permission is not present." into lmp-mr1-dev 
* commit 'ee57224c0f96b4a4e26fe89f40509b32ea4b3602':
  Fix a bug where LocationManager's addGpsStatusListener does not throw a SecurityException if LocationManagerService.mGpsStatusProvider is null even when ACCESS_FINE_LOCATION permission is not present.
 2014-10-24 04:14:20 +00:00
Takayuki Hoshi
ee57224c0f Merge "Fix a bug where LocationManager's addGpsStatusListener does not throw a SecurityException if LocationManagerService.mGpsStatusProvider is null even when ACCESS_FINE_LOCATION permission is not present." into lmp-mr1-dev 2014-10-24 04:02:52 +00:00
Hochi Huang
8659bf1929 am 35658cc4: am 4a7873f1: [FM]Fix FM App record fail Buganizer ID: 17975676 
* commit '35658cc42e381cba50c386464608e546c08a8b55':
  [FM]Fix  FM App record fail Buganizer ID: 17975676
 2014-10-24 03:30:31 +00:00
Hochi Huang
35658cc42e am 4a7873f1: [FM]Fix FM App record fail Buganizer ID: 17975676 
* commit '4a7873f19afecb01ef06b0f3dc4dde0a13a17ab3':
  [FM]Fix  FM App record fail Buganizer ID: 17975676
 2014-10-24 03:17:24 +00:00
Dongwon Kang
d048789aea Merge "TIF: Define more cannonical genres in TvContract" into lmp-mr1-dev 
automerge: f6df7bf

* commit 'f6df7bff53d325e11233bc08fbf5a3f212723b79':
  TIF: Define more cannonical genres in TvContract
 2014-10-24 03:16:55 +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
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
Wonsik Kim
cfc73237e9 Merge "TIF: fix wrong config comparison & confusing method name" into lmp-mr1-dev 2014-10-24 01:34:05 +00: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
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
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
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
John Reck
badac04dfd Merge "Add some free zoom to lockHardwareCanvas" into lmp-mr1-dev 2014-10-23 21:59:26 +00:00
Trevor Johns
2988436b65 am fb28bd15: Merge "Docs: Add TOC page for Wearable samples" into lmp-dev 
* commit 'fb28bd158dd387225bb55e31da60101436e7b13c':
  Docs: Add TOC page for Wearable samples
 2014-10-23 21:52:47 +00:00
George Mount
039cc06049 am 82fd8428: Merge "Protect against ImageView changing to a null Drawable during Transition." into lmp-mr1-dev 
* commit '82fd842827fcdb3570d0c606bd049f42bf2b3fba':
  Protect against ImageView changing to a null Drawable during Transition.
 2014-10-23 21:52:13 +00:00
George Mount
82fd842827 Merge "Protect against ImageView changing to a null Drawable during Transition." into lmp-mr1-dev 2014-10-23 21:46:54 +00:00
Nancy Chen
5fc3863655 Fix build breakage because missing API methods. 
Add new API methods for PhoneAccount. This is because PhoneAccount
recently became public in mr1, but not in sprout.

Bug: 18078388
Change-Id: I0c74d13fa4eb274be499158c19891a5bc6c66464
 2014-10-23 14:37:36 -07:00
Yigit Boyar
f3ab441090 am fa9ed8ca: Merge "Added a generic configuration and theme based cache" into lmp-mr1-dev 
* commit 'fa9ed8ca0a08be0b32b2ccc33563a47df1f6d3da':
  Added a generic configuration and theme based cache
 2014-10-23 21:16:06 +00:00
Yigit Boyar
fa9ed8ca0a Merge "Added a generic configuration and theme based cache" into lmp-mr1-dev 2014-10-23 21:06:24 +00:00