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

128831 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Gampe
7006860b4a Merge "PacProccesor: Only build for 32-bit" 2014-04-18 23:23:02 +00:00
Elliott Hughes
cf4d85e478 am 90840ec2: Merge "Fix warning introduced by recent psuedolocalizer change." 
* commit '90840ec29dec173f5fbc8197bcf1889bde5bd262':
  Fix warning introduced by recent psuedolocalizer change.
 2014-04-18 23:20:21 +00:00
Elliott Hughes
90840ec29d Merge "Fix warning introduced by recent psuedolocalizer change." 2014-04-18 23:16:44 +00:00
Elliott Hughes
0a1eed394f Fix warning introduced by recent psuedolocalizer change. 
Change-Id: I577caf6ca4261b3d044b18bc8c5915012168031d
 2014-04-18 16:15:27 -07:00
Kenny Root
0090082ed0 resolved conflicts for merge of 89a086c1 to klp-modular-dev 
Change-Id: Iaa82bfc87fb3af2e8e78597c6f2517e7dad7c130
 2014-04-18 16:15:13 -07:00
Andreas Gampe
f8749200c0 PacProccesor: Only build for 32-bit 
PacProcessor relies on libpac from chromium, which is not built
for 64b right now.

Change-Id: I034932343b9aef239748511d8deb498b46e77cf2
 2014-04-18 23:12:39 +00:00
Deepanshu Gupta
311efc146c Merge "Add DisplayManager service to BridgeContext" 2014-04-18 23:11:57 +00:00
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
Kenny Root
89a086c16f am cf677a37: am e00c9185: am 41ec218e: am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit 'cf677a37fb4560058fe29ebcac97f2c02bd55064':
  Use hidden API to validate APK chains
 2014-04-18 23:05:30 +00:00
Deepanshu Gupta
664d6f1fe4 Add DisplayManager service to BridgeContext 
ViewRoot now holds a reference to the DisplayManager. The change updates
the BridgeContext to provide the DisplayManager instance.

Change-Id: I4a5f00eda337939c72bad47b0ca6a7403454228d
 2014-04-18 16:03:11 -07:00
Kenny Root
cf677a37fb am e00c9185: am 41ec218e: am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit 'e00c9185262c675f1680920c258413299995042a':
  Use hidden API to validate APK chains
 2014-04-18 23:00:37 +00: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
Kenny Root
e00c918526 am 41ec218e: am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit '41ec218e5f92904fe99c74bc35b9f5e4003c777a':
  Use hidden API to validate APK chains
 2014-04-18 22:56:26 +00:00
Kenny Root
41ec218e5f am 6888bee5: am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit '6888bee598b8c88f7a93ef2da06dd5659cc92dc6':
  Use hidden API to validate APK chains
 2014-04-18 22:50:12 +00: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
Kenny Root
6888bee598 am 5a0cc789: am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit '5a0cc78929bf56c153696ffa16b602acfcc40089':
  Use hidden API to validate APK chains
 2014-04-18 22:43:08 +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
Kenny Root
5a0cc78929 am 2ed5f771: am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit '2ed5f771c47c16e9c2be1f2025ef0a826f0290c3':
  Use hidden API to validate APK chains
 2014-04-18 22:37:38 +00: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
Kenny Root
2ed5f771c4 am 47231936: am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit '47231936c0593b87c3c9898767327f1516a7ec22':
  Use hidden API to validate APK chains
 2014-04-18 22:31:08 +00:00
Kenny Root
47231936c0 am 02bc4b04: am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit '02bc4b04239c437f88fdb82633b41cdc8a8eff6b':
  Use hidden API to validate APK chains
 2014-04-18 22:26:03 +00:00
Kenny Root
02bc4b0423 am 4a62a6dc: am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit '4a62a6dce9a4b48f1c1c64e47a22d2319b852acd':
  Use hidden API to validate APK chains
 2014-04-18 22:21:37 +00:00
Kenny Root
4a62a6dce9 am 451ed5f0: am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit '451ed5f077b9f95deae809ae620bc210c253b922':
  Use hidden API to validate APK chains
 2014-04-18 22:14:14 +00:00
RoboErik
7e439a66e1 Merge "Add cleanspec for media Session apis." 2014-04-18 21:56:28 +00:00
Adam Lesinski
c0f6eed40f Allow InputEvents to propagate w/o IME 
If no IME was present, InputEvents such as KeyEvents
would simple be dropped instead of going through
to the Activity's View hierarchy.

Change-Id: I9de25bdbf5d1564b77b25679e19dae18591a8c1c
 2014-04-18 14:52:04 -07:00
RoboErik
5b517bbac6 Add cleanspec for media Session apis. 
Change-Id: I58b0acda2a91b3afe6febc3bc00e26fbe27dd431
 2014-04-18 14:48:24 -07:00
Kenny Root
451ed5f077 am 3ecaa88d: am ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev 
* commit '3ecaa88d83d04a0fd55b494829badbb41016f5a1':
  Use hidden API to validate APK chains
 2014-04-18 21:33:04 +00: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
Colin Cross
431614cb6b BootReceiver: add ro.boot.bootreason property to SYSTEM_LAST_KMSG 
Instead of requiring the kernel to join last_kmsg and the reboot
reason together, allow both to be passed to userspace and have
userspace combine them the way the log parsers want them.

Existing devices with no ro.boot.bootreason property and kernel
support for putting the reason in last_kmsg will continue to
use the kernel's formatting.

Bug: 13813279
Change-Id: I079b0107feb1533c6a54044ca6a114741127dfbc
 2014-04-18 13:47:28 -07: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
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