Christoph Studer
5c1a49651b
Merge "SysUI/NoMan: Log clicks on notification buttons" into lmp-mr1-dev
2014-10-24 14:29:20 +00:00
Adrian Roos
e01f4e2738
Merge "Set the right expanded state" into lmp-mr1-dev
2014-10-24 14:19:36 +00:00
Jason Monk
104d2484ec
Merge "Show screen pinning toasts on all users" into lmp-mr1-dev
2014-10-24 13:55:55 +00:00
Jason Monk
ef255fce94
Merge "Fix talkback name of screen pinning button" into lmp-mr1-dev
2014-10-24 13:54:58 +00:00
Adrian Roos
bcd076525c
Add API for querying trusted state
...
Bug: 18084166
Change-Id: Ic755461cc6978943aef4943def93a0e38a1c96c0
2014-10-24 13:59:45 +02:00
Narayan Kamath
fa36b36c8b
Merge "Deprecate more apache-http." into lmp-mr1-dev
2014-10-24 08:58:45 +00:00
Narayan Kamath
7eafd944cd
Merge "Deprecate apache-http." into lmp-mr1-dev
2014-10-24 08:56:56 +00:00
Yuncheol Heo
5b062e07c5
Merge "CEC: Fix apilint errors." into lmp-mr1-dev
2014-10-24 08:48:30 +00:00
Neil Fuller
07ff2f72c8
Merge "Deprecating FloatMath and Time" into lmp-mr1-dev
2014-10-24 08:10:39 +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
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
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
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
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
f6df7bff53
Merge "TIF: Define more cannonical genres in TvContract" into lmp-mr1-dev
2014-10-24 02:24:18 +00:00
Yuncheol Heo
fa7651877f
Merge "CEC: Fix JavaDoc errors." into lmp-mr1-dev
2014-10-24 01:50:38 +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
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
b31868df32
Merge "Remove TODO in TelecomManager." into lmp-mr1-dev
2014-10-23 23:09: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
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
c1d001c334
Merge "Fix build breakage because missing API methods." into lmp-mr1-dev
2014-10-23 22:27:27 +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
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
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
fa9ed8ca0a
Merge "Added a generic configuration and theme based cache" into lmp-mr1-dev
2014-10-23 21:06:24 +00:00