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

38635 Commits

Author SHA1 Message Date
Jim Miller
0827369def am 327d056d: am 656d09ed: am 0f6db1e8: Merge "Add DevicePolicyManager flag for fingerprint." into lmp-dev 
* commit '327d056dca4cc804db27ae9591e20c7026cf1bd2':
  Add DevicePolicyManager flag for fingerprint.
 2014-07-20 02:26:01 +00:00
Jim Miller
06e345089a Add DevicePolicyManager flag for fingerprint. 
Change-Id: Icb3e4b98d97487179acefabc7a3b747d3d0fa23a
 2014-07-18 20:48:34 +00:00
Torne (Richard Coles)
8b4cd92852 Load the WebView Java code from an APK. 
Use the WebView APK to load the Java code via createPackageContext.

Bug: 16329371
Change-Id: I1292edab639d85c2027dc8ebb52def8c36d41cde
 2014-07-18 20:11:52 +00:00
Andre Eisenbach
476e81bc0c am d19094c6: am 92adbade: am 99e79902: LE: Add connection parameter update request API (4/4) 
* commit 'd19094c6ec1cb5640f8d75cef55336e4f6284d90':
  LE: Add connection parameter update request API (4/4)
 2014-07-18 19:42:50 +00:00
Andre Eisenbach
6ce4db0acf LE: Add connection parameter update request API (4/4) 
Change-Id: Ifb531a1b7ab05888817b96fcc89f85e17df7ffe2
 2014-07-18 12:13:46 -07:00
Dan Sandler
9d1ebd82ba am d97d02e0: am f9845011: am 7aabcfa3: Merge "Deprecate and stop generating tickerViews." into lmp-dev 
* commit 'd97d02e090ee86675b34416e2be0c5a724790db0':
  Deprecate and stop generating tickerViews.
 2014-07-18 19:05:39 +00:00
Dan Sandler
ca4a8926ef am f4e77806: am e7dc5140: am 9b557a25: Merge "Actually show secret notifications sometimes." into lmp-dev 
* commit 'f4e778064b8bfbba3c5a7411f538c8321460d0a6':
  Actually show secret notifications sometimes.
 2014-07-18 19:05:34 +00:00
Brian Attwell
ace692ef6d am 8f17b084: am a08e00c7: am fa15c729: Merge "Mark social APIs stream APIs as deprecated" into lmp-dev 
* commit '8f17b084f9d75c33ed2c5a74f755f37d030f9650':
  Mark social APIs stream APIs as deprecated
 2014-07-18 19:05:29 +00:00
Narayan Kamath
b8b2b59347 am 7de6bafb: am 3b29a424: am 8ebfdcbc: Merge "Fix broken locale related assumptions in TextServicesManager." into lmp-dev 
* commit '7de6bafb551e35ff8972be59d62e13b9dafd9263':
  Fix broken locale related assumptions in TextServicesManager.
 2014-07-18 16:41:35 +00:00
Niels Egberts
a2f65f95d6 am 80f946af: am 9a35945f: am 8fe5ff89: Merge "New TtsSpan builders for types measure, time, date, digits and verbatim." into lmp-dev 
* commit '80f946af928fad7f4f66adc99642e7451d1d5865':
  New TtsSpan builders for types measure, time, date, digits and verbatim.
 2014-07-18 16:03:31 +00:00
Niels Egberts
0ee4208d40 am ebeaf8bb: am 50084b07: am bfe7d019: Merge "Add builders for TtsSpans of type ordinal, decimal and fraction." into lmp-dev 
* commit 'ebeaf8bb6fd8d30f9c1188dbd5d7e405a133796d':
  Add builders for TtsSpans of type ordinal, decimal and fraction.
 2014-07-18 15:40:01 +00:00
Bryan Mawhinney
5afa8111db am 334595b7: am bd7f8215: am d82b7ec9: Merge "Default MediaStyled notifications to CATEGORY_TRANSPORT" into lmp-dev 
* commit '334595b702e533f142f03b1c091e6d144e7f273c':
  Default MediaStyled notifications to CATEGORY_TRANSPORT
 2014-07-18 13:13:46 +00:00
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
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
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
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
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
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
Narayan Kamath
53777b58f3 Merge "Fix broken locale related assumptions in TextServicesManager." into lmp-dev 2014-07-17 19:51:18 +00:00
Narayan Kamath
6648dded69 Fix broken locale related assumptions in TextServicesManager. 
startsWith is a bogus check unless languages match. Also, don't
assume 2 letter languages.

bug: 10090157
Change-Id: I8adda61bddc465aac261c0ce2023fa9606affe1b
 2014-07-18 15:02:34 +01:00
Niels Egberts
6e7c8995dd New TtsSpan builders for types measure, time, date, digits and verbatim. 
Change-Id: I60022aa72c64f454261a0b69c21c45ce6351b9e7
 2014-07-18 16:36:11 +01:00
Niels Egberts
f976abe700 Merge "Add builders for TtsSpans of type ordinal, decimal and fraction." into lmp-dev 2014-07-17 19:45:26 +00:00
Niels Egberts
a896363400 Add builders for TtsSpans of type ordinal, decimal and fraction. 
Also document the possibility to give phone numbers in parts.

Change-Id: Ie1cdf56cc3b6c221c9410fb02dcba2568ea337b7
 2014-07-18 13:43:22 +01:00
Bryan Mawhinney
8a97d9dfc5 Merge "Default MediaStyled notifications to CATEGORY_TRANSPORT" into lmp-dev 2014-07-17 19:45:26 +00:00
Bryan Mawhinney
6be8de36e6 Default MediaStyled notifications to CATEGORY_TRANSPORT 
This makes it easier to identify them later (e.g., for filtering).
The developer can always specify a different category if preferred.

Also fixed some javadoc related to setMediaSession()

Change-Id: I5f28514758218ff66fdbaa9fd37ccb19f12d4852
 2014-07-18 10:35:12 +01:00
Dan Sandler
2083deb8f9 Merge "Actually show secret notifications sometimes." into lmp-dev 2014-07-17 19:26:18 +00:00
Dan Sandler
1b71878e4e Actually show secret notifications sometimes. 
Factor out the "should we be hiding sensitive data"
predicate so we get it right everywhere.

Show visibility stuff in Notification.toString().

Bug: 16307122
Change-Id: Ifd16d073c4595add2ac3582ffc0d0179e55246e5
 2014-07-18 13:37:33 -04:00
Dan Sandler
5598216931 Merge "Deprecate and stop generating tickerViews." into lmp-dev 2014-07-17 19:20:15 +00:00
Dan Sandler
5fcdf6e81d Deprecate and stop generating tickerViews. 
Tickers have been replaced in the UI by heads-up
notifications (and not creating the tickerView will save
memory, almost 150k if you have an xhdpi largeIcon).

Update docs to explain that tickers are just for
accessibility now.

Bug: 16395266
Change-Id: Ib1372b34c1c261f64228bbe705d174675cd007dc
 2014-07-18 12:11:58 -04: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
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
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
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
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