drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
128,603 Commits 1 Branch 0 Tags
Commit Graph

128603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
991872bd43 Merge "Add isElegantHeight to Layoutlib" 2014-04-18 23:11:27 +00:00
Elliott Hughes
4b0ee78bfa resolved conflicts for merge of 56ca8219 to master 
Change-Id: I62f5804a5c4404eedce09188cda2e3b1bb990b36
 2014-04-18 16:07:41 -07:00
Elliott Hughes
56ca821912 resolved conflicts for merge of ec42199a to klp-modular-dev-plus-aosp 
Change-Id: I9ecd5d51be4d073ab93dbb0bd60097735e76bf94
 2014-04-18 15:56:46 -07:00
Michael Wright
5b5def5472 Fixed a typo implying intents must and must not be explicit. 
Change-Id: Id9746fad2e475b94d8d45f641bc5e2eaf9c874ae
 2014-04-18 22:45:27 +00:00
Deepanshu Gupta
08ea918c86 Add isElegantHeight to Layoutlib 
Add the native stub methods for isElegantHeight in Paint.

Change-Id: Iaddde36528fb452e5a150ab35687da781091d14c
 2014-04-18 15:43:06 -07:00
Elliott Hughes
ec42199a71 am 92b2d5a6: Merge "Pseudolocalizer improvements." 
* commit '92b2d5a608f9fefc9a88eea03cd599a26c1b62ce':
  Pseudolocalizer improvements.
 2014-04-18 22:36:32 +00:00
Elliott Hughes
92b2d5a608 Merge "Pseudolocalizer improvements." 2014-04-18 22:32:53 +00:00
RoboErik
7e439a66e1 Merge "Add cleanspec for media Session apis." 2014-04-18 21:56:28 +00:00
RoboErik
5b517bbac6 Add cleanspec for media Session apis. 
Change-Id: I58b0acda2a91b3afe6febc3bc00e26fbe27dd431
 2014-04-18 14:48:24 -07:00
Tim Kilbourn
67848e2bfe Merge "Add Fire TV remote key layout." 2014-04-18 21:24:37 +00:00
Tim Kilbourn
edad218f5a Add Fire TV remote key layout. 
Change-Id: Ida72c48701bf0366f488f1c99ab17e0e5c45de78
 2014-04-18 14:24:12 -07:00
Fabrice Di Meglio
fbb54b8363 Merge "Improve Preference highlighting" 2014-04-18 20:48:27 +00:00
Chris Craik
908a228070 Merge "Add convenience methods to encourage usage of ALL_SAVE_FLAG" 2014-04-18 20:09:56 +00:00
Ricardo Cervera
95b7eaadf3 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.
 2014-04-18 19:20:04 +00:00
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
Ying Wang
40d75a6480 Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs." 2014-04-18 18:13:09 +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
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