Ricardo Cervera-Navarro
62ee3e9ab6
am 15d1feb0: am fed2c410: am 4874938a: am 84e6bc61: Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs
...
* commit '15d1feb0c183b09877317ea64be4e477bfb7fd3d':
Revert "docs: Watermark images with easter eggs"
2014-04-18 19:19:57 +00:00
Ricardo Cervera
235fd3c9ef
am d5ed804f: am a7b62718: am 974588d1: Merge "docs: Watermarked images for codes that weren\'t found." into klp-docs
...
* commit 'd5ed804f6fcbbdfb26da2289053e15802191aba8':
docs: Watermarked images for codes that weren't found.
2014-04-18 19:16:27 +00:00
Ricardo Cervera-Navarro
15d1feb0c1
am fed2c410: am 4874938a: am 84e6bc61: Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs
...
* commit 'fed2c410ab09de72931bc95380645a62746273bc':
Revert "docs: Watermark images with easter eggs"
2014-04-18 19:16:23 +00:00
Ricardo Cervera
d5ed804f6f
am a7b62718: am 974588d1: Merge "docs: Watermarked images for codes that weren\'t found." into klp-docs
...
* commit 'a7b6271820e464b3aae955013b25f5b04f3ff9e1':
docs: Watermarked images for codes that weren't found.
2014-04-18 19:12:59 +00:00
Ricardo Cervera-Navarro
fed2c410ab
am 4874938a: am 84e6bc61: Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs
...
* commit '4874938ad3fb0d0ab56b24cb18c8943a72559f12':
Revert "docs: Watermark images with easter eggs"
2014-04-18 19:12:53 +00:00
Ricardo Cervera
a7b6271820
am 974588d1: Merge "docs: Watermarked images for codes that weren\'t found." into klp-docs
...
* commit '974588d149812ee5420f55e3fd3182045b1e915b':
docs: Watermarked images for codes that weren't found.
2014-04-18 19:08:09 +00:00
Ricardo Cervera-Navarro
4874938ad3
am 84e6bc61: Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs
...
* commit '84e6bc61c64aa578aed50460f7e4f16d85f81cbb':
Revert "docs: Watermark images with easter eggs"
2014-04-18 19:08:05 +00:00
Ricardo Cervera
974588d149
Merge "docs: Watermarked images for codes that weren't found." into klp-docs
2014-04-18 19:02:04 +00:00
Ricardo Cervera-Navarro
84e6bc61c6
Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs
2014-04-18 19:01:48 +00:00
Ricardo Cervera
453df8e6e3
docs: Watermarked images for codes that weren't found.
...
Details:
Line 84
http://goo.gl/1QTi2T
http://developer.android.com/design/get-started/ui-overview.html
http://developer.android.com/design/media/ui_overview_notifications.png
Line 81
http://goo.gl/bHjQsk
http://developer.android.com/design/style/touch-feedback.html
http://developer.android.com/design/media/touch_feedback_communication.png
Line 76
http://goo.gl/HGUj4v
http://developer.android.com/design/patterns/navigation-drawer.html
http://developer.android.com/design/media/navigation_drawer_titles_icons.png
Line 11
http://goo.gl/yYQniH
http://developer.android.com/design/patterns/selection.html
http://developer.android.com/design/media/selection_adjusting_actions.png
Line 10
http://goo.gl/M2QJa7
http://developer.android.com/design/building-blocks/dialogs.html
http://developer.android.com/design/media/dialogs_examples.png
Change-Id: I5df9288b97a9ca58df9f596ae6624c5c91911b3a
2014-04-18 11:54:03 -07:00
Ricardo Cervera-Navarro
326e4a5907
Revert "docs: Watermark images with easter eggs"
...
This reverts commit dc9ca02c51ecc4468e60c391f8357b5025d6eef1.
Change-Id: Idf4873e2e76d746c227c89c2f84fe44946014752
2014-04-18 18:34:41 +00:00
Kenny Root
3ecaa88d83
am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
...
* commit 'ecb013dbff5e33b95c49015fa375579e055911ae':
Use hidden API to validate APK chains
2014-04-18 18:14:32 +00:00
Ying Wang
40d75a6480
Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."
2014-04-18 18:13:09 +00:00
Kenny Root
ecb013dbff
Merge "Use hidden API to validate APK chains" into jb-dev
2014-04-18 17:12:40 +00:00
Mark Salyzyn
c726f6b537
am b90e504e: am 649da9b5: am 5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH"
...
* commit 'b90e504ec17a7f509521c21f2b937a2ebefaf6ab':
Native Runtime: Add LOG_ID_CRASH
2014-04-18 16:25:59 +00:00
Youngsang Cho
9a22f0f0a6
Add overlay view in Tv Input Framework
...
A TvInputService app developers sometimes want to draw UI above a surface
playing TV. For this purpose, we add a window in TIS and allow developers to
attach their customized view on the TV surface.
Change-Id: I65c3dffa17580b8d4c42fac58bbfc8dad338c185
2014-04-18 08:36:06 -07:00
Mark Salyzyn
b90e504ec1
am 649da9b5: am 5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH"
...
* commit '649da9b505498ff87d75da56d376d46c22e50782':
Native Runtime: Add LOG_ID_CRASH
2014-04-18 15:08:56 +00:00
Mark Salyzyn
649da9b505
am 5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH"
...
* commit '5a47a9f62dd9bcb6573555b7a3ef4b1f5e485fc4':
Native Runtime: Add LOG_ID_CRASH
2014-04-18 15:02:48 +00:00
Mark Salyzyn
5a47a9f62d
Merge "Native Runtime: Add LOG_ID_CRASH"
2014-04-18 14:55:32 +00:00
Selim Gurun
14cd25f619
Merge "Provide an API to set print document name."
2014-04-18 14:49:25 +00:00
John Reck
f29e264049
Merge "Force a full redraw on surface change"
2014-04-18 03:34:44 +00:00
John Reck
dbc9a86d05
Force a full redraw on surface change
...
Bug: 13913604
Change-Id: Ie90c7ee74cf83358e19d8b4f0bae078540a93a8d
2014-04-17 20:27:37 -07:00
Fabrice Di Meglio
8a86d734e5
Improve Preference highlighting
...
- add PreferenceFragment.onBindPreferences() so that we can know
when the binding as been done
- use the Preference's key as a tag for its View (so that we can
locate it latter in the View hierarchy)
Change-Id: Ifb3b30e576048b7464af63643834d278a46a8543
2014-04-17 19:42:05 -07:00
Ricardo Cervera
92f4a3465e
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.
2014-04-18 02:03:14 +00:00
Ricardo Cervera
fa711a33be
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.
2014-04-18 01:59:03 +00:00
Ricardo Cervera
d09e1bffe4
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.
2014-04-18 01:54:31 +00:00
Ricardo Cervera
ed5b8c06bb
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.
2014-04-18 01:49:50 +00:00
Ricardo Cervera
6aeea45497
Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs
2014-04-18 01:46:25 +00:00
Ying Wang
56f43240f9
Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
...
Change-Id: Ibef01983891377b859d28cff801f48ef5d8eabb2
2014-04-17 18:14:50 -07:00
Michael Kolb
d36022901e
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
2014-04-18 01:13:29 +00:00
Michael Kolb
f4399e7243
resolved conflict for merge from d42eeab2 to master
...
Change-Id: I41bd238f0628110c923b79259de4cd11a783340c
2014-04-17 18:00:40 -07:00
Michael Kolb
7d755a6f57
Merge branch 'klp-modular-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev-plus-aosp
2014-04-18 00:48:20 +00:00
Michael Kolb
d42eeab20f
am 4abbd0a6: Merge "Populate isRound from config.xml to WindowInsets" into klp-modular-dev
...
* commit '4abbd0a685cb418eb3cfc1f030d3091ef394a7e3':
Populate isRound from config.xml to WindowInsets
2014-04-18 00:48:13 +00:00
Mark Salyzyn
c5aa56872d
am 7423510c: am da93c60d: Merge "jni: binder ptrdiff_t compile issues"
...
* commit '7423510c5a6a103a77efc36f064ed716f8810b97':
jni: binder ptrdiff_t compile issues
2014-04-18 00:47:47 +00:00
Michael Kolb
4abbd0a685
Merge "Populate isRound from config.xml to WindowInsets" into klp-modular-dev
2014-04-18 00:44:35 +00:00
Mark Salyzyn
7423510c5a
am da93c60d: Merge "jni: binder ptrdiff_t compile issues"
...
* commit 'da93c60d8a5b79f90d44408d992fb532eaaf8fa7':
jni: binder ptrdiff_t compile issues
2014-04-18 00:43:36 +00:00
Selim Cinek
4739172089
Merge "ViewGroup now applies clipBounds to its children"
2014-04-18 00:41:21 +00:00
Mark Salyzyn
da93c60d8a
Merge "jni: binder ptrdiff_t compile issues"
2014-04-18 00:40:01 +00:00
Michael Kolb
6642e51ac5
Populate isRound from config.xml to WindowInsets
...
Change-Id: I41b3aef1322a7cdccdcbc679eb753e0a1e561fad
2014-04-17 17:32:50 -07:00
Mark Salyzyn
5b6da1aee8
jni: binder ptrdiff_t compile issues
...
Change-Id: Ibdd82479d3f9fb53cf1d6793c4f7353e8f1c3646
2014-04-17 17:25:36 -07:00
John Spurlock
cbdf956b42
Merge "Revert "Fix broken status bar when activity is showing above keyguard""
2014-04-18 00:13:56 +00:00
Christopher Tate
0153487d01
Merge "Support per-package lib dirs for bundled apps"
2014-04-18 00:02:44 +00:00
Jianing Wei
abb7a88697
Merge "Camera2 API: fix wrong logic in handling last frame number."
2014-04-18 00:00:12 +00:00
Christopher Tate
addfbdc09c
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
2014-04-17 16:54:16 -07:00
John Spurlock
2e50f28f41
Revert "Fix broken status bar when activity is showing above keyguard"
...
This reverts commit 25ab3d94387597a24619723df687214320f17e76.
Change-Id: I7dba397a9fe09d70b87ff4e638805c010c192599
2014-04-17 23:45:50 +00:00
Mark Salyzyn
8a61140034
am dc500d2d: am 4037847c: am 73258630: Merge "jni: binder 64-bit compile issues"
...
* commit 'dc500d2d567b37c620308bc8f0b0928eba4a2f5b':
jni: binder 64-bit compile issues
2014-04-17 23:33:58 +00:00
Stephen Hines
9deecdc88f
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.
2014-04-17 23:33:54 +00:00
Mindy Pereira
cbc7168e55
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
2014-04-17 23:33:33 +00:00
Mark Salyzyn
dc500d2d56
am 4037847c: am 73258630: Merge "jni: binder 64-bit compile issues"
...
* commit '4037847c0251a15ea88012a8405d0688c8b1ac53':
jni: binder 64-bit compile issues
2014-04-17 23:22:34 +00:00
Stephen Hines
fc45b664d4
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.
2014-04-17 23:22:09 +00:00