Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
143,836 Commits 3 Branches 0 Tags
25d39bc334e7e1e6be46d85d23aedbfb42eaf91f
Commit Graph

41852 Commits

Author SHA1 Message Date
Jae Seo
c2809b7597 am cdc49c6c: am b719bf57: am 3245f3d7: Merge "TIF: Add TvParentalControlManager" into lmp-dev 
* commit 'cdc49c6c4a9e106b220b29a7da68141489a0d175':
  TIF: Add TvParentalControlManager
 2014-07-18 03:37:10 +00:00
Jae Seo
353bdd484f am b719bf57: am 3245f3d7: Merge "TIF: Add TvParentalControlManager" into lmp-dev 
* commit 'b719bf5720ea501fa6324d866e49e65b59b1a182':
  TIF: Add TvParentalControlManager
 2014-07-18 03:30:41 +00:00
Jeff Brown
33003efada am 843b68d9: am 9560a079: am ce75065c: Merge "Add glance sensor for doze mode." into lmp-dev 
* commit '843b68d94d3a8d4ad1960c905ad41d5cec4d3ccb':
  Add glance sensor for doze mode.
 2014-07-18 03:24:03 +00:00
Marcin Kosiba
b04162ab75 am 6ee098ec: am 8ea71bf3: am 231d57e2: Add a WebView.zoomBy API. 
* commit '6ee098ec1ebc15e8816eebd519fbe90c40c7c90d':
  Add a WebView.zoomBy API.
 2014-07-18 03:18:54 +00:00
Zhijun He
af62909542 am 484bc130: am fb29d478: am 93ecc474: Merge "Camera2: partialResultCount should be optional" into lmp-dev 
* commit '484bc13071781d9401b42043e3ffe277ae512ad3':
  Camera2: partialResultCount should be optional
 2014-07-18 03:18:50 +00:00
Jeff Brown
e048698b4b am 9560a079: am ce75065c: Merge "Add glance sensor for doze mode." into lmp-dev 
* commit '9560a0797de1ce25952c9e8a0b124f49f8cf102e':
  Add glance sensor for doze mode.
 2014-07-18 03:16:58 +00:00
Marcin Kosiba
64fcb8c3f9 am 8ea71bf3: am 231d57e2: Add a WebView.zoomBy API. 
* commit '8ea71bf3c3e3face48160a1de82b9f2a71616c0b':
  Add a WebView.zoomBy API.
 2014-07-18 03:09:31 +00:00
Zhijun He
08da81b41b am fb29d478: am 93ecc474: Merge "Camera2: partialResultCount should be optional" into lmp-dev 
* commit 'fb29d478e9407a6d0dc5b20bb7f2f23ecde4d3da':
  Camera2: partialResultCount should be optional
 2014-07-18 03:09:25 +00:00
Jinsuk Kim
3a96903be4 am 2fa30b74: am eff7b1af: am ba5ba7a2: Merge "Remove system audio output option for HdmiControlService" into lmp-dev 
* commit '2fa30b74b14b07fa83c811da748cf66d48018c4c':
  Remove system audio output option for HdmiControlService
 2014-07-18 02:57:49 +00:00
Craig Stout
c37905b81f am 7a400e30: am 79de62b3: am 51ff3b68: Fix timepicker double done buttons. 
* commit '7a400e3086c33c3c90b188d3ec5e8690be78ce82':
  Fix timepicker double done buttons.
 2014-07-18 02:57:45 +00:00
Jinsuk Kim
90f54bb704 am eff7b1af: am ba5ba7a2: Merge "Remove system audio output option for HdmiControlService" into lmp-dev 
* commit 'eff7b1af6ab496ee64882ad21f1d58269fd37f4a':
  Remove system audio output option for HdmiControlService
 2014-07-18 02:51:28 +00:00
Craig Stout
abe7b54fb5 am 79de62b3: am 51ff3b68: Fix timepicker double done buttons. 
* commit '79de62b38cd94629aa09883120becec6faae2229':
  Fix timepicker double done buttons.
 2014-07-18 02:51:12 +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
Michael Wright
e4da19a9f1 am e9f933cd: am 4d2ee15a: Merge "Add MediaProjection APIs." into lmp-dev 
* commit 'e9f933cd6bdecb96212d5edf9ba54c7c12c46f03':
  Add MediaProjection APIs.
 2014-07-18 00:32:13 +00:00
Ben Murdoch
3aa88cd61a am 5ba41787: am 015ca040: Merge "Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast." into lmp-dev 
* commit '5ba4178783a48d3269e3404a1ba62263afd5932e':
  Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast.
 2014-07-17 23:48:26 +00:00
destradaa
eccc5480a6 am e2383800: am 607d3271: Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev 
* commit 'e23838004e5db510c6e86919b2dcf16e67e3339b':
  Fix exceptions in ActivityRecognition platform stack.
 2014-07-17 23:48:08 +00:00
Andres Morales
f9f7474687 am 77bf359b: am e9f27df7: Permit settings to "wipe" the persistent partition 
* commit '77bf359b2d6b81fc18efe9ab888699df27ab81f9':
  Permit settings to "wipe" the persistent partition
 2014-07-17 23:47:52 +00:00
Zhijun He
3ddb88ecd3 am 3bce0759: am 4c6f6ffe: Merge "Camera2: replace partial quirks with normal partial result" into lmp-dev 
* commit '3bce07590a097d2e904daa549e3083415e3c4051':
  Camera2: replace partial quirks with normal partial result
 2014-07-17 23:47:45 +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
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
Eino-Ville Talvala
aff282506f am 7e6dd457: am 97bc6530: Merge "Add PackageManager features for differentiating camera2 devices" into lmp-dev 
* commit '7e6dd45734c4eb906f20d02d326ee1ee19a55bb9':
  Add PackageManager features for differentiating camera2 devices
 2014-07-17 20:59:30 +00:00
Chris Craik
e7edf9587e am deec48ed: am 19f0c01c: Merge "Simplify ViewRootImpl\'s AttachInfo usage" into lmp-dev 
* commit 'deec48edf40ba4ebdd7bf6cb281b03b0cd8d231e':
  Simplify ViewRootImpl's AttachInfo usage
 2014-07-17 20:59:17 +00:00
Amith Yamasani
74b5b4005b am 562b7f0d: am 56e7c4ef: Merge "Split telephony restrictions into outgoing calls and sms" into lmp-dev 
* commit '562b7f0d1373404682e35bd37c99907d3d94e29a':
  Split telephony restrictions into outgoing calls and sms
 2014-07-17 20:59:12 +00:00
Adam Powell
128beccbe5 am 35b4be8b: am 21b1b8b9: Add nested pre-fling for nested scrolling 
* commit '35b4be8b87452a169cc3f3c55ea4aee37ef2e076':
  Add nested pre-fling for nested scrolling
 2014-07-17 20:58:56 +00:00
Ruben Brunk
e5d53bd1ba am ff8ea9c5: am 0a749af3: Merge "camera2: Fix swapped Face detection commands." into lmp-dev 
* commit 'ff8ea9c5f1a0651bd2230c62e3e6be85ba24fb0e':
  camera2: Fix swapped Face detection commands.
 2014-07-17 20:58:38 +00:00
Christopher Tate
be786a1f69 am 5763ad39: am e78826f6: Add BackupAgent.onRestoreFinished() callback 
* commit '5763ad39f5cb5923b910c7cbd834707f65043bde':
  Add BackupAgent.onRestoreFinished() callback
 2014-07-17 20:58:09 +00:00
Adam Connors
f8904a2b43 am bab7ceaf: am d50ec637: Merge "Create DPM APIs for cross profile callerId" into lmp-dev 
* commit 'bab7ceaf157a81d18ee1404bb6a17c6c05549f5b':
  Create DPM APIs for cross profile callerId
 2014-07-17 20:57:53 +00:00
Niels Egberts
f8f3a34570 am 64b0ebfc: am a66d298e: Merge "TtsSpan builders for each TtsSpan type. DO NOT MERGE" into lmp-dev 
* commit '64b0ebfcf9644c99d70e639eee14536e9f64484f':
  TtsSpan builders for each TtsSpan type. DO NOT MERGE
 2014-07-17 20:57:50 +00:00
Martin Kosiba
0db75fe2b0 am fbb2246c: am 92486999: Allow for appending of resources to an AssetManager. 
* commit 'fbb2246c6d72d98452fcda9b6a79689012eb5614':
  Allow for appending of resources to an AssetManager.
 2014-07-17 20:57:38 +00:00
Alexandra Gherghina
02e130fccf am 14b5a9b4: am dbfd0744: Ads per-user APIs to manage accounts through the AccountManager 
* commit '14b5a9b452d8b47617f5d908778caaf745527fe9':
  Ads per-user APIs to manage accounts through the AccountManager
 2014-07-17 20:57:31 +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
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
Jae Seo
54a4634983 Merge "TIF: Add TvParentalControlManager" into lmp-dev 2014-07-17 18:11:21 +00:00
Jae Seo
6057102dbb TIF: Add TvParentalControlManager 
Each TV input service is now required to query the system whether the
user is allowed to watch the current program before showing it to the
user if the parental control is turned on, which can be checked by
calling TvParentalControlManager.isEnabled(). Whether the TV input
service should block the content or not is determined by invoking
TvParentalControlManager.isRatingBlocked() with the content rating for
the current program. Then the TvParentalControlManager makes a judgment
based on the user blocked ratings stored in the secure settings and
returns the result. If the rating in question turns out to be blocked,
the TV input service must immediately block the content and call this
method with the content rating of the current program to prompt the PIN
verification screen.

Each TV input service also needs to continuously listen to any changes
made to the parental control settings by registering a
TvParentalControlManager.ParentalControlCallback() to the manager and
immediately reevaluate the current program with the new parental control
settings.

Bug: 13172379
Change-Id: I8e1900d4b8d28c56798986d5c3906bd418ab97ac
 2014-07-17 16:29:36 -07:00
Michael Wright
1da8349645 am a2ed68e5: am e9f933cd: am 4d2ee15a: Merge "Add MediaProjection APIs." into lmp-dev 
* commit 'a2ed68e55381450b9259c8399082fd48155b0c64':
  Add MediaProjection APIs.
 2014-07-18 00:37:44 +00:00
Ben Murdoch
faa50c7364 am fe970ad5: am 5ba41787: am 015ca040: Merge "Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast." into lmp-dev 
* commit 'fe970ad538dd830f81889681fb84d4e3e0f6c8f3':
  Update WebViewUpdateService to receive PACKAGE_REPLACED broadcast.
 2014-07-17 23:54:38 +00:00
destradaa
ba3ef85d14 am 4ec6c891: am e2383800: am 607d3271: Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev 
* commit '4ec6c891748475f35966a612abad18a03ddae88a':
  Fix exceptions in ActivityRecognition platform stack.
 2014-07-17 23:54:30 +00:00
Andres Morales
67700b288a am 6108899c: am 77bf359b: am e9f27df7: Permit settings to "wipe" the persistent partition 
* commit '6108899c4b03dc08f58df858d670b1de187bfe71':
  Permit settings to "wipe" the persistent partition
 2014-07-17 23:54:21 +00:00
Zhijun He
96da0ae9c7 am 5cb48006: am 3bce0759: am 4c6f6ffe: Merge "Camera2: replace partial quirks with normal partial result" into lmp-dev 
* commit '5cb480063294ca1f721240465e4e1f92bf1e4a71':
  Camera2: replace partial quirks with normal partial result
 2014-07-17 23:54:17 +00:00
Eino-Ville Talvala
ef33384939 am 9971ee27: am 7e6dd457: am 97bc6530: Merge "Add PackageManager features for differentiating camera2 devices" into lmp-dev 
* commit '9971ee27026b799f7e09fabd53ba07c5b43bfd93':
  Add PackageManager features for differentiating camera2 devices
 2014-07-17 21:06:22 +00:00
Chris Craik
a4ca835624 am a383d6e3: am deec48ed: am 19f0c01c: Merge "Simplify ViewRootImpl\'s AttachInfo usage" into lmp-dev 
* commit 'a383d6e3a23cb97b5102a75b6ac9010ee170cb43':
  Simplify ViewRootImpl's AttachInfo usage
 2014-07-17 21:06:10 +00:00
Amith Yamasani
68265b0740 am 840e1535: am 562b7f0d: am 56e7c4ef: Merge "Split telephony restrictions into outgoing calls and sms" into lmp-dev 
* commit '840e1535b9e607be177241552a08ac2b1cb236d6':
  Split telephony restrictions into outgoing calls and sms
 2014-07-17 21:06:05 +00:00
Adam Powell
f8c8fc4c27 am 702f8297: am 35b4be8b: am 21b1b8b9: Add nested pre-fling for nested scrolling 
* commit '702f82972600b6b78d5fee1d2511488ad405a1b1':
  Add nested pre-fling for nested scrolling
 2014-07-17 21:06:00 +00:00
Ruben Brunk
f89631e1d8 am b66e3aae: am ff8ea9c5: am 0a749af3: Merge "camera2: Fix swapped Face detection commands." into lmp-dev 
* commit 'b66e3aae34e2ad9a5a6b9b5904f1ca4ebc101a73':
  camera2: Fix swapped Face detection commands.
 2014-07-17 21:05:47 +00:00
Christopher Tate
4cbb4469e6 am 0c3679f4: am 5763ad39: am e78826f6: Add BackupAgent.onRestoreFinished() callback 
* commit '0c3679f423006976766c8eafbc78d7c3702990d5':
  Add BackupAgent.onRestoreFinished() callback
 2014-07-17 21:05:25 +00:00
Adam Connors
fd259886cd am 23439bb9: am bab7ceaf: am d50ec637: Merge "Create DPM APIs for cross profile callerId" into lmp-dev 
* commit '23439bb9f3edcd2191aff79d57018ddaf2d74847':
  Create DPM APIs for cross profile callerId
 2014-07-17 21:05:08 +00:00