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

199245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Mount
8af7848355 Merge "Limit shared element transition to shared elements and children." into mnc-dev 2015-06-15 19:43:57 +00:00
Vladislav Kaznacheev
0021d3fa13 Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into mnc-dev 2015-06-15 19:43:13 +00:00
Adam Powell
b05ef5e4ef am 417018f2: Merge "Only read foreground attr for FrameLayouts for targetSdkVersion < M" into mnc-dev 
* commit '417018f21b85426eb787a462377d83feadc816e9':
  Only read foreground attr for FrameLayouts for targetSdkVersion < M
 2015-06-15 19:38:03 +00:00
Jason Monk
3f37869c89 am 02b0a574: Merge "Only re-register callbacks if tuning changed" into mnc-dev 
* commit '02b0a574dbcfb804306c6d010f610c241cf66e09':
  Only re-register callbacks if tuning changed
 2015-06-15 19:38:00 +00:00
Jason Monk
1e9c43cec4 am 31f10b93: am efd79414: Merge "Fix EmergencyCallback in NetworkController" into mnc-dev 
* commit '31f10b935d6c517c5304dcda61107e2b038dd153':
  Fix EmergencyCallback in NetworkController
 2015-06-15 19:37:19 +00:00
Dianne Hackborn
d5111d46d6 am 4169b628: am 285cb414: Merge "Fix issue #21813831: Need API for asking to be added to power whitelist" into mnc-dev 
* commit '4169b6282f78a8027cc0e4c2f3ca4f0f05c57d08':
  Fix issue #21813831: Need API for asking to be added to power whitelist
 2015-06-15 19:37:15 +00:00
Yorke Lee
107c4ce2ac Send broadcast when default dialer changes 
Add hidden TelecomManager.setDefaultDialer for system apps
to set the default dialer and trigger the broadcast

Bug: 21846308
Change-Id: Ifdd30cd1323ab0157edf7fd966173b6c52df6ba0
 2015-06-15 12:36:09 -07:00
Jason Monk
31f10b935d am efd79414: Merge "Fix EmergencyCallback in NetworkController" into mnc-dev 
* commit 'efd79414bb4bfd546782bf3027127b36d59bff83':
  Fix EmergencyCallback in NetworkController
 2015-06-15 19:28:15 +00:00
Dianne Hackborn
4169b6282f am 285cb414: Merge "Fix issue #21813831: Need API for asking to be added to power whitelist" into mnc-dev 
* commit '285cb414eaab8543f6c857357849bfcf24b5974f':
  Fix issue #21813831: Need API for asking to be added to power whitelist
 2015-06-15 19:28:10 +00:00
Adam Powell
417018f21b Merge "Only read foreground attr for FrameLayouts for targetSdkVersion < M" into mnc-dev 2015-06-15 19:25:21 +00:00
Jason Monk
02b0a574db Merge "Only re-register callbacks if tuning changed" into mnc-dev 2015-06-15 19:24:11 +00:00
Jason Monk
f3d1715cc9 Only re-register callbacks if tuning changed 
We only need to get the state if the tuning has actually changed.
Currently we hit this every time we open QS which breaks the alpha
animation on the mobile icon.

Bug: 21791609
Change-Id: I3d77a2d0f81d2d7bed600ccd7a2d2c2b4a262db7
 2015-06-15 15:20:24 -04:00
Jason Monk
efd79414bb Merge "Fix EmergencyCallback in NetworkController" into mnc-dev 2015-06-15 19:16:37 +00:00
Dianne Hackborn
285cb414ea Merge "Fix issue #21813831: Need API for asking to be added to power whitelist" into mnc-dev 2015-06-15 19:12:17 +00:00
Dianne Hackborn
1958e5e787 Fix issue #21813831: Need API for asking to be added to power whitelist 
Add the API.  Clean up a few related things.

Change-Id: I190adad1812f36f6095b98a1001fedb94874e8b5
 2015-06-15 11:53:59 -07:00
Alan Viverette
61c9ca8e9d am 36884392: am 2d4dc8db: Merge "Obtain handler from context in CaptioningManager" into mnc-dev 
* commit '3688439287948303ad0652df69565168f4c7f2bf':
  Obtain handler from context in CaptioningManager
 2015-06-15 18:27:47 +00:00
Alan Viverette
3688439287 am 2d4dc8db: Merge "Obtain handler from context in CaptioningManager" into mnc-dev 
* commit '2d4dc8db64d0f75e530451acb2c0bea97b9264ff':
  Obtain handler from context in CaptioningManager
 2015-06-15 18:19:01 +00:00
Christopher Tate
6e41605982 am ee5b89ac: am f63655e4: Merge "Use HTTPS when fetching app link verification resources" into mnc-dev 
* commit 'ee5b89ac786178ea41b1a470a8bd958872fd06b3':
  Use HTTPS when fetching app link verification resources
 2015-06-15 18:15:53 +00:00
Alan Viverette
2d4dc8db64 Merge "Obtain handler from context in CaptioningManager" into mnc-dev 2015-06-15 18:05:11 +00:00
Christopher Tate
ee5b89ac78 am f63655e4: Merge "Use HTTPS when fetching app link verification resources" into mnc-dev 
* commit 'f63655e49fcccd922e8d5f61c67f58bd4a361211':
  Use HTTPS when fetching app link verification resources
 2015-06-15 18:04:08 +00:00
Joseph Wen
45254a8e6d am 7cdd2945: am 6138a43c: Merge "Retry intent verification 3 times before failing." into mnc-dev 
* commit '7cdd2945c5ca65add58882b217ea2729f4e74d3d':
  Retry intent verification 3 times before failing.
 2015-06-15 18:03:26 +00:00
Alex Klyubin
51c3bea1a7 am 33266646: am 1923da34: Merge "Remove EcIesParameterSpec until it\'s needed." into mnc-dev 
* commit '33266646efc91f5217670308af4a692e14132d24':
  Remove EcIesParameterSpec until it's needed.
 2015-06-15 18:03:21 +00:00
Alex Klyubin
897d674976 am d539ea71: am 6ef3d7d2: Merge "Document when self-signed certs have invalid signature." into mnc-dev 
* commit 'd539ea71886190773a1fedf47eb05676c66bc67e':
  Document when self-signed certs have invalid signature.
 2015-06-15 18:03:16 +00:00
Joseph Wen
7cdd2945c5 am 6138a43c: Merge "Retry intent verification 3 times before failing." into mnc-dev 
* commit '6138a43ca9b312014bc9f57c1802180dc88188b2':
  Retry intent verification 3 times before failing.
 2015-06-15 17:57:17 +00:00
Christopher Tate
f63655e49f Merge "Use HTTPS when fetching app link verification resources" into mnc-dev 2015-06-15 17:56:19 +00:00
Alex Klyubin
33266646ef am 1923da34: Merge "Remove EcIesParameterSpec until it\'s needed." into mnc-dev 
* commit '1923da348b28be583cfbb8d6347ece52fc0873ed':
  Remove EcIesParameterSpec until it's needed.
 2015-06-15 17:51:09 +00:00
Alex Klyubin
d539ea7188 am 6ef3d7d2: Merge "Document when self-signed certs have invalid signature." into mnc-dev 
* commit '6ef3d7d283e1e8b7ea848e25306f7696b349c038':
  Document when self-signed certs have invalid signature.
 2015-06-15 17:51:03 +00:00
Joseph Wen
6138a43ca9 Merge "Retry intent verification 3 times before failing." into mnc-dev 2015-06-15 17:50:16 +00:00
Alex Klyubin
1923da348b Merge "Remove EcIesParameterSpec until it's needed." into mnc-dev 2015-06-15 17:45:48 +00:00
Alex Klyubin
6ef3d7d283 Merge "Document when self-signed certs have invalid signature." into mnc-dev 2015-06-15 17:43:47 +00:00
Clara Bayarri
67abeef4dd Add suggested width for Floating Toolbar on large devices 
The default for non-landscape was too small for tablet devices.

Bug: 21846073
Change-Id: Ic5a1dd5bab5c2a1aa08820f885446da29bb73d84
 2015-06-15 18:26:22 +01:00
John Spurlock
1ad5c81321 Fix typo in TtsSpan. 
Change-Id: Ic32f141f0c51ee3bee8fd71464f104ef725de880
 2015-06-15 17:24:57 +00:00
Alex Klyubin
3264599e12 Remove EcIesParameterSpec until it's needed. 
This class was added in Android M to enable us to expose ECIES. ECIES
is not going to happen in Android M. I'm thus removing this unused
class until such time when it's needed.

Bug: 18088752
Change-Id: I16ab1bbd0b4334419c9a8f29d64661c150aa8d32
 2015-06-15 09:55:36 -07:00
Zhijun He
42499640cc Camera2: fix Surface cast issue 
Can not cast an object array directly to a Surface array.

Change-Id: Ie2cb711f9e1ff0fc17d6038992dc3c7af9471ccf
 2015-06-15 09:43:55 -07:00
Yorke Lee
6a09cd7ab7 am 27af6ada: am 31104fbb: Merge "Add adb shell telecom get-system-dialer" into mnc-dev 
* commit '27af6ada0647dfadf1f86fc23fba24d0e38de2f4':
  Add adb shell telecom get-system-dialer
 2015-06-15 16:38:38 +00:00
Geoff Mendal
b00901793e am 316548e3: (-s ours) am 40f7418d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '316548e34476ef75c3ccf8a01366b292927122b6':
  Import translations. DO NOT MERGE
 2015-06-15 16:38:35 +00:00
Yorke Lee
27af6ada06 am 31104fbb: Merge "Add adb shell telecom get-system-dialer" into mnc-dev 
* commit '31104fbb7e109e9fe34a09878e4901761fa39f5d':
  Add adb shell telecom get-system-dialer
 2015-06-15 16:27:23 +00:00
Geoff Mendal
316548e344 am 40f7418d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '40f7418d812200b54fd57459b4b6b317850c1734':
  Import translations. DO NOT MERGE
 2015-06-15 16:27:19 +00:00
Yorke Lee
31104fbb7e Merge "Add adb shell telecom get-system-dialer" into mnc-dev 2015-06-15 16:19:43 +00:00
Geoff Mendal
40f7418d81 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-15 16:15:47 +00:00
Geoff Mendal
60c66b6b7a Import translations. DO NOT MERGE 
Change-Id: I72bd7dadaaf60d676140eedd28f33db15c5bfeb6
Auto-generated-cl: translation import
 2015-06-15 09:14:54 -07:00
Diego Perez
5cec79470e am fa04b7c2: am 898be8bc: am fa794eb0: am 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into lmp-mr1-dev 
* commit 'fa04b7c2798dbb623e9b5e20796ce413feafacfc':
  Fix for shadows on theme editor
 2015-06-15 16:08:42 +00:00
Diego Perez
1b37b928ed am 878d0553: am dc929e28: am 40a216d9: am df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev 
* commit '878d05539fec23c328db83f3327a46415d930ef8':
  Fix GcSnapshot drawInLayer when clipping is used.
 2015-06-15 16:08:37 +00:00
Dirk Dougherty
e84aa5fdcf am 125e1d52: am d2161615: am c6d33420: am 4decc115: Merge "Doc change: move ndk docs jd into main docs tree." into mnc-preview-docs 
* commit '125e1d52d48650809ac7e8a0b5e36170f56006e7':
  Doc change: move ndk docs jd into main docs tree.
 2015-06-15 16:08:27 +00:00
Andrew Solovay
5eca78285b am ccb50a7c: am dba3544f: am ecc50268: am 6243dfd9: Merge "docs: Added AfW videos to "Android for Work" landing page" into mnc-preview-docs 
* commit 'ccb50a7c91c4e4f06e31cf0125c2d7f8ecb477c1':
  docs: Added AfW videos to "Android for Work" landing page
 2015-06-15 16:08:22 +00:00
Rich Slogar
476b6088fe am 2d275916: am 974f0d82: am afb19e27: am 726db0af: Merge "docs: sdk tools 24.3.2 download updates" into mnc-preview-docs 
* commit '2d2759164c56735d76eb4a58793e49a2855b844b':
  docs: sdk tools 24.3.2 download updates
 2015-06-15 16:08:17 +00:00
Diego Perez
7974c9752b am 0e3fb38e: am b39e85af: am ce5a79da: am d717682d: am 5c597c1d: am a8854564: am ce4a9d91: Merge "New custom widgets library" into lmp-mr1-dev 
* commit '0e3fb38eabc7012ec720ddfc97978a4d765e154d':
  New custom widgets library
 2015-06-15 16:08:12 +00:00
Chet Haase
81b0c77320 am 1f81e0bf: am c03fa1ee: Merge "Add isFilterBitmap() overrides where appropriate" into mnc-dev 
* commit '1f81e0bfd4a6be5098054313e91b96cbb7c1d849':
  Add isFilterBitmap() overrides where appropriate
 2015-06-15 16:08:07 +00:00
Diego Perez
dc73fc6d47 am e5d3170d: am 0524e97a: Merge "resolved conflicts for merge of 5a53816b to mnc-dev" into mnc-dev 
* commit 'e5d3170d92add758ceac2167ba0feb81847bc5f3':
  Fix crash when shadowSize is 0
 2015-06-15 16:08:01 +00:00
Jason Monk
9d78fc8d29 am 0c8fd1a1: am 4b8704c9: Merge "Don\'t try to get entries for uninstalled apps." into mnc-dev 
* commit '0c8fd1a154f356ce95b7d029bcaf051b8cee181c':
  Don't try to get entries for uninstalled apps.
 2015-06-15 16:07:56 +00:00