summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Revert "Fix build."" into mnc-devDeepanshu Gupta2015-05-231-1/+1
|\
| * Revert "Fix build."Deepanshu Gupta2015-05-231-1/+1
| | | | | | | | | | | | | | | | | | This reverts commit 97b3ae1a8766616675ebf2323a97d8adfd41bfdc. Reverted since 4bb6b751fbbb218e8a298db4aa008472a0aa8d31 reverts the commit that warranted this change. Change-Id: I56d0eb8ffba44a673ae357e9543dd18f6c03c54f
* | Revert "resolved conflicts for merge of 47249f2a to mnc-dev"Dianne Hackborn2015-05-221-2/+2
|/ | | | | This reverts commit c7becb7ee78881646251ff4846e63eb6b96bf7ec, reversing changes made to 8562b08f04c1309cf40db1e749d612b6824f1d12.
* Fix build.Filip Gruszczynski2015-05-221-1/+1
| | | | | | | Cherry picking because automerger is stuck. Change-Id: I49f669ee8eed53cf2fc30077cf0a066312865733 (cherry picked from commit c1b736a0cdf41ab5863bfe6901e46c95cc396342)
* Merge "resolved conflicts for merge of 47249f2a to mnc-dev" into mnc-devFilip Gruszczynski2015-05-221-2/+2
|\
| * resolved conflicts for merge of 47249f2a to mnc-devFilip Gruszczynski2015-05-201-2/+2
| |\ | | | | | | | | | | | | | | | This is a merge of chin support. Change-Id: I436b751b3c4aaa6b46cfcdb475e02eedfa5a5635
| | * am cb89ac84: Merge "Support for devices with a chin." into cw-d-mr1-devFilip Gruszczynski2015-05-201-2/+2
| | |\ | | | | | | | | | | | | | | | | * commit 'cb89ac84c621e047d81873428325dfd747b90a6b': Support for devices with a chin.
| | | * Support for devices with a chin.Filip Gruszczynski2015-05-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Information about the chin is now part of the config.xml instead of the theme. It is retrieved by WindowManagerService and passed to the clients as insets. Clients can adjust their behavior in a way that makes it invisible to the user, that part of the surface doesn't actually exist. Bug: 19908853 Change-Id: Iedf57bf3c848201b854f91ffeb3b59187d375c1f
* | | | Add LayoutLibDelegate for new Bitmap method.Deepanshu Gupta2015-05-211-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Original method added in: 721ae5fec5f1fd4f93aa2a361a0ac298e15ce353 Change-Id: Ie14d132459638cf103c390fae3f4c0c02bef2f34
* | | | Add documentation about hack in commit: f8ea750455Deepanshu Gupta2015-05-211-0/+14
|/ / / | | | | | | | | | Change-Id: I9ce871a67fb67e02e0c4df1eb5c3261ea52a914b
* | | Fix overrides for BridgeResources.Deepanshu Gupta2015-05-201-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | New method overloads have been introduces in android.content.Resources. Change BridgeResources to overrides the appropriate ones. Also, fix the implementation to the new behaviour. Change-Id: I7b83b329f04286512f223c0fafc3f989f1b9a244
* | | Make DatePicker rendering not fail.Deepanshu Gupta2015-05-203-26/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensures that having a DatePicker in the layout doesn't crash the complete rendering. The rendering is still not perfect, but at least it works. - Return a non-null window token so that ViewPager thinks that it's attached to a window and doesn't skip populating the views. - Fix a style not found issue. Change-Id: Ied2b71de5b32bcb640bf4ec445e8a39509f800e9
* | | Use non deprecated method for creating ColorStateListDeepanshu Gupta2015-05-201-1/+2
| | | | | | | | | | | | Change-Id: I9fce928276c8a2af55eb0615a4895abb6a973be5
* | | Fix line breaking.Deepanshu Gupta2015-05-201-47/+36
| | | | | | | | | | | | | | | | | | | | | Essentially moves line breaking measurement later in the process when character widths have already been computed. Change-Id: I17c5bc10d373d8906c5caf86604ce8504650cd7f
* | | Merge "Inject anonymous inner classes of injected classes" into mnc-devDeepanshu Gupta2015-05-204-11/+32
|\ \ \
| * | | Inject anonymous inner classes of injected classesDeepanshu Gupta2015-05-204-11/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When injecting classes in LayoutLib (eg. CreateInfo), so that LayoutLib can refer back to the changes, also inject the anonymous inner classes. Without this, the injected classes are not loadable. Although, LayoutLib itself doesn't load these classes, but some tests do. Change-Id: Ib5f6b779ef4d79dec8d614d3dbb26eeac88a1064
* | | | Merge "Update platformDir search in tests." into mnc-devDeepanshu Gupta2015-05-201-2/+7
|\ \ \ \ | |/ / /
| * | | Update platformDir search in tests.Deepanshu Gupta2015-05-201-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to find the SDK Platform Dir for LayoutLib tests, also test if the dir from which the tests are run is module dir. Change-Id: Id5c6038d07ebbb122e38f907ad488ed1f2bcde32
* | | | Merge "Make Context.getClassLoader() work." into mnc-devDeepanshu Gupta2015-05-2011-31/+347
|\ \ \ \ | |/ / /
| * | | Make Context.getClassLoader() work.Deepanshu Gupta2015-05-1911-31/+347
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Context.getClassLoader() is used by the LayoutInflater and can be used by custom views. However, when called from the LayoutInflater, this needs to return only the Framework classes. This is so that the IDE gets a chance to instantiate the custom views, which helps in better error reporting and better fallback in case of exceptions, like MockView. To workaround this need of the same method returning different results based on where it's called from, the method call in LayoutInflater is renamed to getFrameworkClassLoader() and the new method is injected in Context. The implementation of getFrameworkClassLoader() maintains the existing behaviour of getClassLoader(). Context.getClassLoader() is now modified to return classes from both Framework and the app namespace. Also, update the list of packages to search for Framework views. Change-Id: I1a6be4aa1fc5c1c5520b5440a348a52f10b6eb3b
* | | | Merge "Fix include tag rendering." into mnc-devDeepanshu Gupta2015-05-192-6/+11
|\ \ \ \ | |/ / /
| * | | Fix include tag rendering.Deepanshu Gupta2015-05-192-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A missing catch clause caused rendering to be failed when there is an include tag that doesn't specify layout_width and layout_height. Also improve the error messages to make debugging easier next time. Change-Id: I617762636973a010b34da167c7b5fcd328b7d178
* | | | Merge "Show better error message for color attr not found." into mnc-devDeepanshu Gupta2015-05-181-0/+5
|\ \ \ \ | |/ / /
| * | | Show better error message for color attr not found.Deepanshu Gupta2015-05-181-0/+5
| | | | | | | | | | | | | | | | Change-Id: I1ca32989522d30fec336eb607ee81f9e5cb5f48f
* | | | Merge "Add -round and -notround qualifier to android runtime/aapt" into mnc-devAdam Powell2015-05-184-1/+48
|\ \ \ \
| * | | | Add -round and -notround qualifier to android runtime/aaptAdam Lesinski2015-05-154-1/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The round qualifier denotes a device with a screen shape that is round. The qualifier shows up after the 'long/notlong' qualifier and before the orientation 'port/land/square' qualifiers. Change-Id: I3044258b2703a9165694b79725bade770fa6cea1
* | | | | Merge "Fix nav bar spacing for tablets." into mnc-devDeepanshu Gupta2015-05-183-21/+99
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix nav bar spacing for tablets.Deepanshu Gupta2015-05-183-21/+99
| |/ / / | | | | | | | | | | | | Change-Id: Ieee2c2174a3041a0f967cc75bbe74d8bf882ced7
* | | | Merge "AAPT2: Fix layout versioning" into mnc-devAdam Lesinski2015-05-162-14/+58
|\ \ \ \ | |/ / / |/| | |
| * | | AAPT2: Fix layout versioningAdam Lesinski2015-05-142-14/+58
| | | | | | | | | | | | | | | | Change-Id: I37190cf8a1f0a81c068aeb2b5326b3b3080f75a5
* | | | Fix build: udpate parser factory methodDeepanshu Gupta2015-05-141-2/+11
| | | | | | | | | | | | | | | | Change-Id: I78ad55bc924427b44451ec32fbd1032d6cd77544
* | | | Don't keep LayoutlibCallback reference.Deepanshu Gupta2015-05-143-84/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to the newer API that enables keeping a reference only to the ParserFactory which is a much leaner object as compared to LayoutlibCallback. Change-Id: I9b7afd93226db23786a00b2951cbf5ae5b8f3e5f
* | | | Move couple of intellij libraries to project level.Deepanshu Gupta2015-05-143-24/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move framework and layoutlib api libraries back to being project libraries so that other modules can depend on it. This enables custom widget libraries project to merge through cleanly. Change-Id: I4f00d6fb378a80662f32491a2b0061d6bf61899f
* | | | Fix build.Deepanshu Gupta2015-05-132-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When doing the full build, javalib.jar wasn't created. However, mm had created the javalib.jar. Fix the build by not depending on javalib.jar, but on classes.jar Change-Id: I643676b1d73cbfce42946a065a2ada6c50cc959a
* | | | Update rendering fidelity tag to use constant.Deepanshu Gupta2015-05-131-4/+4
| | | | | | | | | | | | | | | | Change-Id: If6c1076aa1e070c6bda7be16516fe0e18a95fe2d
* | | | Use Balanced line breaker instead of HighQuality.Deepanshu Gupta2015-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fallback to the Balanced line breaker till the time HighQuality one is implemented. Change-Id: I51e9882c5c733e5409f932ef740684829340ced9
* | | | Update nav bar icons.Deepanshu Gupta2015-05-1324-14/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a script to copy the icons from the original source. - Update layout used for the navigation bar to be closer to the original layout. - Update test image with the latest rendering. - Add a nexus 5 landscape device config to help with testing. Change-Id: I0b6674955e0970a6a8cce148b1b7aa61e1752ccd
* | | | Load ICU data in LayoutLibDeepanshu Gupta2015-05-134-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | Also return the correct version numbers for ICU data. Change-Id: I7de973b5553c73948870b97bdc12a880bb2fdd85
* | | | Add missing delegates for M preview.Deepanshu Gupta2015-05-1336-376/+491
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove ICU dependency (use the version bundled with platform). - Restructure intelliJ project to move dependencies to module. - Minor fixes to layoutlib tests. TODO: - Load ICU data. - Hyphenator doesn't work. - High quality line breaker not present. Change-Id: I965e096e17bfc97ee995a649c3f4f6f64bb4f70d
* | | | Run setup for full tests only once.Deepanshu Gupta2015-05-131-26/+36
| | | | | | | | | | | | | | | | Change-Id: Iee64dbd88d473b7be08581f26ccddf649aed8e56
* | | | Remove kxml dependency.Deepanshu Gupta2015-05-137-43/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Create XmlPullParser using callback provided by the client. This enables clients to choose which XmlPullParser implementation they want. Change-Id: I9ad97a4777820cdbe5c8fc3716f74ddec9065c70
* | | | Merge "Fix build" into mnc-devJorim Jaggi2015-05-131-2/+2
|\ \ \ \
| * | | | Fix buildJorim Jaggi2015-05-131-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia9277c6c983758d301c89312e39b59a2db0b29c4
* | | | | Merge "Make sure the app can draw a frame before unlocking" into mnc-devJorim Jaggi2015-05-131-1/+5
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Make sure the app can draw a frame before unlockingJorim Jaggi2015-05-131-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The mechanism to stop windows drawing while window animator was animating was somehow flaky. It relied on the fact that the client would call relayout() whenever the animating state changed. This is mostly the case, but not for lockscreen animations. Instead, we now use a push model, where window manager tells the app that the state has changed. - In addition, it only stopped drawing if that window was animating, but then only resumed drawing after all windows have finished animating. Now, we do this per window, so we only stop drawing for windows that are currently animating. - We resume the top activity now at the very beginning of the unlocking sequence. This gives the app a chance to draw a frame before the user sees anything. If it's to slow, then we just use the outdated framebuffer. Bug: 19964562 Change-Id: Ifef8abd189a3146d854b81b9b948861e4d38c155
* | | | Merge "AAPT2: Fix issue where @null was wrongly encoded" into mnc-devAdam Lesinski2015-05-133-9/+34
|\ \ \ \
| * | | | AAPT2: Fix issue where @null was wrongly encodedAdam Lesinski2015-05-123-9/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @null must be encoded as TYPE_REFERENCE with a value of 0. TYPE_NULL is used by the runtime as a placeholder when resolving style attributes. If we set a style attribute to TYPE_NULL, the runtime will throw. The runtime will convert a TYPE_REFERENCE with value 0 to a proper null value. Change-Id: Id983ca7e1fbee3124dddafe32f1b5741b824225b
* | | | | Merge "AAPT2: Debug: Dump only targetted style" into mnc-devAdam Lesinski2015-05-135-27/+79
|\ \ \ \ \ | |/ / / /
| * | | | AAPT2: Debug: Dump only targetted styleAdam Lesinski2015-05-125-27/+79
| | | | | | | | | | | | | | | | | | | | Change-Id: Id7c5a4b5d0880520e1fea05e5a31d398946c5f05
* | | | | Merge "AAPT2: inferred style parent processing" into mnc-devAdam Lesinski2015-05-138-19/+48
|\ \ \ \ \ | |/ / / /
generated by cgit v1.1 at 2024-12-24 05:26:24 +0000