126781 Commits

Author SHA1 Message Date
John Reck
668f0e38ef Async drawing!
Change-Id: I7e728356f58af88174328a8c0b90d27b128bfe01
2014-03-27 10:00:04 -07:00
Matt Casey
b59c6c2d6c am ca04d718: Merge "Add a mediastore constant for playlists."
* commit 'ca04d7185369073ca0a291f37ec3680037711d44':
  Add a mediastore constant for playlists.
2014-03-27 15:47:30 +00:00
Matt Casey
ca04d71853 Merge "Add a mediastore constant for playlists." 2014-03-27 15:43:19 +00:00
Jorim Jaggi
e7a93296e9 am 64754273: Fix build.
* commit '647542736d8d5bdc65f500022d87e2646c26204a':
  Fix build.
2014-03-27 15:09:18 +00:00
Jorim Jaggi
647542736d Fix build.
Change-Id: Ia31e410d1ae0f60f1df7fceea7bf5fd082cc425d
2014-03-27 15:56:54 +01:00
Narayan Kamath
19c7777c3e am f1efa3ee: Merge "resolved conflicts for merge of 22d07464 to master"
* commit 'f1efa3eecc720d5920cbb1cf3fc1c4da3252f5a4':
  AArch64: Make frameworks/base code more portable
2014-03-27 14:36:02 +00:00
Narayan Kamath
f1efa3eecc Merge "resolved conflicts for merge of 22d07464 to master" 2014-03-27 14:31:24 +00:00
Selim Cinek
257d5e4ff4 am ddaba436: Merge "Initial implementation of NotificationStackScroller"
* commit 'ddaba4360b86f96307ec88f0d0b145425bc3e128':
  Initial implementation of NotificationStackScroller
2014-03-27 14:30:12 +00:00
Jorim Jaggi
d76950581a am 73581eff: Merge "Move legacy notification processing to Notification.Builder"
* commit '73581effb0b4029961501c6f699e95a9930ea1e6':
  Move legacy notification processing to Notification.Builder
2014-03-27 14:30:09 +00:00
Selim Cinek
ddaba4360b Merge "Initial implementation of NotificationStackScroller" 2014-03-27 14:28:56 +00:00
Jorim Jaggi
73581effb0 Merge "Move legacy notification processing to Notification.Builder" 2014-03-27 14:25:17 +00:00
Narayan Kamath
ecd072161e resolved conflicts for merge of 22d07464 to master
Change-Id: Ic037261eedd6e224938c960d2b4597590c81ed9d
2014-03-27 14:22:47 +00:00
Selim Cinek
67b2260093 Initial implementation of NotificationStackScroller
Change-Id: Ida9a90ca4c9645166794afea8cf0c1d1b7afe1b4
2014-03-27 14:56:07 +01:00
Leon Scroggins
46cb9bdbf5 Update framework to use M34 version of Skia.
These changes are needed due to changes in the Skia API.

Depends on https://googleplex-android-review.git.corp.google.com/#/c/439626/1
(Ic3cf846b74d6f10ec30c477b50fd774cc30ad52c)

BitmapFactory.cpp:
Use SkColorType instead of SkBitmap::Config, where possible.
Call SkBitmap::info() instead of deprecated SkBitmap::asImageInfo().
Remove calls to deprecated SkBitmap::getSize64().

Canvas.cpp:
ColorFilter.cpp:
Matrix.cpp
Remove the deprecated SK_SCALAR_IS_FIXED path. Leave in an else case for
SK_SCALAR_IS_FLOAT, to allow for eventual SK_SCALAR_IS_DOUBLE path.

Graphics.cpp:
Like in BitmapFactory.cpp, use new methods for determining the size of
pixels.

Paint.cpp:
Use more precise SkScalar_ToInt versions of macros.

TextLayoutCache.cpp:
Fix bug in macro definition for HB_SurrogateToUcs4.
Use the new name for SkCreateTypefaceForScriptNG.

android_view_SurfaceControl.cpp:
Replace ScreenshotPixelRef with a Skia pixel ref.

This is a merge from master-skia branch:
https://googleplex-android-review.git.corp.google.com/#/c/430554/
(Ie11503bcefd3883c466279fde5ce147c8a72b452)

Change-Id: Idf15746f93dabeb7862ac02cc6bd925f0dcc68ba
2014-03-27 09:42:17 -04:00
Narayan Kamath
22d074643e resolved conflicts for merge of eaab4df0 to klp-modular-dev-plus-aosp
Change-Id: I871431e5a3ce45a33563ced845e044d37471689b
2014-03-27 12:50:58 +00:00
Narayan Kamath
eaab4df0dd am cd3f60f3: Merge "AArch64: Make frameworks/base code more portable"
* commit 'cd3f60f30366a34b4499aab5a47b622069ba9cd6':
  AArch64: Make frameworks/base code more portable
2014-03-27 12:36:10 +00:00
Narayan Kamath
cd3f60f303 Merge "AArch64: Make frameworks/base code more portable" 2014-03-27 12:30:53 +00:00
Ashok Bhat
f5df700e6c AArch64: Make frameworks/base code more portable
Changes in this patch include

[x] Use %zu for size_t, %zd for ssize_t

[x] Some minor changes have been done to conform with
    standard JNI practice (e.g. use of jint instead of int
    in JNI function prototypes)

Change-Id: Id1aaa7894a7d0b85ac7ecd7b2bfd8cc40374261f
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
2014-03-27 12:30:42 +00:00
Jorim Jaggi
5c2d84675b Move legacy notification processing to Notification.Builder
Bug: 13485610
Change-Id: I5466d3dbc328c77876dc701c17e7a5a06777dbbe
2014-03-27 12:08:55 +01:00
Scott Main
86324987a3 am afd8b17f: am 68d43e27: am b5e754dd: am 8ea583a7: am f9943d0e: Merge "add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29" into
* commit 'afd8b17fa1fc15d06dc4ade7fc365e0a157c9b53':
  add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29
2014-03-27 09:43:00 +00:00
Scott Main
afd8b17fa1 am 68d43e27: am b5e754dd: am 8ea583a7: am f9943d0e: Merge "add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29" into klp-docs
* commit '68d43e275efae8f7b83388ea6fdebbcf5cd1504f':
  add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29
2014-03-27 09:37:47 +00:00
Scott Main
68d43e275e am b5e754dd: am 8ea583a7: am f9943d0e: Merge "add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29" into klp-docs
* commit 'b5e754dd4d8accd0c1500008aa1a6dbf178d33d7':
  add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29
2014-03-27 09:31:08 +00:00
Scott Main
b5e754dd4d am 8ea583a7: am f9943d0e: Merge "add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29" into klp-docs
* commit '8ea583a71aef2f21f833c003a948ca7b1dc32915':
  add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29
2014-03-27 09:24:46 +00:00
Scott Main
8ea583a71a am f9943d0e: Merge "add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29" into klp-docs
* commit 'f9943d0ecf4d3360064a4cec0b1ffd6767db5612':
  add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29
2014-03-27 09:15:18 +00:00
Yevgen Pronenko
0fd4c656d0 Do not show Home behind full screen activity
When ensureActivitiesVisibleLocked goes through foreground activity
stack and reaches non-fullscreen activity, it sets showHomeBehindStack
variable to true.

If there is a fullscreen activity behind, showHomeBehindStack remains
unchanged, which causes Home application to be displayed anyway.
In this case user will see a fullscreen activity and Home activity
simultaneously.

To fix the issue we set showHomeBehindStack to false when we reach
fullscreen activity in the activity stack.

This was made visible by the following commit:
446ef1de8d373c1b017df8d19ebf9a47811fb402

Change-Id: I535c1283a4e26f5cf606375b837d4b7195324af0
2014-03-27 07:54:37 +01:00
Scott Main
f9943d0ecf Merge "add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29" into klp-docs 2014-03-27 06:24:15 +00:00
Scott Main
585d75f7b0 am b6cb5762: am ef179563: am e0c66e73: am 74b821dc: am 09131844: add viewport width override to each landing page and fix link on homepage
* commit 'b6cb5762d1eeb3e0edf65cc4c3ebc177ebee1c42':
  add viewport width override to each landing page and fix link on homepage
2014-03-27 03:44:17 +00:00
Scott Main
b6cb5762d1 am ef179563: am e0c66e73: am 74b821dc: am 09131844: add viewport width override to each landing page and fix link on homepage
* commit 'ef17956363c5d2d1b89edd3d6bbe538fe4e516f3':
  add viewport width override to each landing page and fix link on homepage
2014-03-27 03:39:26 +00:00
Scott Main
ef17956363 am e0c66e73: am 74b821dc: am 09131844: add viewport width override to each landing page and fix link on homepage
* commit 'e0c66e73b45f228a87086257a9aa7c13361f8b18':
  add viewport width override to each landing page and fix link on homepage
2014-03-27 03:32:41 +00:00
Scott Main
e0c66e73b4 am 74b821dc: am 09131844: add viewport width override to each landing page and fix link on homepage
* commit '74b821dce313307584b1abecc2fa8d4da826ff65':
  add viewport width override to each landing page and fix link on homepage
2014-03-27 03:26:45 +00:00
Scott Main
74b821dce3 am 09131844: add viewport width override to each landing page and fix link on homepage
* commit '0913184499e76996baf047ecbcbd2b79e2c92643':
  add viewport width override to each landing page and fix link on homepage
2014-03-27 03:20:34 +00:00
Scott Main
0913184499 add viewport width override to each landing page and fix link on homepage
Change-Id: I54cfd2e5a0f127d26644e126d41c5044729af9c5
2014-03-26 20:10:34 -07:00
Scott Main
039d44114e add the JD docs for the Android Wear docs (delte the HTML versions)
This depends on the following CL that makes this all work with template changes:
I848f442b3bc66ee2fb87db8200df370d13762d29

Change-Id: I6b17db774de6fa8be0bf944516a44ba73b10cabb
2014-03-26 19:23:38 -07:00
Alan Viverette
dd2dd3559f am a5df8067: Make quantum text styles public
* commit 'a5df8067ecf86feafa60ed88f38ae9bfdfa23975':
  Make quantum text styles public
2014-03-27 01:46:08 +00:00
Dianne Hackborn
b79e21a3e7 am 27832b0e: Fix build.
* commit '27832b0e8878e2cc79518b4831cd51afe7ec7235':
  Fix build.
2014-03-27 01:46:05 +00:00
Alan Viverette
e1475d4b43 am 2c5d6d74: Merge "Separate ripple animation logic, remove RevealDrawable"
* commit '2c5d6d742a35885820c33364fec65a7e163fbbf8':
  Separate ripple animation logic, remove RevealDrawable
2014-03-27 01:46:02 +00:00
Matt Casey
0475bcf4ad am a0149568: Merge "Update doc for ACTION_HEADSET_PLUG to mention explicit register."
* commit 'a0149568f2eab12427448fd85cde30dcef1f50b8':
  Update doc for ACTION_HEADSET_PLUG to mention explicit register.
2014-03-27 01:45:59 +00:00
Kenny Root
c911deefe7 am 0072a417: am 1dc1d6b2: am 5b93685a: am 57f2764b: Merge "CertificateChainValidator: initialize TrustManagerFactory"
* commit '0072a417f1672098f3abb6a4b7203463ccea4dd3':
  CertificateChainValidator: initialize TrustManagerFactory
2014-03-27 01:45:56 +00:00
John Hoford
39dc8b8a6c am 49224acd: Merge "add Dynamic Drawable (vector graphics for Icons)"
* commit '49224acd789b2aae60bd0ec03cbf60cb9c712917':
  add Dynamic Drawable (vector graphics for Icons)
2014-03-27 01:45:53 +00:00
Ricardo Cervera
ef45e0c7eb am 2cd84701: am cddd3b15: am bb7bb60a: am e94b79d7: am c5b54aed: Merge "docs: Added info on using HTTPS for the Eclipse ADT update site" into klp-docs
* commit '2cd84701fe3df4ad65fc1c794ba403e6c9d88923':
  docs: Added info on using HTTPS for the Eclipse ADT update site
2014-03-27 01:45:50 +00:00
Scott Main
30ce06096e am 2adb64c9: am e5ec1544: am 6bbfa5b5: am 2556034b: am 322cf5c4: fix image sizes in design guide and code snippet bug bug: 13644390 bug: 13626796
* commit '2adb64c96671bf39bfa74c5416f117afd13f4091':
  fix image sizes in design guide and code snippet bug bug: 13644390 bug: 13626796
2014-03-27 01:45:46 +00:00
Selim Gurun
741fc30de4 am 5632dc1c: Merge "Revert "Support for new gTLDs""
* commit '5632dc1cf0b4bded368dd53ab425e725f37dfeb8':
  Revert "Support for new gTLDs"
2014-03-27 01:45:43 +00:00
Paul Lawrence
c039034b7e am 6ee7d250: Revert "Don\'t prompt at boot if we already did that when decrypting"
* commit '6ee7d25010d4f23b44a151f3953225ba253de8af':
  Revert "Don't prompt at boot if we already did that when decrypting"
2014-03-27 01:45:40 +00:00
quddusc
4ea72fc1a3 am 36d24289: am 52f6988b: am fd95bffc: am ffba20b0: am d43c1300: docs: Fixed url to point to Google Analytics v4 Getting Started guide.
* commit '36d242898bdc39baee6427ce7aded751d43c34d6':
  docs: Fixed url to point to Google Analytics v4 Getting Started guide.
2014-03-27 01:45:37 +00:00
Alan Viverette
a5df8067ec Make quantum text styles public
Change-Id: I6deab6eb712d0910cddf1e8daeddf4737d39ba58
2014-03-26 18:41:14 -07:00
Dianne Hackborn
27832b0e88 Fix build.
And prevent it from breaking again like this.

Change-Id: I68ca200714420ead41bdaa96fe320260ecddb426
2014-03-26 18:12:10 -07:00
Adam Lesinski
e824026554 Fix a race in NotificationManager with Listeners
After being bound to, a NotificationListenerService could
make a call into NotificationManagerService before having been
added to the list of active services.

Bug: 13644375
Change-Id: I4ed920d165f46d009f91e28ca13c3926563cd110
2014-03-26 17:52:54 -07:00
Alan Viverette
2c5d6d742a Merge "Separate ripple animation logic, remove RevealDrawable" 2014-03-27 00:31:53 +00:00
Matt Casey
a0149568f2 Merge "Update doc for ACTION_HEADSET_PLUG to mention explicit register." 2014-03-27 00:20:24 +00:00
Kenny Root
0072a417f1 am 1dc1d6b2: am 5b93685a: am 57f2764b: Merge "CertificateChainValidator: initialize TrustManagerFactory"
* commit '1dc1d6b22deb38d78960f3ce89f94e536610492e':
  CertificateChainValidator: initialize TrustManagerFactory
2014-03-27 00:17:47 +00:00