OSDN Git Service
John Reck [Fri, 18 Apr 2014 03:34:43 +0000 (03:34 +0000)]
Merge "Force a full redraw on surface change"
John Reck [Fri, 18 Apr 2014 03:25:13 +0000 (20:25 -0700)]
Force a full redraw on surface change
Bug:
13913604
Change-Id: Ie90c7ee74cf83358e19d8b4f0bae078540a93a8d
Ricardo Cervera [Fri, 18 Apr 2014 02:03:14 +0000 (02:03 +0000)]
am
fa711a33: am
d09e1bff: am
ed5b8c06: am
6aeea454: Merge "docs: Added the play from search intent. Bug:
13473141." into klp-docs
* commit '
fa711a33be265d1fcd08efd850085615ec66dd89':
docs: Added the play from search intent. Bug:
13473141.
Ricardo Cervera [Fri, 18 Apr 2014 01:59:03 +0000 (01:59 +0000)]
am
d09e1bff: am
ed5b8c06: am
6aeea454: Merge "docs: Added the play from search intent. Bug:
13473141." into klp-docs
* commit '
d09e1bffe412ace61a411873cc8d0a3759540e46':
docs: Added the play from search intent. Bug:
13473141.
Ricardo Cervera [Fri, 18 Apr 2014 01:54:31 +0000 (01:54 +0000)]
am
ed5b8c06: am
6aeea454: Merge "docs: Added the play from search intent. Bug:
13473141." into klp-docs
* commit '
ed5b8c06bbc70facbe553a9ca257a277ac3758ca':
docs: Added the play from search intent. Bug:
13473141.
Ricardo Cervera [Fri, 18 Apr 2014 01:49:50 +0000 (01:49 +0000)]
am
6aeea454: Merge "docs: Added the play from search intent. Bug:
13473141." into klp-docs
* commit '
6aeea4549787ec282d2ca42b8495b87645958fc9':
docs: Added the play from search intent. Bug:
13473141.
Ricardo Cervera [Fri, 18 Apr 2014 01:46:25 +0000 (01:46 +0000)]
Merge "docs: Added the play from search intent. Bug:
13473141." into klp-docs
Michael Kolb [Fri, 18 Apr 2014 01:13:29 +0000 (01:13 +0000)]
am
7d755a6f: Merge branch \'klp-modular-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev-plus-aosp
* commit '
7d755a6f572dfcbe644bf3d92240cc45f8bf7dcc':
jni: binder ptrdiff_t compile issues
Michael Kolb [Fri, 18 Apr 2014 01:00:40 +0000 (18:00 -0700)]
resolved conflict for merge from
d42eeab2 to master
Change-Id: I41bd238f0628110c923b79259de4cd11a783340c
Michael Kolb [Fri, 18 Apr 2014 00:48:20 +0000 (00:48 +0000)]
Merge branch 'klp-modular-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev-plus-aosp
Michael Kolb [Fri, 18 Apr 2014 00:48:13 +0000 (00:48 +0000)]
am
4abbd0a6: Merge "Populate isRound from config.xml to WindowInsets" into klp-modular-dev
* commit '
4abbd0a685cb418eb3cfc1f030d3091ef394a7e3':
Populate isRound from config.xml to WindowInsets
Mark Salyzyn [Fri, 18 Apr 2014 00:47:47 +0000 (00:47 +0000)]
am
7423510c: am
da93c60d: Merge "jni: binder ptrdiff_t compile issues"
* commit '
7423510c5a6a103a77efc36f064ed716f8810b97':
jni: binder ptrdiff_t compile issues
Michael Kolb [Fri, 18 Apr 2014 00:44:35 +0000 (00:44 +0000)]
Merge "Populate isRound from config.xml to WindowInsets" into klp-modular-dev
Mark Salyzyn [Fri, 18 Apr 2014 00:43:36 +0000 (00:43 +0000)]
am
da93c60d: Merge "jni: binder ptrdiff_t compile issues"
* commit '
da93c60d8a5b79f90d44408d992fb532eaaf8fa7':
jni: binder ptrdiff_t compile issues
Selim Cinek [Fri, 18 Apr 2014 00:41:21 +0000 (00:41 +0000)]
Merge "ViewGroup now applies clipBounds to its children"
Mark Salyzyn [Fri, 18 Apr 2014 00:40:01 +0000 (00:40 +0000)]
Merge "jni: binder ptrdiff_t compile issues"
Michael Kolb [Thu, 17 Apr 2014 21:45:29 +0000 (14:45 -0700)]
Populate isRound from config.xml to WindowInsets
Change-Id: I41b3aef1322a7cdccdcbc679eb753e0a1e561fad
Mark Salyzyn [Fri, 18 Apr 2014 00:25:36 +0000 (17:25 -0700)]
jni: binder ptrdiff_t compile issues
Change-Id: Ibdd82479d3f9fb53cf1d6793c4f7353e8f1c3646
John Spurlock [Fri, 18 Apr 2014 00:13:56 +0000 (00:13 +0000)]
Merge "Revert "Fix broken status bar when activity is showing above keyguard""
Christopher Tate [Fri, 18 Apr 2014 00:02:43 +0000 (00:02 +0000)]
Merge "Support per-package lib dirs for bundled apps"
Jianing Wei [Fri, 18 Apr 2014 00:00:11 +0000 (00:00 +0000)]
Merge "Camera2 API: fix wrong logic in handling last frame number."
Christopher Tate [Fri, 11 Apr 2014 00:27:06 +0000 (17:27 -0700)]
Support per-package lib dirs for bundled apps
Bundled apps can now use /system/lib/apkname or /system/lib64/apkname
in addition to the (globally shared) /system/lib and /system/lib64
directories. Note that when an app is updated post hoc the update APK
will look to its normal library install directory in
/data/data/[packagename]/lib, so such updates must include *all*
needed libraries -- the private /system/lib/apkname dir will not be in
the path following such an update.
"apkname" here is the base name of the physical APK that holds the
package's code. For example, if a 32-bit package is resident on disk
as /system/priv-app/SettingsProvider.apk then its app-specific lib
directory will be /system/lib/SettingsProvider
Bug
13170859
Change-Id: Ic44cc75312f33d2f5d402a1c261b2eca3fe8badc
John Spurlock [Thu, 17 Apr 2014 23:45:50 +0000 (23:45 +0000)]
Revert "Fix broken status bar when activity is showing above keyguard"
This reverts commit
25ab3d94387597a24619723df687214320f17e76.
Change-Id: I7dba397a9fe09d70b87ff4e638805c010c192599
Mark Salyzyn [Thu, 17 Apr 2014 23:33:58 +0000 (23:33 +0000)]
am
dc500d2d: am
4037847c: am
73258630: Merge "jni: binder 64-bit compile issues"
* commit '
dc500d2d567b37c620308bc8f0b0928eba4a2f5b':
jni: binder 64-bit compile issues
Stephen Hines [Thu, 17 Apr 2014 23:33:54 +0000 (23:33 +0000)]
am
fc45b664: am
f0aa4cc0: am
a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java objects are written."
* commit '
fc45b664d421553042629d24086a144761c7b5e1':
Fix improper use of JNI_ABORT for operations where Java objects are written.
Mindy Pereira [Thu, 17 Apr 2014 23:33:33 +0000 (23:33 +0000)]
am
03f7f442: am
cb54f978: Merge "Update window alpha at the same time as translating" into klp-modular-dev
* commit '
03f7f44250faea2db0147f43b6699436e540889d':
Update window alpha at the same time as translating
Mark Salyzyn [Thu, 17 Apr 2014 23:22:34 +0000 (23:22 +0000)]
am
4037847c: am
73258630: Merge "jni: binder 64-bit compile issues"
* commit '
4037847c0251a15ea88012a8405d0688c8b1ac53':
jni: binder 64-bit compile issues
Stephen Hines [Thu, 17 Apr 2014 23:22:09 +0000 (23:22 +0000)]
am
f0aa4cc0: am
a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java objects are written."
* commit '
f0aa4cc0f257448f76e9d90b97abf9682e930fbf':
Fix improper use of JNI_ABORT for operations where Java objects are written.
Vinit Deshapnde [Thu, 17 Apr 2014 23:21:25 +0000 (23:21 +0000)]
am
734ccfbc: (-s ours) am
2585e15e: am
72358802: am
45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev
* commit '
734ccfbc7b29a136e09e6a2ae788673fbd52f3b4':
Don't reset country code once it is persisted
Jeff Brown [Thu, 17 Apr 2014 22:59:59 +0000 (22:59 +0000)]
am
18a69b93: am
8e1e4006: Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev
* commit '
18a69b936afa6bdb8c65b6b582989c4dcdac45ee':
Add support for dynamically setting the virtual display surface.
Simon Wilson [Thu, 17 Apr 2014 22:59:55 +0000 (22:59 +0000)]
am
ef059b03: am
3c8bbe24: Check that mRemotePlayer is not null before use
* commit '
ef059b039407610fa00e6463b8354cbcc21b6ee9':
Check that mRemotePlayer is not null before use
Mark Salyzyn [Thu, 17 Apr 2014 22:57:25 +0000 (22:57 +0000)]
am
73258630: Merge "jni: binder 64-bit compile issues"
* commit '
7325863013e5c34d493e4e92ecadf4fea87554e7':
jni: binder 64-bit compile issues
Mindy Pereira [Thu, 17 Apr 2014 22:57:23 +0000 (22:57 +0000)]
am
cb54f978: Merge "Update window alpha at the same time as translating" into klp-modular-dev
* commit '
cb54f978b565459210e80054e95becd1f8cae173':
Update window alpha at the same time as translating
Mindy Pereira [Thu, 17 Apr 2014 22:53:23 +0000 (22:53 +0000)]
Merge "Update window alpha at the same time as translating" into klp-modular-dev
Mark Salyzyn [Thu, 17 Apr 2014 22:52:58 +0000 (22:52 +0000)]
Merge "jni: binder 64-bit compile issues"
Mark Salyzyn [Thu, 17 Apr 2014 22:40:01 +0000 (15:40 -0700)]
jni: binder 64-bit compile issues
Change-Id: I8a3083e7e9389bbb84c2dd061fef059e0595800d
Jason Sams [Thu, 17 Apr 2014 22:34:22 +0000 (22:34 +0000)]
Merge "Unhide RenderScript resize intrinsic"
RoboErik [Thu, 17 Apr 2014 22:13:29 +0000 (22:13 +0000)]
Merge "Add RouteProviders to the new Media APIs"
Jianing Wei [Fri, 11 Apr 2014 16:59:24 +0000 (09:59 -0700)]
Camera2 API: fix wrong logic in handling last frame number.
Change-Id: I23bdceada2460238c1e7fc45524ae491268b4243
Vinit Deshapnde [Thu, 17 Apr 2014 22:03:16 +0000 (22:03 +0000)]
am
2585e15e: am
72358802: am
45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev
* commit '
2585e15ef722c7bd8c320e57ded8ad67da121245':
Don't reset country code once it is persisted
RoboErik [Thu, 20 Mar 2014 20:33:52 +0000 (13:33 -0700)]
Add RouteProviders to the new Media APIs
Compiles and works with OneMedia. This currently is a rough test of
the system for finding, connecting to, and sending messages to routes.
This will just connect to the first route it finds when a request to
open the route picker is made (and disconnect when another request is
made).
Change-Id: I5de5521a079471b9e02664be4654c0591dfd9a6d
Vinit Deshapnde [Thu, 17 Apr 2014 21:57:12 +0000 (21:57 +0000)]
am
72358802: am
45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev
* commit '
72358802d6135c633dd158f44b988e4f4075e6fd':
Don't reset country code once it is persisted
Jeff Brown [Thu, 17 Apr 2014 21:53:34 +0000 (21:53 +0000)]
am
8e1e4006: Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev
* commit '
8e1e40066bae030d6a6e8f3f3f8f69ccd6ec1848':
Add support for dynamically setting the virtual display surface.
Mindy Pereira [Thu, 17 Apr 2014 21:01:04 +0000 (14:01 -0700)]
Update window alpha at the same time as translating
Note: algorithm for alpha per progress may be updated
This is a first pass proof of concept
Change-Id: Ia043200ea737ff9d132e350449e17ba0fde10d65
Jeff Brown [Thu, 17 Apr 2014 21:49:49 +0000 (21:49 +0000)]
Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev
Simon Wilson [Thu, 17 Apr 2014 21:33:44 +0000 (21:33 +0000)]
am
3c8bbe24: Check that mRemotePlayer is not null before use
* commit '
3c8bbe245e7b0f937c36620c1427726fe9de50a6':
Check that mRemotePlayer is not null before use
Simon Wilson [Thu, 17 Apr 2014 21:16:48 +0000 (14:16 -0700)]
Check that mRemotePlayer is not null before use
Bug:
14138829
Change-Id: Ie7ddb54ef3b82b9566ac41d4f0ff335976d3c907
Jason Sams [Thu, 17 Apr 2014 20:52:26 +0000 (13:52 -0700)]
Unhide RenderScript resize intrinsic
Change-Id: I450c83ad00bcb7d999aaf7d4bd7ea88d63ab8fea
Zhijun He [Thu, 17 Apr 2014 20:40:18 +0000 (20:40 +0000)]
Merge "Camera2: Update sync.frameNumber tag"
Zhijun He [Thu, 17 Apr 2014 20:20:21 +0000 (13:20 -0700)]
Camera2: Update sync.frameNumber tag
This is from the type mismapping bug fix in metadata generation.
Change-Id: Icaa9916e00e76b30cdc5688c3d3b7e9cadf84794
Jorim Jaggi [Thu, 17 Apr 2014 19:57:25 +0000 (19:57 +0000)]
Merge "Move bouncer to the bottom, but only on phones."
Jorim Jaggi [Thu, 17 Apr 2014 19:44:53 +0000 (21:44 +0200)]
Move bouncer to the bottom, but only on phones.
Change-Id: Ibe03964a10a8cab9e179ff0618a6ed312c8b1b4a
Jason Sams [Thu, 17 Apr 2014 19:36:40 +0000 (19:36 +0000)]
am
5170476c: am
a4af5726: am
112d1b94: Merge "Add BiCubic resize instrinsic"
* commit '
5170476c5bf470b57616380aa7b15b44e5a24bea':
Add BiCubic resize instrinsic
Baligh Uddin [Thu, 17 Apr 2014 19:36:15 +0000 (19:36 +0000)]
am
177d9b9a: (-s ours) am
b279f527: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
177d9b9a25296d9cbe0f96497a8abf2fe28aa1da':
Import translations. DO NOT MERGE
Griff Hazen [Thu, 17 Apr 2014 19:36:04 +0000 (19:36 +0000)]
am
84f4adc9: Merge commit \'
59dfbb91\' into klp-modular-dev-plus-aosp
* commit '
84f4adc9a5e3cc818ed972dc7fecbafb131a779a':
Fix build [DO NOT MERGE]
Scott Main [Thu, 17 Apr 2014 19:35:31 +0000 (19:35 +0000)]
am
2b7345e4: am
b04f3f74: am
cb38ee51: am
a106923e: Merge "add image itemprop to specify image for search result snippet" into klp-docs
* commit '
2b7345e4e3eaa7fcf2f24ba4d03ae00a265adedc':
add image itemprop to specify image for search result snippet
Ricardo Cervera [Thu, 17 Apr 2014 19:35:20 +0000 (19:35 +0000)]
am
f162266c: am
f64feec2: am
4aa68e97: am
dc9ca02c: docs: Watermark images with easter eggs
* commit '
f162266cc44aa83e6a5b95fc4f629c80cf603416':
docs: Watermark images with easter eggs
Ricardo Cervera [Wed, 2 Apr 2014 00:38:08 +0000 (17:38 -0700)]
docs: Added the play from search intent. Bug:
13473141.
Change-Id: Icf483b5e0446e064b32a782717408484d5806859
Raph Levien [Thu, 17 Apr 2014 19:21:14 +0000 (19:21 +0000)]
Merge changes Ia693f512,If3b7d41f
* changes:
Enable elegant text metrics in Quantum theme
Add elegantTextHeight text appearance attribute
Jorim Jaggi [Thu, 17 Apr 2014 19:08:37 +0000 (19:08 +0000)]
Merge "Fix global screen rotation issue."
Vinit Deshapnde [Thu, 17 Apr 2014 18:59:54 +0000 (18:59 +0000)]
am
45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev
* commit '
45e746766676681e4e191d0b7e521b8b3f6c284c':
Don't reset country code once it is persisted
Vinit Deshapnde [Thu, 17 Apr 2014 18:54:58 +0000 (18:54 +0000)]
Merge "Don't reset country code once it is persisted" into klp-dev
Jorim Jaggi [Thu, 17 Apr 2014 18:36:15 +0000 (20:36 +0200)]
Fix global screen rotation issue.
Bug:
14080683
Change-Id: I0144faafa0e01c14c8c8e6a6c9fc81a10d25f47d
Jorim Jaggi [Thu, 17 Apr 2014 18:23:05 +0000 (18:23 +0000)]
Merge "Fix not being able to unlock SIM PIN."
Stephen Hines [Thu, 17 Apr 2014 18:20:47 +0000 (18:20 +0000)]
am
a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java objects are written."
* commit '
a48985349cb26757b6c4be18acc496ab6d1110e5':
Fix improper use of JNI_ABORT for operations where Java objects are written.
Jorim Jaggi [Thu, 17 Apr 2014 18:17:30 +0000 (20:17 +0200)]
Fix not being able to unlock SIM PIN.
Bug:
14120902
Change-Id: I812d9679000242eabea617ea75cf8355d16926b2
Raph Levien [Mon, 14 Apr 2014 21:38:51 +0000 (14:38 -0700)]
Enable elegant text metrics in Quantum theme
This changes the default quantum theme to use elegant text metrics,
which make use of a bit of extra vertical space to better render complex
scripts. It depends on the new elegantMetrics text attribute being
available.
Change-Id: Ia693f5129057fe8b9a633609c72eef388b988fea
Raph Levien [Mon, 14 Apr 2014 21:11:02 +0000 (14:11 -0700)]
Add elegantTextHeight text appearance attribute
This patch adds an elegantTextHeight text appearance attribute and
plumbs it through to the paint. This attribute selects the elegant
variant of fonts (when appropriate, which is typically Arabic and indic
scripts), and also specifies larger vertical metrics, to avoid clipping.
The intent is for this to be the default for quantum themes, but this
patch doesn't change any default behavior, just adds the attribute.
The larger vertical metrics are applied to top and bottom, but should
not affect line spacing in the common case. Also, with the setting,
metrics are no longer dependent on the font, so setting a custom font
will preserve layout and spacing.
Change-Id: If3b7d41f141deff50ca078f479ca90c2aa07829a
Stephen Hines [Thu, 17 Apr 2014 18:15:37 +0000 (18:15 +0000)]
Merge "Fix improper use of JNI_ABORT for operations where Java objects are written."
Alan Viverette [Thu, 17 Apr 2014 18:06:57 +0000 (18:06 +0000)]
Merge changes Ia2bf4d17,I8242523d
* changes:
Fix alert dialog alignment and touch feedback masking
Fix VectorDrawable states
Vinit Deshapnde [Thu, 17 Apr 2014 18:05:21 +0000 (11:05 -0700)]
Don't reset country code once it is persisted
This change simply ignores resetting of country code by cellular
networks to avoid disconnecting existing wifi connections. It also
defers setting newly found country code until after existing Wifi
connection is torn down.
Also removes some dead code related to resetting of country codes.
Bug:
13894807
Change-Id: Ie2fcfdd4b3be8ba94542772c132fb1acb6a2c683
Leon Scroggins [Thu, 17 Apr 2014 17:25:22 +0000 (17:25 +0000)]
Merge "Call SkShader::isOpaque() to determine opaqueness."
Jason Sams [Thu, 17 Apr 2014 17:07:48 +0000 (17:07 +0000)]
am
a4af5726: am
112d1b94: Merge "Add BiCubic resize instrinsic"
* commit '
a4af5726c4c8c882ca65a049bfa824922609d464':
Add BiCubic resize instrinsic
Chris Craik [Thu, 17 Apr 2014 17:06:22 +0000 (17:06 +0000)]
Merge "Revert "Add convenience methods, to encourage usage of ALL_SAVE_FLAG""
Ji-Hwan Lee [Thu, 17 Apr 2014 17:04:24 +0000 (17:04 +0000)]
Merge "Minor fix to remove verbose logcat output in SyncStorageEngine"
Jason Sams [Thu, 17 Apr 2014 17:02:10 +0000 (17:02 +0000)]
am
112d1b94: Merge "Add BiCubic resize instrinsic"
* commit '
112d1b94ee8456dba16842e6b964eb35aef95818':
Add BiCubic resize instrinsic
George Mount [Thu, 17 Apr 2014 16:51:59 +0000 (16:51 +0000)]
Merge "Split Activity Transitions out of PhoneWindow."
George Mount [Tue, 25 Mar 2014 00:44:36 +0000 (17:44 -0700)]
Split Activity Transitions out of PhoneWindow.
Bug
13622834
Made it possible to use shared elements without making
Views invisible.
Change-Id: I1e85c6bc19e634a9af225ad7f0309b4f003ea462
Chris Craik [Thu, 17 Apr 2014 16:37:23 +0000 (16:37 +0000)]
Revert "Add convenience methods, to encourage usage of ALL_SAVE_FLAG"
This reverts commit
39b7353acacf08a3c0204a9ec122fff420e53310.
Change-Id: I732eab8a2843dd23c86bd1526ec95db5352d39a0
Chris Craik [Thu, 17 Apr 2014 16:31:16 +0000 (16:31 +0000)]
Merge "Deprecate color array drawBitmap methods"
Chris Craik [Thu, 17 Apr 2014 16:30:26 +0000 (16:30 +0000)]
Merge "Add convenience methods, to encourage usage of ALL_SAVE_FLAG"
Robin Lee [Thu, 17 Apr 2014 15:54:53 +0000 (15:54 +0000)]
Merge "Allow ProfileOwner apps to manage app restrictions"
Baligh Uddin [Thu, 17 Apr 2014 15:53:11 +0000 (15:53 +0000)]
am
b279f527: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
b279f5272e2c7554aeab930ba0aabab12efff9e2':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Apr 2014 15:48:52 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:50 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:48 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:45 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:38 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 17 Apr 2014 15:48:36 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:31 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:29 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:22 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Robin Lee [Wed, 9 Apr 2014 15:44:21 +0000 (16:44 +0100)]
Allow ProfileOwner apps to manage app restrictions
Simple wrapper around the UserManager.{get|set}ApplicationRestrictions
APIs. Also added a new Intent to signal to running apps that the set
of restrictions has changed since startup.
Change-Id: Ifd108108a73f87325b499d9de2e1b2aacc59b264
John Spurlock [Thu, 17 Apr 2014 14:38:05 +0000 (14:38 +0000)]
Merge "Interim quick settings update."
John Spurlock [Tue, 15 Apr 2014 20:14:46 +0000 (16:14 -0400)]
Interim quick settings update.
Make existing QS panel available via pulldown from header
(or keyguard status view on keyguard), update the affordances
as a hint.
Don't allow QS to scroll, cap to max rows.
Add scrim over panel to indicate that this is purely temporary.
Bug:
14081801
Bug:
14059974
Change-Id: I166033975cbc44b91f45ee70ea5c7540390670dd
Skia_Android Canary Bot [Wed, 16 Apr 2014 23:06:52 +0000 (19:06 -0400)]
Call SkShader::isOpaque() to determine opaqueness.
It is invalid to call SkShader::getFlags() before calling
SkShader::setContext() - it will always return 0. Instead, call
SkShader::isOpaque().
Change-Id: If35108dc7f0eca55d2ec8466b8a50fd54dfb13a2
Adrian Roos [Thu, 17 Apr 2014 13:54:57 +0000 (13:54 +0000)]
Merge "Fix broken status bar when activity is showing above keyguard"
Adrian Roos [Thu, 17 Apr 2014 13:46:41 +0000 (15:46 +0200)]
Fix broken status bar when activity is showing above keyguard
Bug:
14077213
Change-Id: I5d45fd1780498983995a469d0799e024ca25f3c7
Adrian Roos [Thu, 17 Apr 2014 13:09:41 +0000 (15:09 +0200)]
Make camera affordance fly away
Stop gap measure to differenciate the accepted vs rejected
response of the camera affordance on the lockscreen.
Bug:
14081010
Change-Id: I04d170aa3f07ce5f440fb1d27f7c62ef2a903a03
Griff Hazen [Thu, 17 Apr 2014 09:53:18 +0000 (02:53 -0700)]
Merge commit '
59dfbb91' into klp-modular-dev-plus-aosp
Remove all changes from the merge to stop propagation.
Conflicts:
tools/layoutlib/bridge/src/android/content/res/AssetManager_Delegate.java