126777 Commits

Author SHA1 Message Date
Craig Mautner
a282441038 Merge "Do not show Home behind full screen activity" 2014-03-27 20:01:11 +00:00
Christopher Tate
5454ac6b37 Merge "Expand install observer semantics" 2014-03-27 19:38:56 +00:00
Christopher Tate
f1977b4500 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
2014-03-27 12:37:47 -07:00
Leon Scroggins
4a857b1d47 Merge "Update framework to use M34 version of Skia." 2014-03-27 19:36:43 +00:00
Selim Cinek
7718fc1291 Fixed crash when setting wallpaper with built in rotation
If an image had a built in rotation, a crash could occur,
when setting it. An example was a panorama image which had
a rotation of 90 degrees

Change-Id: Iede8226dac3a40f08d39a69162eb388e6aba97ec
Bug: 13507421
2014-03-27 19:34:01 +00:00
Scott Main
9ad8a5331c am 9a5c6e68: am 4243710b: am 89f4a546: am 0c933df6: fix bug in code snippet
* commit '9a5c6e6812d3e69fb0f9247a9010918de94a10fe':
  fix bug in code snippet
2014-03-27 19:21:46 +00:00
Scott Main
9a5c6e6812 am 4243710b: am 89f4a546: am 0c933df6: fix bug in code snippet
* commit '4243710bf8b4bf3a0bec9c4cf3b00e4b69651883':
  fix bug in code snippet
2014-03-27 19:17:05 +00:00
Scott Main
4243710bf8 am 89f4a546: am 0c933df6: fix bug in code snippet
* commit '89f4a5463b11f98b62aa9639a99d3f9ca81b92c4':
  fix bug in code snippet
2014-03-27 19:08:23 +00:00
Scott Main
89f4a5463b am 0c933df6: fix bug in code snippet
* commit '0c933df6d09dfb3923e0891028c67249bc8887d5':
  fix bug in code snippet
2014-03-27 19:02:33 +00:00
Scott Main
0c933df6d0 fix bug in code snippet
Change-Id: I98f582d23e5522ef29b9b366bf4a7175eac0bbd5
2014-03-27 11:53:38 -07:00
Adam Lesinski
f7fd00880e Merge "Uses VMRuntime.newUnpaddedArray for ideal array sizes" 2014-03-27 18:53:06 +00:00
Adam Lesinski
776abc24cd Uses VMRuntime.newUnpaddedArray for ideal array sizes
Bug:13028925

Change-Id: I0a9301248b10a339afbdc5e4ffe3310ac4fa1fb7
2014-03-27 11:42:10 -07:00
Colin Cross
1c14c327e8 am c1a7d075: am 232d4224: am f0ffa8a3: Merge "app_process: use LOCAL_MULTILIB := both"
* commit 'c1a7d0758de065da80129baa85f1471e67c7fe21':
  app_process: use LOCAL_MULTILIB := both
2014-03-27 18:29:19 +00:00
Adam Lesinski
350159c65a resolved conflicts for merge of 6984e4f9 to master
Conflicts:
	services/core/java/com/android/server/notification/NotificationManagerService.java

Change-Id: Ief1bf339cf7d75094c9a169264c015b1f286ed63
2014-03-27 18:26:11 +00:00
Colin Cross
c1a7d0758d am 232d4224: am f0ffa8a3: Merge "app_process: use LOCAL_MULTILIB := both"
* commit '232d422405d686eb493b48370a2b2f7c35fe96fb':
  app_process: use LOCAL_MULTILIB := both
2014-03-27 17:36:27 +00:00
Colin Cross
232d422405 am f0ffa8a3: Merge "app_process: use LOCAL_MULTILIB := both"
* commit 'f0ffa8a38e90f64912686833dba9823b251fae57':
  app_process: use LOCAL_MULTILIB := both
2014-03-27 17:30:01 +00:00
Colin Cross
f0ffa8a38e Merge "app_process: use LOCAL_MULTILIB := both" 2014-03-27 17:26:08 +00:00
Selim Cinek
d00e8b5f7c Merge "Improved integration of NotificationStackScroller" 2014-03-27 17:20:42 +00:00
Colin Cross
f130f0aaea 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
2014-03-27 10:20:29 -07:00
Selim Cinek
80a14e5d1b Improved integration of NotificationStackScroller
Quicksettings and clear all buttons now work correctly with
NotificationStackScroller but visuals are still tbd

Change-Id: Ia8a0895f66e0b682f39ac62d92c6b6cfccce2ee2
2014-03-27 18:18:49 +01:00
Adam Lesinski
6984e4f9bb am fc680b89: Merge "Fix a race in NotificationManager with Listeners" into klp-modular-dev
* commit 'fc680b89184fb60cf9a58e81d7f890002310702d':
  Fix a race in NotificationManager with Listeners
2014-03-27 17:18:03 +00:00
Adam Lesinski
fc680b8918 Merge "Fix a race in NotificationManager with Listeners" into klp-modular-dev 2014-03-27 17:11:35 +00:00
John Reck
07b6c552e6 Merge "Async drawing!" 2014-03-27 17:11:31 +00:00
John Reck
668f0e38ef Async drawing!
Change-Id: I7e728356f58af88174328a8c0b90d27b128bfe01
2014-03-27 10:00:04 -07:00
Olivier Gay
d2923266ae Add support for additional international keyboard mappings
Add kcm mapping files for Arabic, Greek, Hebrew, Lithuanian
and Spanish (Latin).

Change-Id: I35cb2a4d6e016c6f565fba05710ba1626452fe68
Signed-off-by: Olivier Gay <ogay@logitech.com>
Signed-off-by: Manuel Carthoblaz <mcarthob@logitech.com>
Signed-off-by: Mathieu Meisser <mmeisser@logitech.com>
2014-03-27 17:49:52 +01:00
Matt Casey
ca04d71853 Merge "Add a mediastore constant for playlists." 2014-03-27 15:43:19 +00:00
Jorim Jaggi
647542736d Fix build.
Change-Id: Ia31e410d1ae0f60f1df7fceea7bf5fd082cc425d
2014-03-27 15:56:54 +01:00
Narayan Kamath
f1efa3eecc Merge "resolved conflicts for merge of 22d07464 to master" 2014-03-27 14:31:24 +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
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
Dan Sandler
a55734aaed Introduce CATEGORY_NOTIFICATION_PREFERENCES.
Allows applications to advertise to the system an Activity
where the user can configure the app's notifications. Will
be used by the Settings app.

Change-Id: Iafe7de79e20046d5655fda3f3a3cba9f5db059c4
2014-03-27 00:34:44 -04: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