summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Hide InputDevice#supportsSource DO NOT MERGE" into klp-modular-devJustin Koh2014-05-052-1/+1
|\
| * Hide InputDevice#supportsSource DO NOT MERGEJustin Koh2014-05-052-1/+1
| | | | | | | | | | Bug: 14116162 Change-Id: I7c0ae516596f965083622aa77281abf6d47dc0b7
* | DO NOT MERGE Hide Notification categories from API 20 (KKWT)Griff Hazen2014-05-052-16/+16
|/ | | | | | Bug: 14116162 Change-Id: I59e499dde9a06a4bf455eecb3665afaa1b574dae
* Merge "Hide HDMI CEC from KKWT DO NOT MERGE" into klp-modular-devJustin Koh2014-05-056-134/+9
|\
| * Hide HDMI CEC from KKWT DO NOT MERGEJustin Koh2014-05-056-134/+9
| | | | | | | | | | | | Hide HDMI CEC from KKWT. Bug: 14116162 Change-Id: I086a5e51bd848a5097ccb0c47900fde30db2e7aa
* | Merge "Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGE" ↵Justin Koh2014-05-052-1/+1
|\ \ | | | | | | | | | into klp-modular-dev
| * | Hide getRequiredPermission in android.hardware.Sensor DO NOT MERGEJustin Koh2014-05-052-1/+1
| |/ | | | | | | | | | | | | Hide getRequiredPermission in android.hardware.Sensor. Bug: 14116162 Change-Id: I1e5c8361f6d0710c5da78d9506f70fa40a814b92
* | Merge "Hide UsbDevice changes in KKWT DO NOT MERGE" into klp-modular-devJustin Koh2014-05-052-3/+3
|\ \
| * | Hide UsbDevice changes in KKWT DO NOT MERGEJustin Koh2014-05-052-3/+3
| |/ | | | | | | | | | | Hide UsbDevice changes in KKWT. Bug: 14116162 Change-Id: I1582b9d536b243fa18beca6fdd8f379f9e32e137
* | Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-devJustin Koh2014-05-052-2/+3
|\ \
| * | Hide getDeviceGlobalActionKeyTimeoutJustin Koh2014-05-052-2/+3
| |/ | | | | | | | | | | | | | | Hide getDeviceGlobalActionKeyTimeout, as requested. Remove mention from @deprecated notice. Bug: 14441321 Change-Id: Ic6e84e718c2eaa15a86d8cd4d13645be88490b61
* | Hide NsdServiceInfo additions for KKWT DO NOT MERGEJustin Koh2014-05-052-4/+6
|/ | | | | | Hide NsdServiceInfo additions for KKWT. Bug: 14116162 Change-Id: I98755a2524168be5e833a634192fd49ff3c32346
* am f2d2c871: AAPT should not process XML that failed to compileAdam Lesinski2014-05-051-4/+5
|\ | | | | | | | | * commit 'f2d2c871813656012420faa89080d8e3cda1f308': AAPT should not process XML that failed to compile
| * AAPT should not process XML that failed to compileAdam Lesinski2014-05-051-4/+5
| | | | | | | | | | | | | | | | | | | | 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
* | Merge "Pause and resume ActivityView when visibility changes" into ↵Craig Mautner2014-05-052-3/+32
|\ \ | | | | | | | | | klp-modular-dev
| * | Pause and resume ActivityView when visibility changesCraig Mautner2014-05-052-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Add null check to embeddedAllowed check" into klp-modular-devCraig Mautner2014-05-051-1/+1
|\ \ \
| * | | Add null check to embeddedAllowed checkCraig Mautner2014-05-051-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am fd876194: am 4146d546: Merge "Clarified recommended use cases for NDK. ↵David Friedman2014-05-050-0/+0
|\ \ \ | |/ / |/| / | |/ | | | | | | 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.
| * am 4146d546: Merge "Clarified recommended use cases for NDK. Added - "game ↵David Friedman2014-05-050-0/+0
| |\ | | | | | | | | | | | | | | | | | | 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.
| | * Merge "Clarified recommended use cases for NDK. Added - "game engines" ↵David Friedman2014-05-051-2/+2
| | |\ | | | | | | | | | | | | 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
| | | * Clarified recommended use cases for NDK.Vince Harron2014-04-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Change-Id: I098de65bf0c4b4ab4a85611426b68613692e52c5 (cherry picked from commit 8da272f4fe4f1d50543afe488406d56b669364a1)
* | | | Merge "add getAddress function to return BT mac" into klp-modular-devGuang Zhu2014-05-031-0/+8
|\ \ \ \
| * | | | add getAddress function to return BT macGuang Zhu2014-05-021-0/+8
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib2bcd123e066672e411550856db862059949100e
* | | | | am c7149708: am bab277cc: am 13542c7e: (-s ours) am 00e0b992: am 75f435b0: ↵Deepanshu Gupta2014-05-020-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 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]
| * | | | am bab277cc: am 13542c7e: (-s ours) am 00e0b992: am 75f435b0: am 495c14d8: ↵Deepanshu Gupta2014-05-020-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-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]
| | * \ \ \ am 13542c7e: (-s ours) am 00e0b992: am 75f435b0: am 495c14d8: (-s ours) am ↵Deepanshu Gupta2014-05-020-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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]
| | | * \ \ \ am 00e0b992: am 75f435b0: am 495c14d8: (-s ours) am 47ad22ed: am 961e3281: ↵Deepanshu Gupta2014-05-020-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 6df2860b: Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE] * commit '00e0b992f2243ef06a6c55b10142725470980a52': Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
| | | | * \ \ \ am 75f435b0: am 495c14d8: (-s ours) am 47ad22ed: am 961e3281: am 6df2860b: ↵Deepanshu Gupta2014-05-020-0/+0
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE] * commit '75f435b0f411eae66b4e34ec24f03a5d09d2be26': Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
| | | | | * \ \ \ am 495c14d8: (-s ours) am 47ad22ed: am 961e3281: am 6df2860b: Add missing ↵Deepanshu Gupta2014-05-020-0/+0
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files to fix libphonenumber for layoutlib. [DO NOT MERGE] * commit '495c14d8b8e8a52554cfc0776c48d328657cda95': Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
| | | | | | * \ \ \ am 47ad22ed: am 961e3281: am 6df2860b: Add missing files to fix ↵Deepanshu Gupta2014-05-029-31/+143
| | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libphonenumber for layoutlib. [DO NOT MERGE] * commit '47ad22edb7df502356598d417adbce0b0ce35616': Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
| | | | | | | * \ \ \ am 961e3281: am 6df2860b: Add missing files to fix libphonenumber for ↵Deepanshu Gupta2014-05-029-31/+143
| | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layoutlib. [DO NOT MERGE] * commit '961e328176b4a5f522effcfb52ff80458af03a81': Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
| | | | | | | | * \ \ \ am 6df2860b: Add missing files to fix libphonenumber for layoutlib. [DO NOT ↵Deepanshu Gupta2014-05-029-31/+143
| | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE] * commit '6df2860b2316fb42e8686c3154b2156619c7777f': Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
| | | | | | | | | * | | | Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]Deepanshu Gupta2014-05-029-31/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8102da6c1c4625e887293a8823770d199521c53f (cherry-picked from 8a16f8e29a67c383e065ba9c47d5d1e80d7d2db9)
* | | | | | | | | | | | | am b4367eaf: am 5ac33148: am 29376cea: (-s ours) am a996ff5c: am c529b700: ↵Deepanshu Gupta2014-05-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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]
| * | | | | | | | | | | | am 5ac33148: am 29376cea: (-s ours) am a996ff5c: am c529b700: am 8ad4b8b1: ↵Deepanshu Gupta2014-05-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-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]
| | * | | | | | | | | | | am 29376cea: (-s ours) am a996ff5c: am c529b700: am 8ad4b8b1: (-s ours) am ↵Deepanshu Gupta2014-05-020-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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]
| | | * | | | | | | | | | am a996ff5c: am c529b700: am 8ad4b8b1: (-s ours) am 9932e589: am 9e2dadae: ↵Deepanshu Gupta2014-05-020-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am bcbeaf83: Set default text style in layoutlib as NORMAL [DO NOT MERGE] * commit 'a996ff5cebbbac88362a16ca47ff11b06120822c': Set default text style in layoutlib as NORMAL [DO NOT MERGE]
| | | | * | | | | | | | | am c529b700: am 8ad4b8b1: (-s ours) am 9932e589: am 9e2dadae: am bcbeaf83: ↵Deepanshu Gupta2014-05-020-0/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set default text style in layoutlib as NORMAL [DO NOT MERGE] * commit 'c529b70031f72dc31d53fa8640ada33837b0c203': Set default text style in layoutlib as NORMAL [DO NOT MERGE]
| | | | | * | | | | | | | am 8ad4b8b1: (-s ours) am 9932e589: am 9e2dadae: am bcbeaf83: Set default ↵Deepanshu Gupta2014-05-020-0/+0
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | text style in layoutlib as NORMAL [DO NOT MERGE] * commit '8ad4b8b1fedc9a200b49f322e73d406d43e32327': Set default text style in layoutlib as NORMAL [DO NOT MERGE]
| | | | | | * | | | | | | am 9932e589: am 9e2dadae: am bcbeaf83: Set default text style in layoutlib ↵Deepanshu Gupta2014-05-021-0/+3
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as NORMAL [DO NOT MERGE] * commit '9932e589b0f604b1c553e043cd6a60adbc1b7055': Set default text style in layoutlib as NORMAL [DO NOT MERGE]
| | | | | | | * | | | | | am 9e2dadae: am bcbeaf83: Set default text style in layoutlib as NORMAL [DO ↵Deepanshu Gupta2014-05-021-0/+3
| | | | | | | |\ \ \ \ \ \ | | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE] * commit '9e2dadaee0d04b43cf41ed32b4a9ec59503f4477': Set default text style in layoutlib as NORMAL [DO NOT MERGE]
| | | | | | | | * | | | | am bcbeaf83: Set default text style in layoutlib as NORMAL [DO NOT MERGE]Deepanshu Gupta2014-05-021-0/+3
| | | | | | | | |\ \ \ \ \ | | | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bcbeaf83ca75e4a819377938fdf3ec1e07fa30a7': Set default text style in layoutlib as NORMAL [DO NOT MERGE]
| | | | | | | | | * | | | Set default text style in layoutlib as NORMAL [DO NOT MERGE]Deepanshu Gupta2014-05-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a style doesn't specify text style (normal/bold/italic/bold-italic) then default to normal instead of throwing an error. Bug: http://b.android.com/61358 Change-Id: I0138c73807a5ff6e4d938a99ece3044333110aa1 (cherry-picked from c63e87d53deb24c4286036313db11719173419b3)
* | | | | | | | | | | | | am 6241a6ce: am eecb79a8: am 22b47b28: (-s ours) am 16fda528: am b7431172: ↵Deepanshu Gupta2014-05-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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]
| * | | | | | | | | | | | am eecb79a8: am 22b47b28: (-s ours) am 16fda528: am b7431172: am 826a215c: ↵Deepanshu Gupta2014-05-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (-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]
| | * | | | | | | | | | | am 22b47b28: (-s ours) am 16fda528: am b7431172: am 826a215c: (-s ours) am ↵Deepanshu Gupta2014-05-020-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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]
| | | * | | | | | | | | | am 16fda528: am b7431172: am 826a215c: (-s ours) am 320f1126: am cf3f108e: ↵Deepanshu Gupta2014-05-020-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 5be65fda: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] * commit '16fda52842b470614a0b95d210e916090fd6973f': Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
| | | | * | | | | | | | | am b7431172: am 826a215c: (-s ours) am 320f1126: am cf3f108e: am 5be65fda: ↵Deepanshu Gupta2014-05-020-0/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] * commit 'b7431172a4c0dd0f73bce4d06e765cc0d9467301': Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
| | | | | * | | | | | | | am 826a215c: (-s ours) am 320f1126: am cf3f108e: am 5be65fda: Fix ↵Deepanshu Gupta2014-05-020-0/+0
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] * commit '826a215c8b27babd041a77a8cdd2f42a29b240bd': Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
generated by cgit v1.1 at 2025-02-04 19:04:27 +0000