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

142969 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RoboErik
af74bd8f07 am 2ca51276: Fix crash when calling MediaSession callback 
* commit '2ca512761bb16c2ed2136002d866cc2d7aaf79cb':
  Fix crash when calling MediaSession callback
 2014-07-18 01:43:45 +00:00
RoboErik
ca58ddf7c8 Fix crash when calling MediaSession callback 
bug:16311395
Change-Id: Ice52d2da63933af881dd95fa8c6f59a6fe27e0df
 2014-07-18 01:40:09 +00:00
Marcin Kosiba
297ddeb7f5 am 231d57e2: Add a WebView.zoomBy API. 
* commit '231d57e20d978fda6ace2457d9a5b19ee749f1cb':
  Add a WebView.zoomBy API.
 2014-07-18 01:23:51 +00:00
Marcin Kosiba
3ee06efef3 Add a WebView.zoomBy API. 
The WebView has zoomIn/zoomOut APIs which zoom in/out by a fixed
amount. This adds a more flexible API.

BUG: 13399510
Change-Id: Ia505048d5b1c48f9a3ff1c4ce7129ed2f55804f8
 2014-07-18 02:18:44 +01:00
Zhijun He
f10808ad21 am 93ecc474: Merge "Camera2: partialResultCount should be optional" into lmp-dev 
* commit '93ecc474c3cedc6511bca900590637e68c86aa05':
  Camera2: partialResultCount should be optional
 2014-07-18 01:06:12 +00:00
Jinsuk Kim
3fcc189123 am ba5ba7a2: Merge "Remove system audio output option for HdmiControlService" into lmp-dev 
* commit 'ba5ba7a2408de8a3ac40d3bf0ed18141bee2fada':
  Remove system audio output option for HdmiControlService
 2014-07-18 00:28:16 +00:00
Craig Stout
8d493b5fcc am 51ff3b68: Fix timepicker double done buttons. 
* commit '51ff3b686347d4b0ce638b1556ab47b5c10140be':
  Fix timepicker double done buttons.
 2014-07-17 23:33:44 +00:00
Craig Stout
abdd154334 Fix timepicker double done buttons. 
Leanback theme uses a legacy layout with a done button, but
apps won't necessarily have target apilevel L.

Change-Id: Ib38b08df1fe07bd8fb4e64e93633ce0b7eb12567
 2014-07-17 23:28:48 +00:00
Filip Gruszczynski
3684ed2e21 am 23c51de9: resolved conflicts for merge of bbc49941 to lmp-dev 
* commit '23c51de92cf52f02b7ff014790224199abf2e86a':
  Only use bottom outset for main display.
 2014-07-17 23:24:55 +00:00
Filip Gruszczynski
0048da2114 resolved conflicts for merge of bbc49941 to lmp-dev 
Change-Id: If8e607ab1946c3ca5bb8960d32fdefebbfb21ffe
 2014-07-17 16:20:24 -07:00
John Spurlock
92e2fa75be am d92f55cb: Merge "Shade: Hide status icons, take 2." into lmp-dev 
* commit 'd92f55cb1169c51858152b9787ba5d3e685ae86b':
  Shade: Hide status icons, take 2.
 2014-07-17 23:15:32 +00:00
Christopher Tate
b658954467 am 912793dc: Properly end full restore attempt if getNextFullRestoreDataChunk() fails 
* commit '912793dc95c09d384587195c667958723cac646a':
  Properly end full restore attempt if getNextFullRestoreDataChunk() fails
 2014-07-17 23:04:24 +00:00
Christopher Tate
5f7f252b45 Properly end full restore attempt if getNextFullRestoreDataChunk() fails 
Don't just drop the error return on the floor and retry (forever!).

Change-Id: I5f0ef2d09ea286d813add69517f865e474341b43
 2014-07-17 23:01:04 +00:00
Chris Craik
ae9d625126 am a987914f: Merge "[HWUI]: fix residual line on FrameBuffer" into lmp-dev 
* commit 'a987914f5c43a1651846121e5009a84bb05f87b0':
  [HWUI]: fix residual line on FrameBuffer
 2014-07-17 22:42:29 +00:00
Michael Wright
56e7a6a8ee am 4d2ee15a: Merge "Add MediaProjection APIs." into lmp-dev 
* commit '4d2ee15a7dfe005461b0bdac8f518b283311fcfb':
  Add MediaProjection APIs.
 2014-07-17 22:04:05 +00:00
Ben Murdoch
6eef1cc804 am 015ca040: Merge "Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast." into lmp-dev 
* commit '015ca0408e423d17dbf3b30ffa846ab6b6bd8a7a':
  Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast.
 2014-07-17 21:41:22 +00:00
Ying Wang
ae2458d91c am 252482f4: Fix sdk build. 
* commit '252482f4258a1a3d4d9fc8a86e1b6a891dc11a4f':
  Fix sdk build.
 2014-07-17 21:36:00 +00:00
Ying Wang
4b8aa28ef2 Fix sdk build. 
Change-Id: I9073747f7a12f826fabf99c34dce813edf6462c1
 2014-07-17 14:30:54 -07:00
Michael Wright
c7a845de4a Merge "Add MediaProjection APIs." into lmp-dev 2014-07-17 21:15:46 +00:00
Michael Wright
c39d47a8e7 Add MediaProjection APIs. 
The new MediaProjection infrastructure allows the system to hand out
tokens granting the ability to capture the screen's contents, audio,
etc. at a granular level. It's intended to be used both for screen
casting, via the cast APIs, as well as screen sharing via third party
applications.

The screen sharing case is implemented, but all of audio capturing
is still forthcoming.

Change-Id: I4b24669bed7083e11413c10ed8d6b025f5375316
 2014-07-17 14:30:19 -07:00
Zhijun He
d1d2d43fc0 Merge "Camera2: partialResultCount should be optional" into lmp-dev 2014-07-17 21:09:48 +00:00
Zhijun He
1420de4162 Camera2: partialResultCount should be optional 
Change-Id: Iacd2b5e8f388c18cbff0f1cefdb5c10812ae751e
 2014-07-17 17:45:54 -07:00
Jinsuk Kim
fe61a67bb9 Merge "Remove system audio output option for HdmiControlService" into lmp-dev 2014-07-17 21:07:39 +00:00
destradaa
841566e295 am 607d3271: Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev 
* commit '607d3271089e4874028aca9cfbede38c557961bb':
  Fix exceptions in ActivityRecognition platform stack.
 2014-07-17 21:04:28 +00:00
Craig Stout
643ce7a0cb am 68e9eb34: Fix legacyMode for leanback timepicker 
* commit '68e9eb34d5b35a092ca329d78a5c39f643e390af':
  Fix legacyMode for leanback timepicker
 2014-07-17 20:56:19 +00:00
Craig Stout
f83ccb9647 Fix legacyMode for leanback timepicker 
Change-Id: Idcd9627f330918d8b2de144af28e749c47602769
 2014-07-17 20:50:13 +00:00
Andres Morales
182b3a9dc9 am e9f27df7: Permit settings to "wipe" the persistent partition 
* commit 'e9f27df72263e769ac5325a7523d6f5379c6015a':
  Permit settings to "wipe" the persistent partition
 2014-07-17 20:48:33 +00:00
Andres Morales
963295ea10 Permit settings to "wipe" the persistent partition 
One of the requirements is that when the user does a
factory reset through settings, all data on the
persistent partition should be cleared.

This adds one last API method that allows settings
to wipe the partition.

Bug: 14288780
Change-Id: Ib87ee741d1e5195814516ae1d66eb7c4cf754dcf
 2014-07-17 20:42:04 +00:00
Zhijun He
c788c7624a am 4c6f6ffe: Merge "Camera2: replace partial quirks with normal partial result" into lmp-dev 
* commit '4c6f6ffe214444a4e924d189581e99ba2319b01f':
  Camera2: replace partial quirks with normal partial result
 2014-07-17 20:40:32 +00:00
Andrew Lee
8198cb7deb am 9eb532f5: Merge "Pass through video state when answering a call." into lmp-dev 
* commit '9eb532f594f1ff3c290a92ab9b7bca55176dede3':
  Pass through video state when answering a call.
 2014-07-17 20:24:17 +00:00
Evan Charlton
5b694edaa8 am 58299755: Merge "Plumb through StatusHints change notifications" into lmp-dev 
* commit '58299755075aa3c32c413b54824f3a46321da49f':
  Plumb through StatusHints change notifications
 2014-07-17 20:20:09 +00:00
John Spurlock
7c29da7e35 am d75d1ef0: Merge "QS: Fix crash switching users." into lmp-dev 
* commit 'd75d1ef07c175c8a48a126f4e36172e03c30987c':
  QS: Fix crash switching users.
 2014-07-17 20:02:14 +00:00
Filip Gruszczynski
bbc499415c am a76164e1: Merge "Only use bottom outset for main display." into klp-modular-dev 
* commit 'a76164e1d0d283baf412c18999e680d93bd50f01':
  Only use bottom outset for main display.
 2014-07-17 19:55:27 +00:00
Craig Mautner
34f23f33eb am 20b338d9: Merge "Restore calling identity before checking permission" into lmp-dev 
* commit '20b338d949e6995853f37960241af010db7c8e40':
  Restore calling identity before checking permission
 2014-07-17 19:53:26 +00:00
RoboErik
945dd4e506 am 4e8b237d: Merge "return false for media keys if no controller" into lmp-dev 
* commit '4e8b237d6a97b7c97fded14005723e56c9bb8c19':
  return false for media keys if no controller
 2014-07-17 19:53:23 +00:00
Eino-Ville Talvala
f2d21f054f am 97bc6530: Merge "Add PackageManager features for differentiating camera2 devices" into lmp-dev 
* commit '97bc653093792eb0efb9581d1885e55ccbd0bad9':
  Add PackageManager features for differentiating camera2 devices
 2014-07-17 19:37:57 +00:00
Winson Chung
6d984b8f6e am 3bf3d3c0: Merge "Fixing optimization in Task loading. (Bug 16372369)" into lmp-dev 
* commit '3bf3d3c0a283f086f605b1d9497755d854dc852d':
  Fixing optimization in Task loading. (Bug 16372369)
 2014-07-17 19:37:51 +00:00
Chris Craik
5ff847763b am 8ca30207: Merge "Minor cleanups around color usage" into lmp-dev 
* commit '8ca3020778727ad35f305fb84611c1e43c3c8a92':
  Minor cleanups around color usage
 2014-07-17 19:37:46 +00:00
Chris Craik
ca6c80f508 am 19f0c01c: Merge "Simplify ViewRootImpl\'s AttachInfo usage" into lmp-dev 
* commit '19f0c01cdfae327487497bcc3c2b9e2b2ab628a2':
  Simplify ViewRootImpl's AttachInfo usage
 2014-07-17 19:33:15 +00:00
Amith Yamasani
5ae8e6fe34 am 56e7c4ef: Merge "Split telephony restrictions into outgoing calls and sms" into lmp-dev 
* commit '56e7c4ef6277c573be0f9b1409f875286b79b671':
  Split telephony restrictions into outgoing calls and sms
 2014-07-17 19:21:49 +00:00
John Spurlock
c2d09dd746 Merge "Shade: Hide status icons, take 2." into lmp-dev 2014-07-17 19:20:15 +00:00
John Spurlock
604ae09142 Shade: Hide status icons, take 2. 
Restore visibility logic (for mirrored view) and remove a bad
optimization from the clipping calculation.

Bug:16337935
Change-Id: I7eb82ef6c87f30da9d8b70136e05dab3abdbdead
 2014-07-17 18:22:45 -04:00
Evan Charlton
9c33953e51 Merge "Plumb through StatusHints change notifications" into lmp-dev 2014-07-17 19:20:15 +00:00
Evan Charlton
5b49adea48 Plumb through StatusHints change notifications 
When StatusHints are modified, inform listeners. Also expose two
constants for passing optional strings from the CallService to
the in-call UI.

Bug: 13334257
Bug: 13334252

Change-Id: If7fde7c1ca6940cec8b7232469a22900c36dbb17
 2014-07-17 12:53:39 -07:00
John Spurlock
edbaa7d293 Merge "QS: Fix crash switching users." into lmp-dev 2014-07-17 19:13:40 +00:00
John Spurlock
8b0249da3e QS: Fix crash switching users. 
Bug:16375449
Change-Id: I971c5b043edcffe669c29bbc566b80696b6251b2
 2014-07-17 15:53:32 -04:00
Adam Powell
bf347fdc7a am 21b1b8b9: Add nested pre-fling for nested scrolling 
* commit '21b1b8b9a17d8e32d193a14ec4507448f2f3e20b':
  Add nested pre-fling for nested scrolling
 2014-07-17 18:57:22 +00:00
Adam Powell
b72be59a6a Add nested pre-fling for nested scrolling 
Nested pre-fling allows a nested scrolling parent to consume a fling
operation before the child view does. If a parent has been consuming
nested pre-scroll events in a particular direction, this is generally
a good indication that it should also consume the resulting fling at
the end.

Bug 15538504

Change-Id: I88e8753a96c9b41815c3be530cafab8345164e64
 2014-07-17 11:37:59 -07:00
Joe Fernandez
4130462d52 am aafe9d65: am 64ae9303: am e1e81a9e: am e287cf33: docs: Update ADT-1 page with supported apps 
* commit 'aafe9d65f6c2bc350e2a6c5ab3fe7e2b52d53e2a':
  docs: Update ADT-1 page with supported apps
 2014-07-17 18:20:00 +00:00
John Reck
0d7834b865 am bce422bd: Merge "Fix logging" into lmp-dev 
* commit 'bce422bd8ed6cab40593e2d4b9ccc4fd316b5d47':
  Fix logging
 2014-07-17 18:19:38 +00:00