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

122524 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Koh
5aa34455d7 am 9cb3b162: Merge "Hide UsbDevice changes in KKWT DO NOT MERGE" into klp-modular-dev 
* commit '9cb3b162ebf2c85b2b34d399623ff68427b2cdca':
  Hide UsbDevice changes in KKWT DO NOT MERGE
 2014-05-05 22:42:15 +00:00
Justin Koh
fd04632ab5 am 3caf9258: Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev 
* commit '3caf92582498bad8fe79f6e3235be218e82b7f68':
  Hide getDeviceGlobalActionKeyTimeout
 2014-05-05 22:38:13 +00:00
Justin Koh
9cb3b162eb Merge "Hide UsbDevice changes in KKWT DO NOT MERGE" into klp-modular-dev 2014-05-05 22:38:06 +00:00
Justin Koh
3caf925824 Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev 2014-05-05 22:33:29 +00:00
Justin Koh
68ca14648c am ed23c5bc: Hide NsdServiceInfo additions for KKWT DO NOT MERGE 
* commit 'ed23c5bc12b4110435b1e6f5fb9b82716109136e':
  Hide NsdServiceInfo additions for KKWT DO NOT MERGE
 2014-05-05 22:21:03 +00:00
Justin Koh
e647dd354e Hide UsbDevice changes in KKWT DO NOT MERGE 
Hide UsbDevice changes in KKWT.
Bug: 14116162

Change-Id: I1582b9d536b243fa18beca6fdd8f379f9e32e137
 2014-05-05 22:19:05 +00:00
Justin Koh
ed23c5bc12 Hide NsdServiceInfo additions for KKWT DO NOT MERGE 
Hide NsdServiceInfo additions for KKWT.
Bug: 14116162

Change-Id: I98755a2524168be5e833a634192fd49ff3c32346
 2014-05-05 22:18:42 +00:00
Chris Craik
3cb74d21b2 am 5d8343b8: am a85db5ab: Merge "libhwui: Handle the blurImage() implement once RS::init fail" 
* commit '5d8343b8e27e766b5bfaaed2f9b1952c0d15da8d':
  libhwui: Handle the blurImage() implement once RS::init fail
 2014-05-05 21:50:34 +00:00
Chris Craik
5d8343b8e2 am a85db5ab: Merge "libhwui: Handle the blurImage() implement once RS::init fail" 
* commit 'a85db5ab785c59726c3644999801e48f449714f3':
  libhwui: Handle the blurImage() implement once RS::init fail
 2014-05-05 21:46:48 +00:00
Chris Craik
a85db5ab78 Merge "libhwui: Handle the blurImage() implement once RS::init fail" 2014-05-05 21:44:08 +00:00
Justin Koh
1aa59f86ca Hide getDeviceGlobalActionKeyTimeout 
Hide getDeviceGlobalActionKeyTimeout, as requested. Remove mention from
@deprecated notice.
Bug: 14441321

Change-Id: Ic6e84e718c2eaa15a86d8cd4d13645be88490b61
 2014-05-05 14:40:56 -07:00
Adam Lesinski
0472fb5882 am 34dd2cdd: am f2d2c871: AAPT should not process XML that failed to compile 
* commit '34dd2cdd4142ca8c7463b9f831429b4366fa222a':
  AAPT should not process XML that failed to compile
 2014-05-05 21:13:28 +00:00
Adam Lesinski
34dd2cdd41 am f2d2c871: AAPT should not process XML that failed to compile 
* commit 'f2d2c871813656012420faa89080d8e3cda1f308':
  AAPT should not process XML that failed to compile
 2014-05-05 21:09:49 +00:00
Craig Mautner
9bb4df3a7d am e88097bd: Merge "Pause and resume ActivityView when visibility changes" into klp-modular-dev 
* commit 'e88097bd00d5710bbfb6c24a934743c8d6cac9cf':
  Pause and resume ActivityView when visibility changes
 2014-05-05 21:03:39 +00:00
Craig Mautner
6dffeb9eeb am 8890013a: Merge "Add null check to embeddedAllowed check" into klp-modular-dev 
* commit '8890013ae0473663a6b9591db6230e9038ba6711':
  Add null check to embeddedAllowed check
 2014-05-05 20:59:37 +00:00
Craig Mautner
e88097bd00 Merge "Pause and resume ActivityView when visibility changes" into klp-modular-dev 2014-05-05 20:58:15 +00:00
Craig Mautner
8890013ae0 Merge "Add null check to embeddedAllowed check" into klp-modular-dev 2014-05-05 20:55:48 +00:00
Craig Mautner
05678d5a31 Add null check to embeddedAllowed check 
If the component being checked has been removed an NPE will be
thrown. This checks for that situation and handles it.

Fixes bug 14562234.

Change-Id: Ica5713378f356ac8441862d455b7d284ea111212
 2014-05-05 12:32:40 -07:00
Craig Mautner
d13a558397 Pause and resume ActivityView when visibility changes 
Once a Surface has been established the activity in an ActivityView
must be paused and resumed as the view goes in and out of visibility
= View.GONE.

Fixes bug 14034658.

Change-Id: Icab43678053c225db70f051dceacd4d024df2153
 2014-05-05 12:07:40 -07:00
Adam Lesinski
f2d2c87181 AAPT should not process XML that failed to compile 
AAPT would attempt to warn if an unprefixed 'id'
attribute was used in an XML resource file even
if that XML file failed to compile. The result
was undefined behaviour, including crashing the
process.

Change-Id: I1a9464ec937760e8d38bbe1af8d1b5d6b2c105a2
 2014-05-05 12:01:21 -07:00
David Friedman
68e048d85a am 20d125de: am fd876194: am 4146d546: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Rem 
* commit '20d125dedb8bde016389ee97a0cefcc97bb02a81':
  Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
 2014-05-05 17:16:22 +00:00
David Friedman
20d125dedb am fd876194: am 4146d546: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that 
* commit 'fd876194cf12352545048f77f626c839cc7ef787':
  Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
 2014-05-05 17:12:53 +00:00
David Friedman
fd876194cf am 4146d546: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don\'t allocat 
* commit '4146d546a4ab8465970e7c73bf1e9e00767931b6':
  Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
 2014-05-05 17:07:55 +00:00
David Friedman
4146d546a4 Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory." into klp-docs 2014-05-05 17:05:22 +00:00
Guang Zhu
9284a37d60 am 1edfd835: Merge "add getAddress function to return BT mac" into klp-modular-dev 
* commit '1edfd835c2573711587cc77befeefd96083ccba5':
  add getAddress function to return BT mac
 2014-05-03 00:35:26 +00:00
Guang Zhu
1edfd835c2 Merge "add getAddress function to return BT mac" into klp-modular-dev 2014-05-03 00:32:58 +00:00
Deepanshu Gupta
e84f6b5a4e am 106c24fb: am c7149708: am bab277cc: am 13542c7e: (-s ours) am 00e0b992: am 75f435b0: am 495c14d8: (-s ours) am 47ad22ed: am 961e3281: am 6df2860b: Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE] 
* commit '106c24fbe35ccb1e60e638f9de0fe509c5921060':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-05-02 19:57:47 +00:00
Deepanshu Gupta
db1763266d am 2f73224c: am b4367eaf: am 5ac33148: am 29376cea: (-s ours) am a996ff5c: am c529b700: am 8ad4b8b1: (-s ours) am 9932e589: am 9e2dadae: am bcbeaf83: Set default text style in layoutlib as NORMAL [DO NOT MERGE] 
* commit '2f73224c37c88cee605b5329637262fd718b0714':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-05-02 19:57:44 +00:00
Deepanshu Gupta
85c6a65471 am 3df2b07c: am 6241a6ce: am eecb79a8: am 22b47b28: (-s ours) am 16fda528: am b7431172: am 826a215c: (-s ours) am 320f1126: am cf3f108e: am 5be65fda: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit '3df2b07c9c0c103aeee22978043abc5474c44188':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-05-02 19:57:42 +00:00
Deepanshu Gupta
b8cdabb990 am f9852395: am 00251f77: am d1830eb6: am 57e410d9: (-s ours) am 9f81e73a: am 28ec8b4f: am 0a37981c: (-s ours) am 1b28d8d4: am d642de58: am ec4623d0: Improve text rendering and measurement. [DO NOT MERGE] 
* commit 'f98523955f522795c8079d5b9533a4e0aecda8b7':
  Improve text rendering and measurement. [DO NOT MERGE]
 2014-05-02 19:57:39 +00:00
Deepanshu Gupta
8298b7f649 am 8c084dde: am 6214d7aa: am 5f0fb2a1: am 4da3827f: (-s ours) am acbff099: am d9076a95: am f4b35c6a: (-s ours) am ef822b3f: am 62a4a1f9: am 2a82a48f: Fix the measurement of text bounds. [DO NOT MERGE] 
* commit '8c084dde55a49338c2c492f0728e6e6a46e58fec':
  Fix the measurement of text bounds. [DO NOT MERGE]
 2014-05-02 19:57:36 +00:00
Deepanshu Gupta
976ee87d99 am 9802058c: am eec3eb86: am c1ce1c99: am 951c6976: (-s ours) am fcdbc3cb: am 38f954c8: am e0537c1d: (-s ours) am c7f8e64c: am 1830a58f: am 5bb3414d: Fix a bug in Nine Patch library. [DO NOT MERGE] 
* commit '9802058c74b56a09e0d25c364f57017c8fe1a8d1':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-05-02 19:57:33 +00:00
Deepanshu Gupta
affabf4734 am aefb9b8b: am 73e7402e: am 7b6ab8f3: am 031f4beb: (-s ours) am 469b4aea: am 35f9f310: am 5e6a2990: (-s ours) am 4d887ec3: am bcd50a7c: am 5712b5fc: Optimize layout rendering in layoutlib [DO NOT MERGE] 
* commit 'aefb9b8b82e82048f02b9143dc833a77783f2f56':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-05-02 19:57:30 +00:00
Deepanshu Gupta
2c3b7d1852 am 856e0e3a: am 02a07b73: am 20e540be: am 2d7a9c3e: (-s ours) am c3e89c3f: am 95672929: am 73f9e467: (-s ours) am edd67cb1: am 7c02c6e2: am 02cde9ce: Add methods for Time_Delegate [DO NOT MERGE] 
* commit '856e0e3a69a10b1a813609ca56209a5ecfe6e19e':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-05-02 19:57:27 +00:00
Deepanshu Gupta
d3866faaff am e8045e10: am d35e28f3: am d88cece4: am d683d56c: (-s ours) am 35a94df7: am ea18b2d6: am 95fd97aa: (-s ours) am 84e7a6b8: am 443372dd: am 9d7b5165: Add libphonenumber to layoutlib.jar. [DO NOT MERGE] 
* commit 'e8045e10712cda95d626647d4e2f000edc1b358a':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
 2014-05-02 19:57:20 +00:00
Deepanshu Gupta
77f3791894 am c03530c1: am b20352f5: am 33f44937: am e9c20fd4: (-s ours) am 81f1e754: am fd581059: am 88a12f57: (-s ours) am 43034b54: am 62591cff: am 689c0dfe: Fix NPE in layoutlib. [DO NOT MERGE] 
* commit 'c03530c18f1dd93bf052288d1d6ef80becff3f70':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-02 19:57:17 +00:00
Deepanshu Gupta
f07a7a7aaf am e5a066c7: am ad0060b5: am 1da7b0b5: am 35b16e5d: (-s ours) am 9e8ae205: am f41ce157: am 43ed35da: (-s ours) am ce205d0a: am 600539c7: am 083d1562: Fix text size in Fake Action Bar. [DO NOT MERGE] 
* commit 'e5a066c726c5dd18a79acf0cb362789a7fc81d83':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-02 19:57:14 +00:00
Deepanshu Gupta
3f7c81eed4 am 551ee874: am 94f1de7a: am 27c91491: am 8c54c861: (-s ours) am 2fee69e0: am 071206b4: am aab9d9a7: (-s ours) am 1a434aa8: am 697c511d: am 80c668f2: Remove references to non-std Java classes. [DO NOT MERGE] 
* commit '551ee874b7f4fdda993a47dd32628a5c664eca04':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-02 19:57:11 +00:00
Deepanshu Gupta
0beb203736 am f07310bb: am 61c8829a: am 67da11c2: am 683e1663: (-s ours) am 79150645: am c37f7c84: am d15bbac6: (-s ours) am a2b530fb: am e39de9ae: am 6335590a: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE] 
* commit 'f07310bbc31578c4885f16f0878ba0c4b8b45670':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-02 19:57:08 +00:00
Deepanshu Gupta
b65e5b1b0a am 02e4ee55: am e216cfc4: am 1e884cd0: am 543452e8: (-s ours) am e860b24e: am 8cc1d989: am 3e9bc262: (-s ours) am 9d209905: am 6f469e54: am 11ee746d: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE] 
* commit '02e4ee55d01634a4f19a777a18f6c18671d7cd34':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
 2014-05-02 19:57:05 +00:00
Deepanshu Gupta
106c24fbe3 am c7149708: am bab277cc: am 13542c7e: (-s ours) am 00e0b992: am 75f435b0: am 495c14d8: (-s ours) am 47ad22ed: am 961e3281: am 6df2860b: Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE] 
* commit 'c7149708e2e5e6ed5ff26c32e7b07fd1451f68e0':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-05-02 19:54:14 +00:00
Deepanshu Gupta
2f73224c37 am b4367eaf: am 5ac33148: am 29376cea: (-s ours) am a996ff5c: am c529b700: am 8ad4b8b1: (-s ours) am 9932e589: am 9e2dadae: am bcbeaf83: Set default text style in layoutlib as NORMAL [DO NOT MERGE] 
* commit 'b4367eafbc75906b31d091294894552d52778385':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-05-02 19:54:09 +00:00
Deepanshu Gupta
3df2b07c9c am 6241a6ce: am eecb79a8: am 22b47b28: (-s ours) am 16fda528: am b7431172: am 826a215c: (-s ours) am 320f1126: am cf3f108e: am 5be65fda: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit '6241a6ce289326b2d6e0927ba0b4c7b77c349891':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-05-02 19:54:06 +00:00
Deepanshu Gupta
f98523955f am 00251f77: am d1830eb6: am 57e410d9: (-s ours) am 9f81e73a: am 28ec8b4f: am 0a37981c: (-s ours) am 1b28d8d4: am d642de58: am ec4623d0: Improve text rendering and measurement. [DO NOT MERGE] 
* commit '00251f77822e878e48e9d8596c87677559ed4c37':
  Improve text rendering and measurement. [DO NOT MERGE]
 2014-05-02 19:54:04 +00:00
Deepanshu Gupta
8c084dde55 am 6214d7aa: am 5f0fb2a1: am 4da3827f: (-s ours) am acbff099: am d9076a95: am f4b35c6a: (-s ours) am ef822b3f: am 62a4a1f9: am 2a82a48f: Fix the measurement of text bounds. [DO NOT MERGE] 
* commit '6214d7aa506893b5fdfc68c7a5e812189930da00':
  Fix the measurement of text bounds. [DO NOT MERGE]
 2014-05-02 19:54:01 +00:00
Deepanshu Gupta
9802058c74 am eec3eb86: am c1ce1c99: am 951c6976: (-s ours) am fcdbc3cb: am 38f954c8: am e0537c1d: (-s ours) am c7f8e64c: am 1830a58f: am 5bb3414d: Fix a bug in Nine Patch library. [DO NOT MERGE] 
* commit 'eec3eb8694f188e435cc3dea18602a8ff2b51f6d':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-05-02 19:53:57 +00:00
Deepanshu Gupta
aefb9b8b82 am 73e7402e: am 7b6ab8f3: am 031f4beb: (-s ours) am 469b4aea: am 35f9f310: am 5e6a2990: (-s ours) am 4d887ec3: am bcd50a7c: am 5712b5fc: Optimize layout rendering in layoutlib [DO NOT MERGE] 
* commit '73e7402e6058262d1d7db5f587efcec76a0ce7a6':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-05-02 19:53:55 +00:00
Deepanshu Gupta
856e0e3a69 am 02a07b73: am 20e540be: am 2d7a9c3e: (-s ours) am c3e89c3f: am 95672929: am 73f9e467: (-s ours) am edd67cb1: am 7c02c6e2: am 02cde9ce: Add methods for Time_Delegate [DO NOT MERGE] 
* commit '02a07b73839698b080c05f863ac66e4fedeab4fc':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-05-02 19:53:52 +00:00
Deepanshu Gupta
e8045e1071 am d35e28f3: am d88cece4: am d683d56c: (-s ours) am 35a94df7: am ea18b2d6: am 95fd97aa: (-s ours) am 84e7a6b8: am 443372dd: am 9d7b5165: Add libphonenumber to layoutlib.jar. [DO NOT MERGE] 
* commit 'd35e28f38b0c496a068ba3ce951c3e7b3fe77a52':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
 2014-05-02 19:53:49 +00:00
Deepanshu Gupta
c03530c18f am b20352f5: am 33f44937: am e9c20fd4: (-s ours) am 81f1e754: am fd581059: am 88a12f57: (-s ours) am 43034b54: am 62591cff: am 689c0dfe: Fix NPE in layoutlib. [DO NOT MERGE] 
* commit 'b20352f5ba50445419ea0a95e414428003787e55':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-02 19:53:46 +00:00