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

165456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
34e4bcfa7b am 469413bd: am 45812860: am 553dd209: Merge "docs: Fixed 404 link in SDK Tools page." into lmp-dev 
* commit '469413bd80d62b4b4aa50ad728eeea117e8aab7e':
  docs: Fixed 404 link in SDK Tools page.
 2014-10-24 06:33:00 +00:00
Yuncheol Heo
2b0da5c4c8 CEC: Fix apilint errors. 
- Change 'protected' to 'package private'.
- Change '@hide' to '{@hide}' for methods which should be still hidden
  for linting.
- Rename addVendorCommandListener to setVendorCommandListener and make sure to be called once.
- Fix the implementation of removeHotplugEventListener().

Bug: 18063669
Change-Id: I5c032736f17bab9518f21596f7adeac2f88ba4c1
 2014-10-24 15:30:48 +09:00
Joe Fernandez
95ddc11bb7 am 20665087: am c53546e9: am 3b6d518e: Merge "docs: Fix hprof-conv location in docs." into lmp-dev 
* commit '206650878455f36bcc6b51984e8fedf141270030':
  docs: Fix hprof-conv location in docs.
 2014-10-24 06:26:33 +00:00
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
f7b6575df8 am 57f1fd19: am cab73381: Merge "docs: Fix typo in search class" into lmp-dev 
* commit '57f1fd1993e59f30aee3b677b9704107d1044400':
  docs: Fix typo in search class
 2014-10-24 06:20:21 +00:00
Joe Fernandez
469413bd80 am 45812860: am 553dd209: Merge "docs: Fixed 404 link in SDK Tools page." into lmp-dev 
* commit '458128603f2a061f59b96fd3c5e92ad974f81089':
  docs: Fixed 404 link in SDK Tools page.
 2014-10-24 06:20:18 +00:00
Joe Fernandez
2066508784 am c53546e9: am 3b6d518e: Merge "docs: Fix hprof-conv location in docs." into lmp-dev 
* commit 'c53546e9c23959531cd7ff6b2cb85e4085208ce0':
  docs: Fix hprof-conv location in docs.
 2014-10-24 06:13:50 +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
57f1fd1993 am cab73381: Merge "docs: Fix typo in search class" into lmp-dev 
* commit 'cab733811554ffcf257ee194a5245521713faf5d':
  docs: Fix typo in search class
 2014-10-24 06:08:43 +00:00
Joe Fernandez
458128603f am 553dd209: Merge "docs: Fixed 404 link in SDK Tools page." into lmp-dev 
* commit '553dd209992ffe9bba1160333762c5f3fa6651b0':
  docs: Fixed 404 link in SDK Tools page.
 2014-10-24 06:08:40 +00:00
Joe Fernandez
0e893eb7ac Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs 2014-10-24 06:06:01 +00:00
Joe Fernandez
c53546e9c2 am 3b6d518e: Merge "docs: Fix hprof-conv location in docs." into lmp-dev 
* commit '3b6d518e79c1045286d2bc368148b44dd1a39bf3':
  docs: Fix hprof-conv location in docs.
 2014-10-24 06:02:35 +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
cab7338115 Merge "docs: Fix typo in search class" into lmp-dev 2014-10-24 06:01:57 +00:00
Joe Fernandez
553dd20999 Merge "docs: Fixed 404 link in SDK Tools page." into lmp-dev 2014-10-24 06:00:56 +00:00
Joe Fernandez
3b6d518e79 Merge "docs: Fix hprof-conv location in docs." into lmp-dev 2014-10-24 06:00:19 +00:00
Joe Fernandez
4ae8b8f365 Merge "docs: Fixing misc minor bugs." into lmp-dev 2014-10-24 05:59:04 +00:00
Takayuki Hoshi
c1e8f471db 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 
automerge: e6ad5f7

* commit 'e6ad5f75fcbbe1555411fe1923d5bb07977877d7':
  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:31: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
2a4425c172 am 35658cc4: am 4a7873f1: [FM]Fix FM App record fail Buganizer ID: 17975676 
automerge: 8659bf1

* commit '8659bf1929ee2cc4b3c7fd8eaa43825b6d069fb1':
  [FM]Fix  FM App record fail Buganizer ID: 17975676
 2014-10-24 03:39:36 +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
Dongwon Kang
27c7a7d06b Merge "TIF: Define more cannonical genres in TvContract" into lmp-mr1-dev automerge: f6df7bf 
automerge: d048789

* commit 'd048789aeaf64779a7062faa3bd806c69652857a':
  TIF: Define more cannonical genres in TvContract
 2014-10-24 03:24:49 +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
Svet Ganov
2916f658c9 Sometimes historical printers not properly ordered. 
We order printers based on past usage. In some cases the ordering
does not work. The reason for that was an incorrect assumption that
the entries in an ArrayMap are ordered in the order they are added.

bug:18109283

Change-Id: Ie367e4ca5e6bd79f335a060074c9211054e3a931
 2014-10-23 20:10:10 -07:00
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