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

120856 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Koh
3caf925824 Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev 2014-05-05 22:33:29 +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
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
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
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
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
1edfd835c2 Merge "add getAddress function to return BT mac" into klp-modular-dev 2014-05-03 00:32:58 +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
Deepanshu Gupta
e5a066c726 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 'ad0060b5814fffb491568fd926cf9bacb8b015b3':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-02 19:53:43 +00:00
Deepanshu Gupta
551ee874b7 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 '94f1de7a45abd0ff1ac1d83db9e937929270e407':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-02 19:53:40 +00:00
Deepanshu Gupta
f07310bbc3 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 '61c8829ab7dd496c03d8cad86f1718f28c8f7265':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-02 19:53:38 +00:00
Deepanshu Gupta
02e4ee55d0 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 'e216cfc41223c1bd820f5ac34ebad3cd544771e9':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
 2014-05-02 19:53:35 +00:00
Deepanshu Gupta
c7149708e2 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 'bab277cc9f6efd0f026a6fe30592acacf173178e':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-05-02 19:50:48 +00:00
Deepanshu Gupta
b4367eafbc 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 '5ac331481a9531a11dfe81d21870d70c362a9a2c':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-05-02 19:50:46 +00:00
Deepanshu Gupta
6241a6ce28 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 'eecb79a863583998159cb44d393db03eebbdf7bc':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-05-02 19:50:43 +00:00
Deepanshu Gupta
00251f7782 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 'd1830eb67841601ea259a4c6cbaf754aceac4064':
  Improve text rendering and measurement. [DO NOT MERGE]
 2014-05-02 19:50:41 +00:00
Deepanshu Gupta
6214d7aa50 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 '5f0fb2a1fd5bd98b3ab818ca7e509f638fece783':
  Fix the measurement of text bounds. [DO NOT MERGE]
 2014-05-02 19:50:38 +00:00
Deepanshu Gupta
eec3eb8694 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 'c1ce1c998163af3753f326aa391ff4d7bcee0cc5':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-05-02 19:50:36 +00:00
Deepanshu Gupta
73e7402e60 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 '7b6ab8f32a3404f601d555812487d0d92138be92':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-05-02 19:50:33 +00:00
Deepanshu Gupta
02a07b7383 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 '20e540be098be58f48778db33d8123ebdcfd182d':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-05-02 19:50:31 +00:00
Deepanshu Gupta
d35e28f38b 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 'd88cece4e2800cedb2e09fe20c09a9704c039019':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
 2014-05-02 19:50:28 +00:00
Deepanshu Gupta
b20352f5ba 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 '33f44937e0e6a6276dc4c2a566f0cd482773582d':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-05-02 19:50:25 +00:00
Deepanshu Gupta
ad0060b581 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 '1da7b0b51a185ce086f7c7e4efd6191c6c0c1069':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-05-02 19:50:23 +00:00
Deepanshu Gupta
94f1de7a45 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 '27c91491490004494fb7c2f5125a98cb7b6518e9':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-02 19:50:20 +00:00
Deepanshu Gupta
61c8829ab7 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 '67da11c21e92022148025023c16b4a2b926e3ffd':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
 2014-05-02 19:50:18 +00:00
Deepanshu Gupta
e216cfc412 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 '1e884cd00957b8314dd72448ecd808381abe7141':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
 2014-05-02 19:50:15 +00:00
Deepanshu Gupta
bab277cc9f 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 '13542c7e827c4119785a59bfc9599ec3f48667de':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-05-02 19:48:07 +00:00
Deepanshu Gupta
5ac331481a 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 '29376cea1b9c7e17562540e31ca14565361d693b':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-05-02 19:48:05 +00:00
Deepanshu Gupta
eecb79a863 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 '22b47b281c0669ec6abe275a7ef4a4c1ad671ad5':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-05-02 19:48:02 +00:00
Deepanshu Gupta
d1830eb678 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 '57e410d9b62c8b50e0ea2a427b83e32cedde1d43':
  Improve text rendering and measurement. [DO NOT MERGE]
 2014-05-02 19:47:59 +00:00
Deepanshu Gupta
5f0fb2a1fd 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 '4da3827fa44b5a579ca65b33f8571ec7e669aa75':
  Fix the measurement of text bounds. [DO NOT MERGE]
 2014-05-02 19:47:56 +00:00
Deepanshu Gupta
c1ce1c9981 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 '951c69760ff6daa8ce85b4d8c680ed40943a4295':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-05-02 19:47:53 +00:00
Deepanshu Gupta
7b6ab8f32a 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 '031f4bebb05a4a6e59df9cce995dbfdfe54f8300':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
 2014-05-02 19:47:51 +00:00
Deepanshu Gupta
20e540be09 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 '2d7a9c3ed93e8187c687cac3af096d4dd017637b':
  Add methods for Time_Delegate [DO NOT MERGE]
 2014-05-02 19:47:48 +00:00
Deepanshu Gupta
d88cece4e2 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 'd683d56c93d2fa5e73fc16535e9121eb90e15794':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
 2014-05-02 19:47:45 +00:00