OSDN Git Service
Scott Main [Thu, 27 Mar 2014 20:32:32 +0000 (20:32 +0000)]
am
f5f47eab: am
653aa40e: am
7b190e0f: am
22b483ee: am
bbaf11f4: update viewport variable with new underscore format
* commit '
f5f47eab393c8b944c0dcc87fc207b5aa1593151':
update viewport variable with new underscore format
Scott Main [Thu, 27 Mar 2014 20:25:52 +0000 (20:25 +0000)]
am
653aa40e: am
7b190e0f: am
22b483ee: am
bbaf11f4: update viewport variable with new underscore format
* commit '
653aa40ef5d21286382217a36d956213a1018b37':
update viewport variable with new underscore format
Christopher Tate [Thu, 27 Mar 2014 20:25:27 +0000 (20:25 +0000)]
am
450e63af: Merge "Unlinked providers STILL shouldn\'t cause crashes"
* commit '
450e63af4e5e434faef7c0c250ed10a00139eec9':
Unlinked providers STILL shouldn't cause crashes
Craig Mautner [Thu, 27 Mar 2014 20:25:25 +0000 (20:25 +0000)]
am
9410f598: am
723f7bbc: am
7f7ce0f7: am
a2824410: Merge "Do not show Home behind full screen activity"
* commit '
9410f5983b2fab4bac220dab0fab7cde10e6d34a':
Do not show Home behind full screen activity
Christopher Tate [Thu, 27 Mar 2014 20:23:36 +0000 (20:23 +0000)]
Merge "Unlinked providers STILL shouldn't cause crashes"
Christopher Tate [Thu, 27 Mar 2014 20:10:50 +0000 (13:10 -0700)]
Unlinked providers STILL shouldn't cause crashes
Bug
13651057
Change-Id: Id7e5ba521ac3f201b1a44f122358ca5af2929e06
Craig Mautner [Thu, 27 Mar 2014 20:20:49 +0000 (20:20 +0000)]
am
723f7bbc: am
7f7ce0f7: am
a2824410: Merge "Do not show Home behind full screen activity"
* commit '
723f7bbcf34168b216421eee4b7d86199f90de1f':
Do not show Home behind full screen activity
Scott Main [Thu, 27 Mar 2014 20:19:20 +0000 (20:19 +0000)]
am
7b190e0f: am
22b483ee: am
bbaf11f4: update viewport variable with new underscore format
* commit '
7b190e0f1df16346696465c0114179b423afc26d':
update viewport variable with new underscore format
Craig Mautner [Thu, 27 Mar 2014 20:14:13 +0000 (20:14 +0000)]
am
7f7ce0f7: am
a2824410: Merge "Do not show Home behind full screen activity"
* commit '
7f7ce0f71b5f1b5274b0cda190401823508cda1f':
Do not show Home behind full screen activity
Scott Main [Thu, 27 Mar 2014 20:13:59 +0000 (20:13 +0000)]
am
22b483ee: am
bbaf11f4: update viewport variable with new underscore format
* commit '
22b483ee6e029dc9db4ae390b91c449b7977273d':
update viewport variable with new underscore format
Scott Main [Thu, 27 Mar 2014 20:08:17 +0000 (20:08 +0000)]
am
bbaf11f4: update viewport variable with new underscore format
* commit '
bbaf11f42152d03c26ec0dc02061dc93a1feb830':
update viewport variable with new underscore format
Craig Mautner [Thu, 27 Mar 2014 20:07:57 +0000 (20:07 +0000)]
am
a2824410: Merge "Do not show Home behind full screen activity"
* commit '
a282441038b8a82be1b9b6afc41145e5570ce377':
Do not show Home behind full screen activity
Scott Main [Thu, 27 Mar 2014 20:01:56 +0000 (13:01 -0700)]
update viewport variable with new underscore format
Change-Id: I68d9e4a57273d86adb9fa2721dc2ce1dbe3ce937
Craig Mautner [Thu, 27 Mar 2014 20:01:11 +0000 (20:01 +0000)]
Merge "Do not show Home behind full screen activity"
Christopher Tate [Thu, 27 Mar 2014 19:40:23 +0000 (19:40 +0000)]
am
5454ac6b: Merge "Expand install observer semantics"
* commit '
5454ac6b3754685210ac4dd790d24dad70bc2801':
Expand install observer semantics
Leon Scroggins [Thu, 27 Mar 2014 19:40:20 +0000 (19:40 +0000)]
am
4a857b1d: Merge "Update framework to use M34 version of Skia."
* commit '
4a857b1d471a51ed5dc0ad27fb2ab62ab78822e0':
Update framework to use M34 version of Skia.
Christopher Tate [Thu, 27 Mar 2014 19:38:56 +0000 (19:38 +0000)]
Merge "Expand install observer semantics"
Christopher Tate [Mon, 24 Mar 2014 23:25:51 +0000 (16:25 -0700)]
Expand install observer semantics
...and now fail conservatively when two apps both attempt to define
the same permission. Apps signed with the same certificate are
permitted to redefine permissions.
We also finally have a (hidden) interface class for observing package
installation so that we can now rev the interface without breaking
existing callers.
Bug
13551375
Change-Id: Ifa4e59154dcccbb286ee46a35a6f25e4ad0f0f01
Leon Scroggins [Thu, 27 Mar 2014 19:36:43 +0000 (19:36 +0000)]
Merge "Update framework to use M34 version of Skia."
Scott Main [Thu, 27 Mar 2014 19:28:10 +0000 (19:28 +0000)]
am
9ad8a533: am
9a5c6e68: am
4243710b: am
89f4a546: am
0c933df6: fix bug in code snippet
* commit '
9ad8a5331ca5eb6390c702ec57952043b56170bf':
fix bug in code snippet
Scott Main [Thu, 27 Mar 2014 19:21:46 +0000 (19:21 +0000)]
am
9a5c6e68: am
4243710b: am
89f4a546: am
0c933df6: fix bug in code snippet
* commit '
9a5c6e6812d3e69fb0f9247a9010918de94a10fe':
fix bug in code snippet
Scott Main [Thu, 27 Mar 2014 19:17:05 +0000 (19:17 +0000)]
am
4243710b: am
89f4a546: am
0c933df6: fix bug in code snippet
* commit '
4243710bf8b4bf3a0bec9c4cf3b00e4b69651883':
fix bug in code snippet
Scott Main [Thu, 27 Mar 2014 19:08:23 +0000 (19:08 +0000)]
am
89f4a546: am
0c933df6: fix bug in code snippet
* commit '
89f4a5463b11f98b62aa9639a99d3f9ca81b92c4':
fix bug in code snippet
Scott Main [Thu, 27 Mar 2014 19:02:33 +0000 (19:02 +0000)]
am
0c933df6: fix bug in code snippet
* commit '
0c933df6d09dfb3923e0891028c67249bc8887d5':
fix bug in code snippet
Adam Lesinski [Thu, 27 Mar 2014 18:59:10 +0000 (18:59 +0000)]
am
f7fd0088: Merge "Uses VMRuntime.newUnpaddedArray for ideal array sizes"
* commit '
f7fd00880ec0d7c26415b00191d27cface39e3c7':
Uses VMRuntime.newUnpaddedArray for ideal array sizes
Scott Main [Thu, 27 Mar 2014 18:53:38 +0000 (11:53 -0700)]
fix bug in code snippet
Change-Id: I98f582d23e5522ef29b9b366bf4a7175eac0bbd5
Adam Lesinski [Thu, 27 Mar 2014 18:53:06 +0000 (18:53 +0000)]
Merge "Uses VMRuntime.newUnpaddedArray for ideal array sizes"
Adam Lesinski [Fri, 7 Mar 2014 16:30:59 +0000 (11:30 -0500)]
Uses VMRuntime.newUnpaddedArray for ideal array sizes
Bug:
13028925
Change-Id: I0a9301248b10a339afbdc5e4ffe3310ac4fa1fb7
Colin Cross [Thu, 27 Mar 2014 18:30:45 +0000 (18:30 +0000)]
am
1c14c327: am
c1a7d075: am
232d4224: am
f0ffa8a3: Merge "app_process: use LOCAL_MULTILIB := both"
* commit '
1c14c327e8781d843c3b94252db391d1baeec23d':
app_process: use LOCAL_MULTILIB := both
Adam Lesinski [Thu, 27 Mar 2014 18:30:42 +0000 (18:30 +0000)]
am
350159c6: resolved conflicts for merge of
6984e4f9 to master
* commit '
350159c65a52092db04f1b8efce6943f61e50e73':
Fix a race in NotificationManager with Listeners
Colin Cross [Thu, 27 Mar 2014 18:29:19 +0000 (18:29 +0000)]
am
c1a7d075: am
232d4224: am
f0ffa8a3: Merge "app_process: use LOCAL_MULTILIB := both"
* commit '
c1a7d0758de065da80129baa85f1471e67c7fe21':
app_process: use LOCAL_MULTILIB := both
Adam Lesinski [Thu, 27 Mar 2014 18:15:11 +0000 (11:15 -0700)]
resolved conflicts for merge of
6984e4f9 to master
Conflicts:
services/core/java/com/android/server/notification/NotificationManagerService.java
Change-Id: Ief1bf339cf7d75094c9a169264c015b1f286ed63
Colin Cross [Thu, 27 Mar 2014 17:36:27 +0000 (17:36 +0000)]
am
232d4224: am
f0ffa8a3: Merge "app_process: use LOCAL_MULTILIB := both"
* commit '
232d422405d686eb493b48370a2b2f7c35fe96fb':
app_process: use LOCAL_MULTILIB := both
Colin Cross [Thu, 27 Mar 2014 17:30:01 +0000 (17:30 +0000)]
am
f0ffa8a3: Merge "app_process: use LOCAL_MULTILIB := both"
* commit '
f0ffa8a38e90f64912686833dba9823b251fae57':
app_process: use LOCAL_MULTILIB := both
Selim Cinek [Thu, 27 Mar 2014 17:26:40 +0000 (17:26 +0000)]
am
d00e8b5f: Merge "Improved integration of NotificationStackScroller"
* commit '
d00e8b5f7c5ac62f1fa4f6bd8746b57aeb42a8c0':
Improved integration of NotificationStackScroller
Colin Cross [Thu, 27 Mar 2014 17:26:07 +0000 (17:26 +0000)]
Merge "app_process: use LOCAL_MULTILIB := both"
Selim Cinek [Thu, 27 Mar 2014 17:20:41 +0000 (17:20 +0000)]
Merge "Improved integration of NotificationStackScroller"
Colin Cross [Thu, 27 Mar 2014 17:20:29 +0000 (10:20 -0700)]
app_process: use LOCAL_MULTILIB := both
Use LOCAL_MULTILIB := both to build app_process64 instead of
duplicating the build rule.
Also causes PRODUCT_PACKAGES := app_process to install both
versions on 64-bit platforms, as the module names for both
app_process and app_process64 are now app_process.
Change-Id: Ia3c3265d15475771b0cae8bace53b8fbf351c186
Selim Cinek [Thu, 27 Mar 2014 15:58:04 +0000 (16:58 +0100)]
Improved integration of NotificationStackScroller
Quicksettings and clear all buttons now work correctly with
NotificationStackScroller but visuals are still tbd
Change-Id: Ia8a0895f66e0b682f39ac62d92c6b6cfccce2ee2
Adam Lesinski [Thu, 27 Mar 2014 17:18:03 +0000 (17:18 +0000)]
am
fc680b89: Merge "Fix a race in NotificationManager with Listeners" into klp-modular-dev
* commit '
fc680b89184fb60cf9a58e81d7f890002310702d':
Fix a race in NotificationManager with Listeners
John Reck [Thu, 27 Mar 2014 17:17:50 +0000 (17:17 +0000)]
am
07b6c552: Merge "Async drawing!"
* commit '
07b6c552e6243c4f69a9c07ed9a08df78ff6d25e':
Async drawing!
Adam Lesinski [Thu, 27 Mar 2014 17:11:35 +0000 (17:11 +0000)]
Merge "Fix a race in NotificationManager with Listeners" into klp-modular-dev
John Reck [Thu, 27 Mar 2014 17:11:31 +0000 (17:11 +0000)]
Merge "Async drawing!"
John Reck [Wed, 26 Mar 2014 22:10:40 +0000 (15:10 -0700)]
Async drawing!
Change-Id: I7e728356f58af88174328a8c0b90d27b128bfe01
Matt Casey [Thu, 27 Mar 2014 15:46:59 +0000 (15:46 +0000)]
am
ca04d718: Merge "Add a mediastore constant for playlists."
* commit '
ca04d7185369073ca0a291f37ec3680037711d44':
Add a mediastore constant for playlists.
Matt Casey [Thu, 27 Mar 2014 15:43:19 +0000 (15:43 +0000)]
Merge "Add a mediastore constant for playlists."
Jorim Jaggi [Thu, 27 Mar 2014 15:08:52 +0000 (15:08 +0000)]
Jorim Jaggi [Thu, 27 Mar 2014 14:56:54 +0000 (15:56 +0100)]
Fix build.
Change-Id: Ia31e410d1ae0f60f1df7fceea7bf5fd082cc425d
Narayan Kamath [Thu, 27 Mar 2014 14:37:00 +0000 (14:37 +0000)]
am
f1efa3ee: Merge "resolved conflicts for merge of
22d07464 to master"
* commit '
f1efa3eecc720d5920cbb1cf3fc1c4da3252f5a4':
AArch64: Make frameworks/base code more portable
Narayan Kamath [Thu, 27 Mar 2014 14:31:23 +0000 (14:31 +0000)]
Merge "resolved conflicts for merge of
22d07464 to master"
Selim Cinek [Thu, 27 Mar 2014 14:31:01 +0000 (14:31 +0000)]
am
ddaba436: Merge "Initial implementation of NotificationStackScroller"
* commit '
ddaba4360b86f96307ec88f0d0b145425bc3e128':
Initial implementation of NotificationStackScroller
Jorim Jaggi [Thu, 27 Mar 2014 14:30:58 +0000 (14:30 +0000)]
am
73581eff: Merge "Move legacy notification processing to Notification.Builder"
* commit '
73581effb0b4029961501c6f699e95a9930ea1e6':
Move legacy notification processing to Notification.Builder
Selim Cinek [Thu, 27 Mar 2014 14:28:55 +0000 (14:28 +0000)]
Merge "Initial implementation of NotificationStackScroller"
Jorim Jaggi [Thu, 27 Mar 2014 14:25:16 +0000 (14:25 +0000)]
Merge "Move legacy notification processing to Notification.Builder"
Narayan Kamath [Thu, 27 Mar 2014 14:22:47 +0000 (14:22 +0000)]
resolved conflicts for merge of
22d07464 to master
Change-Id: Ic037261eedd6e224938c960d2b4597590c81ed9d
Selim Cinek [Mon, 10 Mar 2014 14:40:16 +0000 (15:40 +0100)]
Initial implementation of NotificationStackScroller
Change-Id: Ida9a90ca4c9645166794afea8cf0c1d1b7afe1b4
Leon Scroggins [Thu, 6 Mar 2014 20:36:39 +0000 (15:36 -0500)]
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
Narayan Kamath [Thu, 27 Mar 2014 12:50:58 +0000 (12:50 +0000)]
resolved conflicts for merge of
eaab4df0 to klp-modular-dev-plus-aosp
Change-Id: I871431e5a3ce45a33563ced845e044d37471689b
Narayan Kamath [Thu, 27 Mar 2014 12:36:10 +0000 (12:36 +0000)]
am
cd3f60f3: Merge "AArch64: Make frameworks/base code more portable"
* commit '
cd3f60f30366a34b4499aab5a47b622069ba9cd6':
AArch64: Make frameworks/base code more portable
Narayan Kamath [Thu, 27 Mar 2014 12:30:53 +0000 (12:30 +0000)]
Merge "AArch64: Make frameworks/base code more portable"
Ashok Bhat [Tue, 25 Mar 2014 20:51:35 +0000 (20:51 +0000)]
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>
Jorim Jaggi [Fri, 21 Mar 2014 16:37:00 +0000 (17:37 +0100)]
Move legacy notification processing to Notification.Builder
Bug:
13485610
Change-Id: I5466d3dbc328c77876dc701c17e7a5a06777dbbe
Scott Main [Thu, 27 Mar 2014 09:43:08 +0000 (09:43 +0000)]
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
Scott Main [Thu, 27 Mar 2014 09:37:47 +0000 (09:37 +0000)]
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
Scott Main [Thu, 27 Mar 2014 09:31:08 +0000 (09:31 +0000)]
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
Scott Main [Thu, 27 Mar 2014 09:24:46 +0000 (09:24 +0000)]
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
Scott Main [Thu, 27 Mar 2014 09:15:18 +0000 (09:15 +0000)]
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
Yevgen Pronenko [Fri, 14 Mar 2014 10:57:06 +0000 (11:57 +0100)]
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
Scott Main [Thu, 27 Mar 2014 06:24:15 +0000 (06:24 +0000)]
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
Scott Main [Thu, 27 Mar 2014 03:44:20 +0000 (03:44 +0000)]
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
Scott Main [Thu, 27 Mar 2014 03:39:26 +0000 (03:39 +0000)]
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
Scott Main [Thu, 27 Mar 2014 03:32:41 +0000 (03:32 +0000)]
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
Scott Main [Thu, 27 Mar 2014 03:26:45 +0000 (03:26 +0000)]
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
Scott Main [Thu, 27 Mar 2014 03:20:34 +0000 (03:20 +0000)]
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
Scott Main [Thu, 27 Mar 2014 03:10:34 +0000 (20:10 -0700)]
add viewport width override to each landing page and fix link on homepage
Change-Id: I54cfd2e5a0f127d26644e126d41c5044729af9c5
Scott Main [Thu, 27 Mar 2014 02:16:27 +0000 (19:16 -0700)]
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
Alan Viverette [Thu, 27 Mar 2014 01:46:14 +0000 (01:46 +0000)]
am
a5df8067: Make quantum text styles public
* commit '
a5df8067ecf86feafa60ed88f38ae9bfdfa23975':
Make quantum text styles public
Alan Viverette [Thu, 27 Mar 2014 01:41:14 +0000 (18:41 -0700)]
Make quantum text styles public
Change-Id: I6deab6eb712d0910cddf1e8daeddf4737d39ba58
Dianne Hackborn [Thu, 27 Mar 2014 01:19:01 +0000 (01:19 +0000)]
Dianne Hackborn [Thu, 27 Mar 2014 01:12:10 +0000 (18:12 -0700)]
Fix build.
And prevent it from breaking again like this.
Change-Id: I68ca200714420ead41bdaa96fe320260ecddb426
Adam Lesinski [Wed, 26 Mar 2014 23:01:00 +0000 (16:01 -0700)]
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
Alan Viverette [Thu, 27 Mar 2014 00:37:59 +0000 (00:37 +0000)]
am
2c5d6d74: Merge "Separate ripple animation logic, remove RevealDrawable"
* commit '
2c5d6d742a35885820c33364fec65a7e163fbbf8':
Separate ripple animation logic, remove RevealDrawable
Alan Viverette [Thu, 27 Mar 2014 00:31:53 +0000 (00:31 +0000)]
Merge "Separate ripple animation logic, remove RevealDrawable"
Matt Casey [Thu, 27 Mar 2014 00:29:18 +0000 (00:29 +0000)]
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.
Kenny Root [Thu, 27 Mar 2014 00:22:09 +0000 (00:22 +0000)]
am
0072a417: am
1dc1d6b2: am
5b93685a: am
57f2764b: Merge "CertificateChainValidator: initialize TrustManagerFactory"
* commit '
0072a417f1672098f3abb6a4b7203463ccea4dd3':
CertificateChainValidator: initialize TrustManagerFactory
John Hoford [Thu, 27 Mar 2014 00:22:05 +0000 (00:22 +0000)]
am
49224acd: Merge "add Dynamic Drawable (vector graphics for Icons)"
* commit '
49224acd789b2aae60bd0ec03cbf60cb9c712917':
add Dynamic Drawable (vector graphics for Icons)
Matt Casey [Thu, 27 Mar 2014 00:20:24 +0000 (00:20 +0000)]
Merge "Update doc for ACTION_HEADSET_PLUG to mention explicit register."
Kenny Root [Thu, 27 Mar 2014 00:17:47 +0000 (00:17 +0000)]
am
1dc1d6b2: am
5b93685a: am
57f2764b: Merge "CertificateChainValidator: initialize TrustManagerFactory"
* commit '
1dc1d6b22deb38d78960f3ce89f94e536610492e':
CertificateChainValidator: initialize TrustManagerFactory
John Hoford [Thu, 27 Mar 2014 00:14:14 +0000 (00:14 +0000)]
Merge "add Dynamic Drawable (vector graphics for Icons)"
Kenny Root [Thu, 27 Mar 2014 00:10:41 +0000 (00:10 +0000)]
am
5b93685a: am
57f2764b: Merge "CertificateChainValidator: initialize TrustManagerFactory"
* commit '
5b93685af37d840e7ef6d415bcfe8a8a4c004032':
CertificateChainValidator: initialize TrustManagerFactory
Matt Casey [Thu, 27 Mar 2014 00:09:56 +0000 (17:09 -0700)]
Add a mediastore constant for playlists.
This is a followup to https://googleplex-android-review.git.corp.google.com/415218
I'm writing this change at the request of elmas@.
Bug:
13657009
Change-Id: I970cc59a33af2162c2488c4ddf628f7a73009cd6
John Hoford [Mon, 24 Feb 2014 23:21:42 +0000 (15:21 -0800)]
add Dynamic Drawable (vector graphics for Icons)
Change-Id: Id44b7f6d1b8dd073b8ed35e2142a380550f2449b
Kenny Root [Wed, 26 Mar 2014 23:59:11 +0000 (23:59 +0000)]
am
57f2764b: Merge "CertificateChainValidator: initialize TrustManagerFactory"
* commit '
57f2764bf104b0fe7b5cd67ad5b2cae9bc8352ed':
CertificateChainValidator: initialize TrustManagerFactory
Ricardo Cervera [Wed, 26 Mar 2014 23:43:46 +0000 (23:43 +0000)]
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
Scott Main [Wed, 26 Mar 2014 23:43:40 +0000 (23:43 +0000)]
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
Selim Gurun [Wed, 26 Mar 2014 23:43:37 +0000 (23:43 +0000)]
am
5632dc1c: Merge "Revert "Support for new gTLDs""
* commit '
5632dc1cf0b4bded368dd53ab425e725f37dfeb8':
Revert "Support for new gTLDs"
Paul Lawrence [Wed, 26 Mar 2014 23:43:32 +0000 (23:43 +0000)]
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"
quddusc [Wed, 26 Mar 2014 23:43:29 +0000 (23:43 +0000)]
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.
Alan Viverette [Wed, 26 Mar 2014 23:43:07 +0000 (16:43 -0700)]
Separate ripple animation logic, remove RevealDrawable
Change-Id: I9d0370cea288e6caf518209b5bc94a66a0f9176f
Christopher Tate [Wed, 26 Mar 2014 23:33:44 +0000 (23:33 +0000)]
am
467a2b7c: Merge "Don\'t crash when handling unlinked widget bindings"
* commit '
467a2b7cec0f5ccf931661befa2e724bd55022ff':
Don't crash when handling unlinked widget bindings