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

138882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Phillips
b59508fce5 Changes to framework for ToT Skia. 
Consists of 3 cherry-pick from changes by robertphillips@google.com
in master-skia:

-----------------------------------------------------------------------

New AndroidPicture wrapper class

Address code review comments & use new SkPictureRecorder::partialReplay
entry point

Addressing code review issues

Switch MakePartialCopy to makePartialCopy

Conflicts:
	core/jni/android/graphics/Picture.cpp

Ie530ab15b3d549f0ecfb0ecc131f9144a7b72a91

Remove AndroidPicture from GraphicsJNI and split into .h and .cpp

-----------------------------------------------------------------------

Fix lingering legacy picture recording behavior
Address code review issues

Iaf870c2c400dbe70dc32d6d445574904f5ea718f

-----------------------------------------------------------------------

Update Android to new SkCanvas::drawPicture interface

As of Skia 9b14f26d (Alter SkCanvas::drawPicture (devirtualize,
take const SkPicture, take pointer) -
https://codereview.chromium.org/313613004) SkCanvas::drawPicture
has an alternate signature. The old entry point is deprecated.

I63395da61ecc3b58bfd2bc094752081f4b2f7535

-----------------------------------------------------------------------

Change-Id: I041133aeb5639abd853370e512acf93870f82aea
 2014-06-11 18:27:48 -04:00
Jorim Jaggi
85a7bb169b am 331b598b: Merge "Fix blank lockscreen." into lmp-preview-dev 
* commit '331b598b261c6e531095b37185739b16bfefdd68':
  Fix blank lockscreen.
 2014-06-11 22:16:53 +00:00
Chris Wren
85fa7722fe am 9abea7a7: Merge "Only post interrupting notifications to the Heads Up." into lmp-preview-dev 
* commit '9abea7a7764e6735c1a37ab5ce45342bbfe56eed':
  Only post interrupting notifications to the Heads Up.
 2014-06-11 22:16:47 +00:00
George Mount
93aa858b7f am f3e9a19c: (-s ours) Merge "DO NOT MERGE Allow enter activity transitions to be delayed until data is ready." into lmp-preview-dev 
* commit 'f3e9a19c53522d478257f2d83255c8878707745e':
  DO NOT MERGE Allow enter activity transitions to be delayed until data is ready.
 2014-06-11 22:16:41 +00:00
Selim Cinek
9f7c624a32 am 634a15af: Merge "Fixed a racecondition which could lead to invisible backgrounds" into lmp-preview-dev 
* commit '634a15aff1d106ae549984e26113f734c016760d':
  Fixed a racecondition which could lead to invisible backgrounds
 2014-06-11 22:16:35 +00:00
Daniel Sandler
1a762874fa am 26bd8885: Clean up progress bars for media & other notifications. 
* commit '26bd8885f044181654bff60acdd1013d254feec7':
  Clean up progress bars for media & other notifications.
 2014-06-11 22:16:30 +00:00
Daniel Sandler
c776997e87 Clean up progress bars for media & other notifications. 
Bug: 15147533
Change-Id: Ib4905203c004232bd7d78fe9fa316aa5688eaaa2
 2014-06-11 13:18:59 +00:00
Jessica Hummel
542588e3ba Update documentation so it meets api requirements 
Change-Id: Ice52dc3d5ecca77f81d3df1b43179c94aece6fef
bug:15023443

Conflicts:
	api/current.txt
	core/java/android/app/admin/DeviceAdminReceiver.java
 2014-06-11 11:37:53 +01:00
Jean-Michel Trivi
5052e78949 Merge "AudioManager: add ability to allocate a new session ID" 2014-06-10 21:49:59 +00:00
Robert Greenwalt
a8580b5fe0 Merge "resolved conflicts for merge of 5192ea2b to master" 2014-06-10 21:49:59 +00:00
Craig Mautner
0aad830d1b am 28084383: am e33010a2: Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev 
* commit '28084383c13660864f75452f99183c377c2798ec':
  Add NO_ANIMATION flag to ActivityView Intents.
 2014-06-11 21:38:49 +00:00
Calin Juravle
9c9777da68 am cdd1fd7a: am b0492d69: am 16719591: Merge "Shrink profiler.start-immediately to fit in the maximum property size" 
* commit 'cdd1fd7a8f88e6d99e773b2fb867dbf1d6c64eb9':
  Shrink profiler.start-immediately to fit in the maximum property size
 2014-06-11 21:38:43 +00:00
Calin Juravle
a48a6fd1f2 am 5fc4e487: am b0f59cdc: am 2f84b69b: Merge "Improved profile.start-immediately comment" 
* commit '5fc4e487420b7730c9eaf2623ff1efd2633daba7':
  Improved profile.start-immediately comment
 2014-06-11 21:38:38 +00:00
Kenny Root
90c392fd2d resolved conflicts for merge of 579ace03 to master 
Change-Id: I461879359824036ec861ad9b5b8804ae814179a9
 2014-06-11 14:31:56 -07:00
Robert Greenwalt
673c910ddd resolved conflicts for merge of 5192ea2b to master 
Change-Id: I011b18d19749cdadfa39fa3b5a41ca9d588d0506
 2014-06-11 13:29:41 -07:00
Robert Ly
e37da759c5 am b1cb5aab: am 748856f2: am a7ddd029: am 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore 
* commit 'b1cb5aabeb68815715eed423f1f9a7edb9a3e938':
  Add documentation for AndroidKeyStore
 2014-06-11 19:33:51 +00:00
Justin Koh
41a2c47e65 am 44195b4f: am 42c53fd6: Merge "Catch OperationUnsupportedException when linkifying using WebView" into klp-modular-dev 
* commit '44195b4f90d035533c879672891e7e169972d95d':
  Catch OperationUnsupportedException when linkifying using WebView
 2014-06-11 19:33:46 +00:00
Justin Koh
69b8b79a4f am 7b9fa3bd: am b7c39cee: Remove WebIconDatabase calls from android.provider.Browser 
* commit '7b9fa3bd11f73bc201a404e8dacf7c02c15290b7':
  Remove WebIconDatabase calls from android.provider.Browser
 2014-06-11 19:33:40 +00:00
Ruben Brunk
ef1b1398e9 fixbuild: Remove 'pinned' attr. 
Needed by ag/481620

BUG: 15523923
BUG: 15473856

Change-Id: I5e8bf417368b60fcc33c80852e12f27b8c580774
 2014-06-11 11:56:58 -07:00
John Spurlock
2d848a7741 am 9641b929: Merge "Brightness slider no longer displays the automatic icon." into lmp-preview-dev 
* commit '9641b929ae730241c37c8da21092cf56230aa05f':
  Brightness slider no longer displays the automatic icon.
 2014-06-11 17:43:49 +00:00
Svetoslav
a43e79cfcd am 6af2b51b: Merge "Accessibility window changes not reported." into lmp-preview-dev 
* commit '6af2b51b3c233d2c9d77282355c798c01a8afba1':
  Accessibility window changes not reported.
 2014-06-11 17:43:42 +00:00
Deepanshu Gupta
9ad11ca07f am e3e1591c: Merge "Remove lxml dependency." into lmp-preview-dev 
* commit 'e3e1591cd8d748ba5da228fe857dd785ec7965a9':
  Remove lxml dependency.
 2014-06-11 17:43:36 +00:00
Deepanshu Gupta
6370c7f554 am fe01ace8: Merge "LayoutLib: Support more ContextThemeWrappers" into lmp-preview-dev 
* commit 'fe01ace8ac5da2c9716a0eb0cb53fdda823b3910':
  LayoutLib: Support more ContextThemeWrappers
 2014-06-11 17:43:32 +00:00
Deepanshu Gupta
3e950680c4 am 0a89c1b0: Merge "LayoutLib: Fix EditText rendering" into lmp-preview-dev 
* commit '0a89c1b00762b404966e32beef1ea9a53e4a8b08':
  LayoutLib: Fix EditText rendering
 2014-06-11 17:43:26 +00:00
Christopher Tate
70c1de2072 am 40c042b8: Merge "Hide the (obsolescent) android.app.maintenance APIs" into lmp-preview-dev 
* commit '40c042b884696d162468d971630c48eebd84475b':
  Hide the (obsolescent) android.app.maintenance APIs
 2014-06-11 17:43:20 +00:00
Lorenzo Colitti
a23f56b95c am 34852095: Merge "Don\'t enable Ethernet on the emulator." into lmp-preview-dev 
* commit '34852095d9148945edc39c2df9513c41998eb55b':
  Don't enable Ethernet on the emulator.
 2014-06-11 17:43:15 +00:00
Craig Mautner
28084383c1 am e33010a2: Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev 
* commit 'e33010a261d881426ce0af9a9e2177137ec3f6b9':
  Add NO_ANIMATION flag to ActivityView Intents.
 2014-06-11 17:42:06 +00:00
Calin Juravle
cdd1fd7a8f am b0492d69: am 16719591: Merge "Shrink profiler.start-immediately to fit in the maximum property size" 
* commit 'b0492d6943fc590c2569dd2fc393db54a73986d3':
  Shrink profiler.start-immediately to fit in the maximum property size
 2014-06-11 17:32:50 +00:00
Calin Juravle
5fc4e48742 am b0f59cdc: am 2f84b69b: Merge "Improved profile.start-immediately comment" 
* commit 'b0f59cdcb4d2205faa3811277163bbf215b68dfc':
  Improved profile.start-immediately comment
 2014-06-11 17:32:40 +00:00
Calin Juravle
b0492d6943 am 16719591: Merge "Shrink profiler.start-immediately to fit in the maximum property size" 
* commit '16719591f4a6b2139b1f3555dcde92d35f488b6a':
  Shrink profiler.start-immediately to fit in the maximum property size
 2014-06-11 17:28:33 +00:00
Calin Juravle
b0f59cdcb4 am 2f84b69b: Merge "Improved profile.start-immediately comment" 
* commit '2f84b69bf5afcf67469704e30866067b770ae786':
  Improved profile.start-immediately comment
 2014-06-11 17:28:29 +00:00
Ruben Brunk
9696db1b8b am ec346985: (-s ours) Merge "DO NOT MERGE: camera2: Disallow shim usage for preview." into lmp-preview-dev 
* commit 'ec3469853d18e18fd383dae691970dc0fb7ee0da':
  DO NOT MERGE: camera2: Disallow shim usage for preview.
 2014-06-11 17:03:20 +00:00
Eino-Ville Talvala
ac4dcf6d90 am bc4b6859: Merge "Camera2: Many docs updates" into lmp-preview-dev 
* commit 'bc4b6859cb12564d7dfe37abffd77465b4be75d0':
  Camera2: Many docs updates
 2014-06-11 17:03:11 +00:00
Robert Greenwalt
d88fb3e670 am bcf103d0: Merge "Apply API review to android.net.Network:" into lmp-preview-dev 
* commit 'bcf103d0ef929669268a76aa72bd90ed9af4d63d':
  Apply API review to android.net.Network:
 2014-06-11 17:03:04 +00:00
Matthew Williams
86c9bb94b8 am d6d72e5b: Merge "Fix battery controller non-fire bug" into lmp-preview-dev 
* commit 'd6d72e5bc4e5659eb06606abce01da80e6d2f2b6':
  Fix battery controller non-fire bug
 2014-06-11 17:02:58 +00:00
Matthew Williams
43c4f41adb am 8e8c1401: Fix build. 
* commit '8e8c140114cb3a4f1cf448c4492c13769738ca12':
  Fix build.
 2014-06-11 17:02:53 +00:00
Jorim Jaggi
dbff68ae1a am d8c7eb63: (-s ours) Merge "DO NOT MERGE: Fix paddings for user switch and status bar icons." into lmp-preview-dev 
* commit 'd8c7eb63a96e65cb0b0587f614e0353c1801f455':
  DO NOT MERGE: Fix paddings for user switch and status bar icons.
 2014-06-11 17:02:46 +00:00
Christopher Tate
0d3c637e8a am 67691d13: Merge "Fix build" into lmp-preview-dev 
* commit '67691d130e89135cc8de4cbe03d82058d9ee45b4':
  Fix build
 2014-06-11 17:02:35 +00:00
Winson Chung
09cb074e0e am 16696cb1: Merge "Updating Recents to make the cards slightly more visible." into lmp-preview-dev 
* commit '16696cb15954020880c9bed85376c4b0814ff19d':
  Updating Recents to make the cards slightly more visible.
 2014-06-11 17:02:29 +00:00
Christopher Tate
0188bee2c5 am d8f71d34: Merge "Out with the old; in with the new" into lmp-preview-dev 
* commit 'd8f71d34c3c7fb161a1586de8edb52161c32d672':
  Out with the old; in with the new
 2014-06-11 17:02:18 +00:00
Jose Lima
acdee87366 am a49ab110: Merge "Make convertToTranslucent a public method in Activity" into lmp-preview-dev 
* commit 'a49ab11049339155c156e0f58bb076396695be75':
  Make convertToTranslucent a public method in Activity
 2014-06-11 17:02:13 +00:00
John Spurlock
d038666f3c am 58b243c3: Merge "Saver: Shared resource update and new settings." into lmp-preview-dev 
* commit '58b243c37e74d45129071ac55128c16160e6fac8':
  Saver: Shared resource update and new settings.
 2014-06-11 17:02:07 +00:00
Craig Mautner
e33010a261 Merge "Add NO_ANIMATION flag to ActivityView Intents." into klp-modular-dev 2014-06-11 08:41:11 +00:00
Griff Hazen
579ace0358 am 9f637d10: Reduce notification service historical archive size to 1 for watches. To remove the memory footprint 
* commit '9f637d10959490c3a28e0f40330e97eb67e954d7':
  Reduce notification service historical archive size to 1 for watches. To remove the memory footprint
 2014-06-11 01:18:36 +00:00
Matthew Williams
46919f3583 Fix build. 
Two tests were breaking the build.

Change-Id: If424a552d3fedb912fa94870b88c60dc3750b69a
 2014-06-10 16:11:08 -07:00
Lorenzo Colitti
5592a725dd Merge "Don't enable Ethernet on the emulator." into lmp-preview-dev 2014-06-10 22:31:57 +00:00
Griff Hazen
9f637d1095 Reduce notification service historical archive size to 1 for watches. 
To remove the memory footprint

Bug: 15536759
Change-Id: I081bd962fef689b5d8ed126208499d56ebf4ae38
 2014-06-10 15:31:48 -07:00
George Mount
4a7c3af299 Merge "Prevent transitions from calling createAnimator for invalid views." 2014-06-10 22:18:15 +00:00
George Mount
208dcade93 Prevent transitions from calling createAnimator for invalid views. 
Bug 15285527

When two transitions affect different views, createAnimator is
on all Transitions for all views. This CL prevents createAnimator
from being called for Transitions that don't target a view.

Change-Id: I3f70a13b4ea38ad4a9b4724db438b40f6e80eafb
 2014-06-11 13:14:32 -07:00
Svetoslav
2f45055618 Merge "Accessibility window changes not reported." into lmp-preview-dev 2014-06-10 22:18:15 +00:00