Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
131,542 Commits 3 Branches 0 Tags
ca463a226661ba4ab4c4bf0d4ed25f2107e2db86
Commit Graph

49996 Commits

Author SHA1 Message Date
Mark Salyzyn
ca463a2266 am c726f6b5: am b90e504e: am 649da9b5: am 5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH" 
* commit 'c726f6b537c5913600bc35ff866f1fb32800b9be':
  Native Runtime: Add LOG_ID_CRASH
 2014-04-18 18:13:35 +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
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
5a47a9f62d Merge "Native Runtime: Add LOG_ID_CRASH" 2014-04-18 14:55:32 +00:00
Selim Gurun
292601f96f am 14cd25f6: Merge "Provide an API to set print document name." 
* commit '14cd25f619fe981455aec9c79dc1abd89f4f5d8c':
  Provide an API to set print document name.
 2014-04-18 14:53:41 +00:00
Selim Gurun
14cd25f619 Merge "Provide an API to set print document name." 2014-04-18 14:49:25 +00:00
Ricardo Cervera
c50a14e91a 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.
 2014-04-18 02:07:44 +00: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
Michael Kolb
99111b9319 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
 2014-04-18 01:17:41 +00:00
Michael Kolb
dfbcf0ca33 am f4399e72: resolved conflict for merge from d42eeab2 to master 
* commit 'f4399e7243c35bef3eabfd20582246818a0bbbd3':
  Populate isRound from config.xml to WindowInsets
 2014-04-18 01:17:38 +00: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
Selim Cinek
8d19d37938 am 47391720: Merge "ViewGroup now applies clipBounds to its children" 
* commit '473917208961a90ca76fa9b9341b95902859b682':
  ViewGroup now applies clipBounds to its children
 2014-04-18 00:49:39 +00: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
Selim Cinek
4739172089 Merge "ViewGroup now applies clipBounds to its children" 2014-04-18 00:41:21 +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
Jianing Wei
a698d4e00a 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.
 2014-04-18 00:09:05 +00:00
Jianing Wei
abb7a88697 Merge "Camera2 API: fix wrong logic in handling last frame number." 2014-04-18 00:00:12 +00:00
Mark Salyzyn
57e68bfc30 am 8a611400: am dc500d2d: am 4037847c: am 73258630: Merge "jni: binder 64-bit compile issues" 
* commit '8a61140034a2007d6d3b8ca7a7d87f6d87866dd7':
  jni: binder 64-bit compile issues
 2014-04-17 23:45:30 +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
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
Jeff Brown
6d74bc462c 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.
 2014-04-17 23:06:00 +00:00
Jeff Brown
aaea4d3a48 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.
 2014-04-17 22:59:59 +00:00
RoboErik
161bec6fe4 resolved conflicts for merge of 0a57a111 to master-nova 
Change-Id: Id9fad51341239051203a219d58213b9438effc50
 2014-04-17 15:43:15 -07:00
Mark Salyzyn
cfd91e7852 jni: binder 64-bit compile issues 
Change-Id: I8a3083e7e9389bbb84c2dd061fef059e0595800d
 2014-04-17 15:40:01 -07:00
RoboErik
0a57a1112f Merge "Add RouteProviders to the new Media APIs" 2014-04-17 22:13:30 +00:00
Jianing Wei
5a4b02be33 Camera2 API: fix wrong logic in handling last frame number. 
Change-Id: I23bdceada2460238c1e7fc45524ae491268b4243
 2014-04-17 15:12:26 -07:00
Vinit Deshapnde
734ccfbc7b 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
 2014-04-17 22:03:16 +00:00
RoboErik
07c7077c54 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
 2014-04-17 15:02:33 -07:00
Vinit Deshapnde
2585e15ef7 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
 2014-04-17 21:57:12 +00:00
Jeff Brown
18a69b936a 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.
 2014-04-17 21:53:34 +00:00
Jeff Brown
8e1e40066b Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev 2014-04-17 21:49:49 +00:00
Zhijun He
a5ec9213f9 am f60194b1: Merge "Camera2: Update sync.frameNumber tag" 
* commit 'f60194b115edb4797464dd3714ed9d03f3ff21ff':
  Camera2: Update sync.frameNumber tag
 2014-04-17 20:44:21 +00:00
Zhijun He
f60194b115 Merge "Camera2: Update sync.frameNumber tag" 2014-04-17 20:40:19 +00:00
Zhijun He
4f91e2a459 Camera2: Update sync.frameNumber tag 
This is from the type mismapping bug fix in metadata generation.

Change-Id: Icaa9916e00e76b30cdc5688c3d3b7e9cadf84794
 2014-04-17 13:20:21 -07:00
Ricardo Cervera
a3b13847b0 docs: Added the play from search intent. Bug: 13473141. 
Change-Id: Icf483b5e0446e064b32a782717408484d5806859
 2014-04-17 12:31:18 -07:00
Raph Levien
2735a39c4e am 06136574: Merge changes Ia693f512,If3b7d41f 
* commit '0613657426aecb7ed6141c133f100baf24166ae0':
  Enable elegant text metrics in Quantum theme
  Add elegantTextHeight text appearance attribute
 2014-04-17 19:24:38 +00:00
Raph Levien
0613657426 Merge changes Ia693f512,If3b7d41f 
* changes:
  Enable elegant text metrics in Quantum theme
  Add elegantTextHeight text appearance attribute
 2014-04-17 19:21:14 +00:00
Vinit Deshapnde
72358802d6 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
 2014-04-17 18:59:54 +00:00
Vinit Deshapnde
45e7467666 Merge "Don't reset country code once it is persisted" into klp-dev 2014-04-17 18:54:58 +00:00
Alan Viverette
ae1248452a am f805b40c: Merge changes Ia2bf4d17,I8242523d 
* commit 'f805b40c44769a751d10d404e8ea778a23d5a51a':
  Fix alert dialog alignment and touch feedback masking
  Fix VectorDrawable states
 2014-04-17 18:19:51 +00:00
Raph Levien
37938fca72 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
 2014-04-17 11:16:56 -07:00