summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge "AAPT2: Remove the need for specifying package name in compile phase" ↵Adam Lesinski2015-06-187-62/+74
|\ | | | | | | into mnc-dev
| * AAPT2: Remove the need for specifying package name in compile phaseAdam Lesinski2015-06-127-62/+74
| | | | | | | | | | | | | | | | | | | | | | | | The compile phase doesn't use the AndroidManifest, so we had to specify the package name on the command line. We can omit the package name, since we don't resolve external references in the compile phase. Packages that reference the current package will be encoded with no package name. When loaded by the link phase, the package name will be supplied and all the references with no package name will use that one. Change-Id: I9fe4902b747b06899b45c968f30ba1aa05c5cd69
* | Fix issue #21814207 and issue #21814212 (alarm manager)Dianne Hackborn2015-06-171-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #21814207: AlarmManager.setAndAllowWhileIdle should also allow wake locks. Introduce a whole new infrastructure for providing options when sending broadcasts, much like ActivityOptions. There is a single option right now, asking the activity manager to apply a tempory whitelist to each receiver of the broadcast. Issue #21814212: Need to allow configuration of alarm manager parameters The various alarm manager timing configurations are not modifiable through settings, much like DeviceIdleController. Also did a few tweaks in the existing DeviceIdleController impl. Change-Id: Ifd01013185acc4de668617b1e46e78e30ebed041
* | am fa794eb0: am 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix ↵Diego Perez2015-06-152-2/+6
|\ \ | | | | | | | | | | | | | | | | | | for shadows on theme editor" into lmp-mr1-dev * commit 'fa794eb0025dbec6c1b90135495081d42f06bdaf': Fix for shadows on theme editor
| * \ am 2f710356: am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows ↵Diego Perez2015-06-152-2/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | on theme editor" into lmp-mr1-dev * commit '2f7103565cf1732d6d1281195cfa49a1564751d7': Fix for shadows on theme editor
| | * \ am 13c06d6c: am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme ↵Diego Perez2015-06-152-2/+6
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | editor" into lmp-mr1-dev * commit '13c06d6c91e67962b7ffdf92c56e3b01125e4a8d': Fix for shadows on theme editor
| | | * \ am 1f33bdad: am 5e50e00c: Merge "Fix for shadows on theme editor" into ↵Diego Perez2015-06-152-2/+6
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '1f33bdad98dd5138f887642d39c9495e1d7df14b': Fix for shadows on theme editor
| | | | * \ Merge "Fix for shadows on theme editor" into lmp-mr1-devDiego Perez2015-06-152-2/+6
| | | | |\ \
| | | | | * | Fix for shadows on theme editorDiego Perez2015-06-022-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the preferred ColorModel doesn't support alpha, the shadows are incorrectly rendered. In the theme editor on Linux, the graphics device object doesn't support alpha so we need to use a different color model. We default to ARGB which works fine. Change-Id: I3e71e3d086fa4975a9149d36792e574813f37dfd
* | | | | | | am 40a216d9: am df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge "Fix ↵Diego Perez2015-06-151-2/+13
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GcSnapshot drawInLayer when clipping is used." into lmp-mr1-dev * commit '40a216d95973bb897ee0d755ef260a616f176798': Fix GcSnapshot drawInLayer when clipping is used.
| * | | | | | am df6f63ba: am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot ↵Diego Perez2015-06-151-2/+13
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drawInLayer when clipping is used." into lmp-mr1-dev * commit 'df6f63badfe2572284dad8e34f152fd1c24a873e': Fix GcSnapshot drawInLayer when clipping is used.
| | * | | | | am 2422011d: am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer ↵Diego Perez2015-06-151-2/+13
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when clipping is used." into lmp-mr1-dev * commit '2422011d867f4d4516605148641bbeb7d9c2501b': Fix GcSnapshot drawInLayer when clipping is used.
| | | * | | | am b2411c62: am ead59b0d: Merge "Fix GcSnapshot drawInLayer when clipping is ↵Diego Perez2015-06-151-2/+13
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | used." into lmp-mr1-dev * commit 'b2411c622cf9124f6af5f70d416adb179f9c88bb': Fix GcSnapshot drawInLayer when clipping is used.
| | | | * | | Merge "Fix GcSnapshot drawInLayer when clipping is used." into lmp-mr1-devDiego Perez2015-06-151-2/+13
| | | | |\ \ \
| | | | | * | | Fix GcSnapshot drawInLayer when clipping is used.Diego Perez2015-05-071-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GcSnapshot only allocates an image for tinting that is the size of the current clipping area. When drawing to that image, the wrong coordinate system was used since now we are dealing with only the clipping rect we need to translate -clipX, -clipY the drawing so it's painted at 0,0 of the new BufferedImage. Change-Id: Id8639d5ea9bef36ac07743df332161d6eadc6a81
* | | | | | | | am ce5a79da: am d717682d: am 5c597c1d: am a8854564: am ce4a9d91: Merge "New ↵Diego Perez2015-06-157-2/+357
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | custom widgets library" into lmp-mr1-dev * commit 'ce5a79dacfb152317429cb69c28fe8bb39c02f4c': New custom widgets library
| * | | | | | | am d717682d: am 5c597c1d: am a8854564: am ce4a9d91: Merge "New custom ↵Diego Perez2015-06-127-2/+357
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | widgets library" into lmp-mr1-dev * commit 'd717682df97e812d4a25f93b0c9e84548767d8e1': New custom widgets library
| | * | | | | | am 5c597c1d: am a8854564: am ce4a9d91: Merge "New custom widgets library" ↵Diego Perez2015-06-127-2/+357
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '5c597c1d89c529675096c2d326c452145403979d': New custom widgets library
| | | * | | | | am a8854564: am ce4a9d91: Merge "New custom widgets library" into lmp-mr1-devDiego Perez2015-06-127-2/+357
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a885456426ec267d37c6a527285d965f81e14f9d': New custom widgets library
| | | | * | | | Merge "New custom widgets library" into lmp-mr1-devDiego Perez2015-06-127-2/+357
| | | | |\ \ \ \
| | | | | * | | | New custom widgets libraryDiego Perez2015-05-147-2/+357
| | | | | | |/ / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the widgets needed by the theme editor as a jar file that will be linked from AS. The controls currently are: - ThemePreviewLayout: A custom layout that allows to dynamically reflow cards that display the theme preview. - PressedButton: Custom button to display in a pressed state (currently we can only do it programatically). - ErrorCatcher: View that can wrap other view and stops a view throwing exceptions that will break the theme editor rendering. This is currently used to wrap the custom controls loaded from the source code. The new library currently depends on bridge to be able to use the logger for the ErrorCatcher view. The ErrorCatcher view is a temporary solution that will be replaced in a future CL and the dependency will be removed. Change-Id: I832c447e22e1381abff74c46c4282921b3f6fa23
* | | | | | | | resolved conflicts for merge of 5a53816b to mnc-devDiego Perez2015-06-151-3/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | | Change-Id: Ice1ba8cb9793432e18635e77f4e3309f50bb7b3f
| * | | | | | am c051c556: am e10e8005: am 68155986: am f5a99437: Merge "Fix crash when ↵Diego Perez2015-06-121-2/+9
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shadowSize is 0" into lmp-mr1-dev * commit 'c051c556669f88e284f2922f8d28fad2138598ae': Fix crash when shadowSize is 0
| | * | | | | am e10e8005: am 68155986: am f5a99437: Merge "Fix crash when shadowSize is ↵Diego Perez2015-06-121-2/+9
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0" into lmp-mr1-dev * commit 'e10e8005903572158cbb9c7f869508a247ff51ad': Fix crash when shadowSize is 0
| | | * | | | am 68155986: am f5a99437: Merge "Fix crash when shadowSize is 0" into ↵Diego Perez2015-06-121-2/+9
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '68155986508ef8b497228f8e60346d317e87991d': Fix crash when shadowSize is 0
| | | | * | | Fix crash when shadowSize is 0Diego Perez2015-05-081-2/+9
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9f131afc95a2571fbc8a737df37f43653cfbb90d (cherry picked from commit e81096458f689ab3c0c4dbab2452722c3e3623c4)
| * | | | | am 037c9cac: Merge "Fix build." into cw-d-mr1-devFilip Gruszczynski2015-05-211-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '037c9caccdc98bfe9d952e797535611c791787aa': Fix build.
| | * | | | Merge "Fix build." into cw-d-mr1-devFilip Gruszczynski2015-05-211-1/+1
| | |\ \ \ \
| | | * | | | Fix build.Filip Gruszczynski2015-05-201-1/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | Change-Id: I49f669ee8eed53cf2fc30077cf0a066312865733
* | | | | | Merge "Support AppBar from Material Design." into mnc-devJens Ole Lauridsen2015-06-124-1/+182
|\ \ \ \ \ \
| * | | | | | Support AppBar from Material Design.Jens Ole Lauridsen2015-06-114-1/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL is a start for making the design able to render the AppBar. We are still missing support for: system menu and the app icon. Change-Id: I19600f8ee1e7e6492186a0b7ae7fb38c82e15c02
* | | | | | | Configure auto-rotation tilt tolerance in config.xml.Jeff Brown2015-06-112-1/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows for the thresholds to be tuned differently for different products as needed. Bug: 18276856 Change-Id: I6c87e683dea6a17cf606203a894c8419e20d3658
* | | | | | AAPT2: Proguard rules generation added.Adam Lesinski2015-06-0911-6/+458
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifbe79516cd9a1ade471e211a259301c63b62ac67
* | | | | | AAPT2: Add manifest mergingAdam Lesinski2015-06-046-16/+599
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that AAPT2 is library-aware, it needs to take care of all library related work, including merging manifests. The logic was taken from the current Java ManifestMerger. Change-Id: Id93f713f27ae8617922bf89e325e45be9f863c06
* | | | | | Merge "AAPT2: Change xml file parsing to DOM based" into mnc-devAdam Lesinski2015-06-0412-830/+1272
|\ \ \ \ \ \
| * | | | | | AAPT2: Change xml file parsing to DOM basedAdam Lesinski2015-06-0412-830/+1272
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We modify the XML of layouts and AndroidManifest enough that it warrants we operate on the tree in memory. These files are never very large so this should be fine. Change-Id: I5d597abdb3fca2a203cf7c0b40fcd926aecb3137
* | | | | | | Merge "aapt: add option for stricter symbol generation" into mnc-devAdrian Roos2015-06-025-3/+49
|\ \ \ \ \ \ \
| * | | | | | | aapt: add option for stricter symbol generationAdrian Roos2015-06-025-3/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds an option that prevents generating java symbols for string resources that don't have a default localization. Bug: 21537397 Change-Id: Ifafa942b24d5cdbed93651cde363e859be13d395
* | | | | | | | LayoutLib: Skip classes from java package.Deepanshu Gupta2015-06-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Classes in "java" package can't be defined at runtime anyway. No use including them in LayoutLib. Change-Id: I7e7c46f0d74e32c893b23093828569b4fa5e3a73
* | | | | | | | Skip warnings for some unresolved references.Deepanshu Gupta2015-06-011-0/+41
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some applications rename the newer RTL attributes to the older attributes in order to target RTL locales, but not need to include two attributes everywhere it's needed. For example, iosched renames paddingStart to paddingLeft (among other attributes) for API 17 and above. This leads to hundreds of warnings about missing attributes. This change suppresses such warnings. Also, skip adding unresolved attributes to the typed array. This is more in line with the actual implementation on device, and prevents unexpected warnings/errors/crashes later. Change-Id: Iee616fa6295aa9731ede0cf9dcd6dd2bd1fe8f20
* | | | | | | Merge "Revert "Revert "Fix build.""" into mnc-devFilip Gruszczynski2015-06-011-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Revert "Revert "Fix build.""Filip Gruszczynski2015-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 944a6c937cd3576ecae5c3fdd0dcf265329e6bcf. Change-Id: I7daa255f331a1e39308eb626580aa00c63c5cb3e
* | | | | | | | Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to ↵Filip Gruszczynski2015-06-011-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev""" into mnc-dev
| * | | | | | | | Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""Filip Gruszczynski2015-05-271-2/+2
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes the fix for the broken dialog windows. The outsets will only be calculated and applied if the window is full screen, since they don't make much sense otherwise. This reverts commit 4bb6b751fbbb218e8a298db4aa008472a0aa8d31. Change-Id: I977a85a78c990c1840784dc0be0dddd5a6d84e6b
* | | | | | | | Fix ParserFactory not initialized error.Deepanshu Gupta2015-05-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b.android.com/175129 Change-Id: I2111673767e0f62ee910560022b559a177d55abd
* | | | | | | | Fix NPE in BridgeContext.obtainStyledAttributes()Deepanshu Gupta2015-05-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace direct member access with getter that checks for nullness. Change-Id: I4a56a0ee903ae7d8c89b91d74b128302e1965586
* | | | | | | | Fix BridgeTypedArray.getType()Deepanshu Gupta2015-05-281-8/+114
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also includes some fixes for BridgeTypedArray.getInt() - when value is a color, when value is an octal int, when value is true/false. Bug: http://b.android.com/162438 Change-Id: I0b985ea3437be8018d0e116e7a599843cc7aacd6
* | | | | | | Merge "Include Shapes in LayoutLib." into mnc-devDeepanshu Gupta2015-05-261-3/+1
|\ \ \ \ \ \ \
| * | | | | | | Include Shapes in LayoutLib.Deepanshu Gupta2015-05-261-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifb32882c478f8d407ad904e224b67fe2bd65dc08
* | | | | | | | Merge "LayoutLib: Support getting resource arrays." into mnc-devDeepanshu Gupta2015-05-2622-14/+245
|\ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-10-27 13:29:00 +0000