OSDN Git Service
Ricardo Cervera [Fri, 18 Apr 2014 22:36:33 +0000 (22:36 +0000)]
am
95b7eaad: am
235fd3c9: am
d5ed804f: am
a7b62718: am
974588d1: Merge "docs: Watermarked images for codes that weren\'t found." into klp-docs
* commit '
95b7eaadf3e7570049378b29e533966a5e0cb0d2':
docs: Watermarked images for codes that weren't found.
Ricardo Cervera-Navarro [Fri, 18 Apr 2014 22:36:28 +0000 (22:36 +0000)]
am
62ee3e9a: am
15d1feb0: am
fed2c410: am
4874938a: am
84e6bc61: Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs
* commit '
62ee3e9ab623a6ac1bb08a0b4db17e749315ac57':
Revert "docs: Watermark images with easter eggs"
Ying Wang [Fri, 18 Apr 2014 22:35:52 +0000 (22:35 +0000)]
am
40d75a64: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."
* commit '
40d75a6480f75c3475e78569c9bc1b6c51f6ed51':
Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
Ricardo Cervera [Fri, 18 Apr 2014 19:20:04 +0000 (19:20 +0000)]
am
235fd3c9: am
d5ed804f: am
a7b62718: am
974588d1: Merge "docs: Watermarked images for codes that weren\'t found." into klp-docs
* commit '
235fd3c9effc63643db356a593e7f77f220a5f4c':
docs: Watermarked images for codes that weren't found.
Ricardo Cervera-Navarro [Fri, 18 Apr 2014 19:19:57 +0000 (19:19 +0000)]
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"
Ricardo Cervera [Fri, 18 Apr 2014 19:16:27 +0000 (19:16 +0000)]
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.
Ricardo Cervera-Navarro [Fri, 18 Apr 2014 19:16:23 +0000 (19:16 +0000)]
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"
Ricardo Cervera [Fri, 18 Apr 2014 19:12:59 +0000 (19:12 +0000)]
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.
Ricardo Cervera-Navarro [Fri, 18 Apr 2014 19:12:53 +0000 (19:12 +0000)]
am
4874938a: am
84e6bc61: Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs
* commit '
4874938ad3fb0d0ab56b24cb18c8943a72559f12':
Revert "docs: Watermark images with easter eggs"
Ricardo Cervera [Fri, 18 Apr 2014 19:08:09 +0000 (19:08 +0000)]
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.
Ricardo Cervera-Navarro [Fri, 18 Apr 2014 19:08:05 +0000 (19:08 +0000)]
am
84e6bc61: Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs
* commit '
84e6bc61c64aa578aed50460f7e4f16d85f81cbb':
Revert "docs: Watermark images with easter eggs"
Ricardo Cervera [Fri, 18 Apr 2014 19:02:04 +0000 (19:02 +0000)]
Merge "docs: Watermarked images for codes that weren't found." into klp-docs
Ricardo Cervera-Navarro [Fri, 18 Apr 2014 19:01:48 +0000 (19:01 +0000)]
Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs
Ricardo Cervera [Fri, 18 Apr 2014 18:54:03 +0000 (11:54 -0700)]
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
Ricardo Cervera-Navarro [Fri, 18 Apr 2014 18:34:41 +0000 (18:34 +0000)]
Revert "docs: Watermark images with easter eggs"
This reverts commit
dc9ca02c51ecc4468e60c391f8357b5025d6eef1.
Change-Id: Idf4873e2e76d746c227c89c2f84fe44946014752
Mark Salyzyn [Fri, 18 Apr 2014 18:13:35 +0000 (18:13 +0000)]
am
c726f6b5: am
b90e504e: am
649da9b5: am
5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH"
* commit '
c726f6b537c5913600bc35ff866f1fb32800b9be':
Native Runtime: Add LOG_ID_CRASH
Ying Wang [Fri, 18 Apr 2014 18:13:09 +0000 (18:13 +0000)]
Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."
Mark Salyzyn [Fri, 18 Apr 2014 16:25:59 +0000 (16:25 +0000)]
am
b90e504e: am
649da9b5: am
5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH"
* commit '
b90e504ec17a7f509521c21f2b937a2ebefaf6ab':
Native Runtime: Add LOG_ID_CRASH
Mark Salyzyn [Fri, 18 Apr 2014 15:08:56 +0000 (15:08 +0000)]
am
649da9b5: am
5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH"
* commit '
649da9b505498ff87d75da56d376d46c22e50782':
Native Runtime: Add LOG_ID_CRASH
Mark Salyzyn [Fri, 18 Apr 2014 15:02:48 +0000 (15:02 +0000)]
am
5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH"
* commit '
5a47a9f62dd9bcb6573555b7a3ef4b1f5e485fc4':
Native Runtime: Add LOG_ID_CRASH
Mark Salyzyn [Fri, 18 Apr 2014 14:55:31 +0000 (14:55 +0000)]
Merge "Native Runtime: Add LOG_ID_CRASH"
Selim Gurun [Fri, 18 Apr 2014 14:53:41 +0000 (14:53 +0000)]
am
14cd25f6: Merge "Provide an API to set print document name."
* commit '
14cd25f619fe981455aec9c79dc1abd89f4f5d8c':
Provide an API to set print document name.
Selim Gurun [Fri, 18 Apr 2014 14:49:25 +0000 (14:49 +0000)]
Merge "Provide an API to set print document name."
John Reck [Fri, 18 Apr 2014 03:37:14 +0000 (03:37 +0000)]
am
f29e2640: Merge "Force a full redraw on surface change"
* commit '
f29e264049cc64dbb3b0e1146b81b9b476660282':
Force a full redraw on surface change
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:07:44 +0000 (02:07 +0000)]
am
92f4a346: am
fa711a33: am
d09e1bff: am
ed5b8c06: am
6aeea454: Merge "docs: Added the play from search intent. Bug:
13473141." into klp-docs
* commit '
92f4a3465ea2521523b5659f8006097e07a9be58':
docs: Added the play from search intent. Bug:
13473141.
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:17:41 +0000 (01:17 +0000)]
am
d3602290: 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 '
d36022901e39c49c976f863d1cad696514c6f193':
jni: binder ptrdiff_t compile issues
Michael Kolb [Fri, 18 Apr 2014 01:17:38 +0000 (01:17 +0000)]
am
f4399e72: resolved conflict for merge from
d42eeab2 to master
* commit '
f4399e7243c35bef3eabfd20582246818a0bbbd3':
Populate isRound from config.xml to WindowInsets
Ying Wang [Fri, 18 Apr 2014 01:14:50 +0000 (18:14 -0700)]
Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
Change-Id: Ibef01983891377b859d28cff801f48ef5d8eabb2
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
Selim Cinek [Fri, 18 Apr 2014 00:49:39 +0000 (00:49 +0000)]
am
47391720: Merge "ViewGroup now applies clipBounds to its children"
* commit '
473917208961a90ca76fa9b9341b95902859b682':
ViewGroup now applies clipBounds to its children
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:19:17 +0000 (00:19 +0000)]
am
cbdf956b: Merge "Revert "Fix broken status bar when activity is showing above keyguard""
* commit '
cbdf956b42fe40edaa7bfd36e5e2f1c257be220c':
Revert "Fix broken status bar when activity is showing above keyguard"
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:09:10 +0000 (00:09 +0000)]
am
0153487d: Merge "Support per-package lib dirs for bundled apps"
* commit '
0153487d01e4921a7e3dc42c2fd68642622dd6f6':
Support per-package lib dirs for bundled apps
Jianing Wei [Fri, 18 Apr 2014 00:09:05 +0000 (00:09 +0000)]
am
abb7a886: Merge "Camera2 API: fix wrong logic in handling last frame number."
* commit '
abb7a886970448bbaeb8abe7cd877eab48809a60':
Camera2 API: fix wrong logic in handling last frame number.
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:45:30 +0000 (23:45 +0000)]
am
8a611400: am
dc500d2d: am
4037847c: am
73258630: Merge "jni: binder 64-bit compile issues"
* commit '
8a61140034a2007d6d3b8ca7a7d87f6d87866dd7':
jni: binder 64-bit compile issues
Stephen Hines [Thu, 17 Apr 2014 23:45:26 +0000 (23:45 +0000)]
am
9deecdc8: am
fc45b664: am
f0aa4cc0: am
a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java objects are written."
* commit '
9deecdc88f77d8a4a8ff25c1ef2405b42a05ce81':
Fix improper use of JNI_ABORT for operations where Java objects are written.
Mindy Pereira [Thu, 17 Apr 2014 23:45:22 +0000 (23:45 +0000)]
am
cbc7168e: am
03f7f442: am
cb54f978: Merge "Update window alpha at the same time as translating" into klp-modular-dev
* commit '
cbc7168e55fd4058647af5a6ca7652bb99b299b0':
Update window alpha at the same time as translating
Vinit Deshapnde [Thu, 17 Apr 2014 23:34:38 +0000 (23:34 +0000)]
am
0d870c11: am
734ccfbc: (-s ours) am
2585e15e: am
72358802: am
45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev
* commit '
0d870c11e55dd52b6fc5e2071af5b32877ecbd2b':
Don't reset country code once it is persisted
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 23:06:00 +0000 (23:06 +0000)]
am
aaea4d3a: am
18a69b93: am
8e1e4006: Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev
* commit '
aaea4d3a4822a380831084a779f52a8e767ce402':
Add support for dynamically setting the virtual display surface.
Simon Wilson [Thu, 17 Apr 2014 23:05:56 +0000 (23:05 +0000)]
am
3e2cb07d: am
ef059b03: am
3c8bbe24: Check that mRemotePlayer is not null before use
* commit '
3e2cb07d5258ca82cf4bd0b2e1380b36f56100d8':
Check that mRemotePlayer is not null before use
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"
Jason Sams [Thu, 17 Apr 2014 22:46:58 +0000 (22:46 +0000)]
am
53ad3980: Merge "Unhide RenderScript resize intrinsic"
* commit '
53ad398074bd9a0c54baab3d66d5842edb0733f8':
Unhide RenderScript resize intrinsic
RoboErik [Thu, 17 Apr 2014 22:43:15 +0000 (15:43 -0700)]
resolved conflicts for merge of
0a57a111 to master-nova
Change-Id: Id9fad51341239051203a219d58213b9438effc50
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:44:21 +0000 (20:44 +0000)]
am
f60194b1: Merge "Camera2: Update sync.frameNumber tag"
* commit '
f60194b115edb4797464dd3714ed9d03f3ff21ff':
Camera2: Update sync.frameNumber tag
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 20:03:24 +0000 (20:03 +0000)]
am
bf19fa4f: Merge "Move bouncer to the bottom, but only on phones."
* commit '
bf19fa4fe653fbba9bed5d3a13f52e043ac44dab':
Move bouncer to the bottom, but only on phones.
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:43:36 +0000 (19:43 +0000)]
am
c99a9b28: am
5170476c: am
a4af5726: am
112d1b94: Merge "Add BiCubic resize instrinsic"
* commit '
c99a9b28ef9d480fcbffb070db79eb76a9aae30b':
Add BiCubic resize instrinsic
Baligh Uddin [Thu, 17 Apr 2014 19:43:31 +0000 (19:43 +0000)]
am
61e3991b: (-s ours) am
177d9b9a: (-s ours) am
b279f527: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
61e3991bf64b86de32ad24ffcf1753f0f8a80166':
Import translations. DO NOT MERGE
Griff Hazen [Thu, 17 Apr 2014 19:43:27 +0000 (19:43 +0000)]
am
d36e8df7: am
84f4adc9: Merge commit \'
59dfbb91\' into klp-modular-dev-plus-aosp
* commit '
d36e8df7241f2433233377bbc803468c91ae8ad9':
Fix build [DO NOT MERGE]
Scott Main [Thu, 17 Apr 2014 19:43:21 +0000 (19:43 +0000)]
am
1b866eeb: am
2b7345e4: am
b04f3f74: am
cb38ee51: am
a106923e: Merge "add image itemprop to specify image for search result snippet" into klp-docs
* commit '
1b866eeb58867fd9bb2496dacdd3283c18893792':
add image itemprop to specify image for search result snippet
Ricardo Cervera [Thu, 17 Apr 2014 19:43:13 +0000 (19:43 +0000)]
am
004263ed: am
f162266c: am
f64feec2: am
4aa68e97: am
dc9ca02c: docs: Watermark images with easter eggs
* commit '
004263eda24b672dc4fb42fe2cc931652e4e12ad':
docs: Watermark images with easter eggs
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
OSDN Git Service
