summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Output modified bcp47 tag in ResTable_config::toString()"Adam Lesinski2015-03-203-30/+1
|\
| * Output modified bcp47 tag in ResTable_config::toString()Adam Lesinski2015-03-163-30/+1
| | | | | | | | | | | | | | We expect to be able to parse the output of ResTable_config::toString(), so it should use modified bcp47 (b+en+Latn+US). Change-Id: I597a1779a1fa5cff171c473e6a0368d93b9c7722
* | Merge "split-select: Languages should not be grouped exclusively"Adam Lesinski2015-03-202-11/+7
|\ \
| * | split-select: Languages should not be grouped exclusivelyAdam Lesinski2015-03-102-11/+7
| | | | | | | | | | | | | | | | | | | | | If a series of languages match one configuration, this is fine. They should all be installed. Example: target = fr-rCA, splits = [fr, fr-rCA]. Change-Id: I652348ae85073c7984a92a802f8c9f84f5d436c5
* | | am 0634fba5: am 89da4ca6: Merge "Remove unused printapk.cpp."Elliott Hughes2015-03-191-127/+0
|\ \ \ | | | | | | | | | | | | | | | | * commit '0634fba5915073e5b46e24f0ba0d5bbc44c922a5': Remove unused printapk.cpp.
| * \ \ am 89da4ca6: Merge "Remove unused printapk.cpp."Elliott Hughes2015-03-191-127/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '89da4ca67d5bf6c35ea76f074cb2caa3d542740e': Remove unused printapk.cpp.
| | * | | Remove unused printapk.cpp.Elliott Hughes2015-03-191-127/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of the few remaining users of libzipfile, but doesn't get built. Not worth porting to libziparchive. Change-Id: Ica466b22e3a7ebaf123727c0d703af39cc89cf9c
* | | | | Merge "Make sure shaders use a color model compatible with the destination."Diego Perez2015-03-194-8/+19
|\ \ \ \ \
| * | | | | Make sure shaders use a color model compatible with the destination.Diego Perez2015-03-124-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaf6e14bb86835c36a5b0c37519ac2ee794d10081
* | | | | | Fix build.Dianne Hackborn2015-03-171-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6797bb2b5c85961c3bcb3fa8950bae121232f592
* | | | | | am 199a70f1: am 576801ff: am 842eee9f: am 1f9a26af: am 158c08bc: am ↵Deepanshu Gupta2015-03-177-18/+51
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ada85905: Fix AppCompat action bar theming. * commit '199a70f1820c38a9f1db1697ad91c4f5f07d00aa': Fix AppCompat action bar theming.
| * | | | | am 576801ff: am 842eee9f: am 1f9a26af: am 158c08bc: am ada85905: Fix ↵Deepanshu Gupta2015-03-177-18/+51
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AppCompat action bar theming. * commit '576801ff82a85c4de19404dfe364eef7184b84e0': Fix AppCompat action bar theming.
| | * \ \ \ \ am 842eee9f: am 1f9a26af: am 158c08bc: am ada85905: Fix AppCompat action bar ↵Deepanshu Gupta2015-03-177-18/+51
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | theming. * commit '842eee9f816a2e35bf3c9ce6c14cd5e43684265b': Fix AppCompat action bar theming.
| | | * \ \ \ \ am 158c08bc: am ada85905: Fix AppCompat action bar theming.Deepanshu Gupta2015-03-177-18/+51
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '158c08bcf1cd0bc702748ee2a4cf6aa259c26147': Fix AppCompat action bar theming.
| | | | * \ \ \ \ am ada85905: Fix AppCompat action bar theming.Deepanshu Gupta2015-03-177-18/+51
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ada8590547348b77d8cbd56abdb8fadb3e72c015': Fix AppCompat action bar theming.
| | | | | * | | | | Fix AppCompat action bar theming.Deepanshu Gupta2015-03-167-18/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use themed context to inflate the action bar when AppCompat is used. Also fix minor issues exposed as a result. - Set project callback when LayoutInflater is created by LayoutInflater.from(context). - Remove duplication of code to get base context from context wrapper. Bug: http://b.android.com/159711 Change-Id: I379ba2ba71c0ef547460987c3aa5db521c7de967
* | | | | | | | | | am 0f8c9d1d: am a5be9a7d: am 38467b5f: am 9a00f1c8: am 79f7fce7: am ↵Deepanshu Gupta2015-03-173-6/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2e4d9324: Fix NoActionBar themes rendering. * commit '0f8c9d1df28ed10b1c9013ddd315b306868e349d': Fix NoActionBar themes rendering.
| * | | | | | | | | am a5be9a7d: am 38467b5f: am 9a00f1c8: am 79f7fce7: am 2e4d9324: Fix ↵Deepanshu Gupta2015-03-173-6/+6
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NoActionBar themes rendering. * commit 'a5be9a7d2d2cbcd3892fc916c9a944745024881d': Fix NoActionBar themes rendering.
| | * | | | | | | | am 38467b5f: am 9a00f1c8: am 79f7fce7: am 2e4d9324: Fix NoActionBar themes ↵Deepanshu Gupta2015-03-173-6/+6
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rendering. * commit '38467b5fbbc09ad05624454f735d27ada25565c8': Fix NoActionBar themes rendering.
| | | * | | | | | | am 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering.Deepanshu Gupta2015-03-173-6/+6
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '79f7fce7a49e7b7cd414ff5c3fdb5cbaae45c1f1': Fix NoActionBar themes rendering.
| | | | * | | | | | am 2e4d9324: Fix NoActionBar themes rendering.Deepanshu Gupta2015-03-173-6/+6
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2e4d93245764a1c1d7515361ddbb8fc1665f814e': Fix NoActionBar themes rendering.
| | | | | * | | | | Fix NoActionBar themes rendering.Deepanshu Gupta2015-03-133-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix some warnings. Bug: http://b.android.com/159780 Change-Id: I64fd4259b802722af7a271f51d5943018ed11e9e
* | | | | | | | | | Merge "Handle malformed manifests in printXMLBlock"Vishwath Mohan2015-03-171-14/+22
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Handle malformed manifests in printXMLBlockVishwath Mohan2015-03-121-14/+22
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specially crafted manifest files can cause a segfault in printXMLBlock() using improper tag nesting (without evaluating to ResXMLTree::BAD_DOCUMENT). This fix checks and breaks when this condition is detected. Bug: 15549617 Change-Id: I27997fda86d228e993217a0c09993bff404cf317
* | | | | | | | | Fix import order.Deepanshu Gupta2015-03-131-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I50bfbf4011290683a1c6adb94e0b6fa301dcc75b
* | | | | | | | | Add a type parameter to startActionMode() calls.Clara Bayarri2015-03-131-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This requires adding a new method to View and Window.Callback to pass down the type as a parameter. For compatibility purposes, the new method implementations keep the type and call the old method, in case clients have subclassed it. Change-Id: If5d857f131e33be8cc6a8814f2e9c4e85ad2da25
* | | | | | | | | am a4277e14: am a4ed5e94: am e770c5e4: am c44430a3: Merge "Tools attribute ↵Deepanshu Gupta2015-03-133-21/+36
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improvements for RecyclerView LayoutManager." into lmp-mr1-dev * commit 'a4277e149355c53fde73a4e1ef44aa665af31cf0': Tools attribute improvements for RecyclerView LayoutManager.
| * | | | | | | | am a4ed5e94: am e770c5e4: am c44430a3: Merge "Tools attribute improvements ↵Deepanshu Gupta2015-03-123-21/+36
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for RecyclerView LayoutManager." into lmp-mr1-dev * commit 'a4ed5e94117a2c6c1734138faed09490245c602f': Tools attribute improvements for RecyclerView LayoutManager.
| | * | | | | | | am e770c5e4: am c44430a3: Merge "Tools attribute improvements for ↵Deepanshu Gupta2015-03-123-21/+36
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RecyclerView LayoutManager." into lmp-mr1-dev * commit 'e770c5e45a139d709976f8c1dbb821733968b5a8': Tools attribute improvements for RecyclerView LayoutManager.
| | | * | | | | | Merge "Tools attribute improvements for RecyclerView LayoutManager." into ↵Deepanshu Gupta2015-03-123-21/+36
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | | | * | | | | | Tools attribute improvements for RecyclerView LayoutManager.Deepanshu Gupta2015-03-113-21/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Change tools attribute for layout manager from layoutManagerType to LayoutManager. 2. Support classnames in the tools attribute. This change doesn't try to supprt arbitrary classnames for now. The reason for this is that the new layoutlib API is supposed to contain a new method for inflating custom classes that are not views. This will allow us to throw better error messages. Without the new API, trying for different constructors, will result in a error messages being logged. Change-Id: I3a31359c06b7452bfd973c3e5e54f9038acccfaa
* | | | | | | | | | am 3d024d4c: am 65215edd: am f0d324e5: am 71ba1230: am efc09c64: am ↵Deepanshu Gupta2015-03-131-16/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev * commit '3d024d4c22b896c95ef4c98610c3db7c58a639ed': Fix cyclic dependency in BlendComposite and BlendingMode.
| * | | | | | | | | am 65215edd: am f0d324e5: am 71ba1230: am efc09c64: am 78660423: Merge "Fix ↵Deepanshu Gupta2015-03-121-16/+9
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cyclic dependency in BlendComposite and BlendingMode." into lmp-dev * commit '65215edd7acada70c2bcb060daec6ff718ae92ba': Fix cyclic dependency in BlendComposite and BlendingMode.
| | * | | | | | | | am f0d324e5: am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic ↵Deepanshu Gupta2015-03-121-16/+9
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dependency in BlendComposite and BlendingMode." into lmp-dev * commit 'f0d324e531e395674f71b3944623bd17fe74b372': Fix cyclic dependency in BlendComposite and BlendingMode.
| | | * | | | | | | am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and ↵Deepanshu Gupta2015-03-121-16/+9
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | / / / / | | | | | |/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | BlendingMode." into lmp-dev * commit 'efc09c644fa4e8354d54485aab6c0b18868284eb': Fix cyclic dependency in BlendComposite and BlendingMode.
| | | | * | | | | am 78660423: Merge "Fix cyclic dependency in BlendComposite and ↵Deepanshu Gupta2015-03-121-16/+9
| | | | |\ \ \ \ \ | | | | | | |/ / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BlendingMode." into lmp-dev * commit '78660423900fa255cc83b85320e98d5184be393b': Fix cyclic dependency in BlendComposite and BlendingMode.
| | | | | * | | | Fix cyclic dependency in BlendComposite and BlendingMode.Deepanshu Gupta2015-03-111-16/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced in commit 1a10ca7e526736b4fd143f7c9f3b29643c0062a4 Bug: http://b.android.com/159708 Change-Id: I6add5be3a933bbe4f8d888906e2aa1b2e35d045a
* | | | | | | | | am fceec0e1: am c7fc094d: am d44af610: am b3cfb334: Merge "Fix rare NPE in ↵Deepanshu Gupta2015-03-131-23/+32
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BridgeContext." into lmp-mr1-dev * commit 'fceec0e124a55b25d59f2af5279c70ac045d6771': Fix rare NPE in BridgeContext.
| * | | | | | | | am c7fc094d: am d44af610: am b3cfb334: Merge "Fix rare NPE in ↵Deepanshu Gupta2015-03-121-23/+32
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BridgeContext." into lmp-mr1-dev * commit 'c7fc094d319998572087e983e21c62de9f318139': Fix rare NPE in BridgeContext.
| | * | | | | | | am d44af610: am b3cfb334: Merge "Fix rare NPE in BridgeContext." into ↵Deepanshu Gupta2015-03-121-23/+32
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'd44af6108b18f3de05ed3f61d056d9c5b36ff8be': Fix rare NPE in BridgeContext.
| | | * | | | | | Fix rare NPE in BridgeContext.Deepanshu Gupta2015-03-111-23/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed some deprecation warnings. Change-Id: I2fa00996dab0b008b9ca07a5382a059e5780529d
* | | | | | | | | am ca9264ea: am a695f87d: am fa3c6650: am 71518174: Merge "Fix project ↵Deepanshu Gupta2015-03-132-2/+28
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings." into lmp-mr1-dev * commit 'ca9264eab03cf787fb4dfc62a2313d9c3b45a05e': Fix project settings.
| * | | | | | | | am a695f87d: am fa3c6650: am 71518174: Merge "Fix project settings." into ↵Deepanshu Gupta2015-03-122-2/+28
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'a695f87db757e89ee99d3c672037b479dce3e4e7': Fix project settings.
| | * | | | | | | am fa3c6650: am 71518174: Merge "Fix project settings." into lmp-mr1-devDeepanshu Gupta2015-03-122-2/+28
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fa3c665019ace11140b3c5677d02c9711fc4d86d': Fix project settings.
| | | * | | | | | Fix project settings.Deepanshu Gupta2015-03-102-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Update layoutlib_api source path. 2. Update jdk version 3. Update nullity annotations. Change-Id: I48db7dbd7ba5ff02fcf11672608b75e072385166
* | | | | | | | | resolved conflicts for merge of ef1741d2 to masterAndreas Gampe2015-03-126-7/+332
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | / / / | |_|_|_|_|/ / / |/| | | | | | | Change-Id: I5379d5f756695f5176d92249ac6304bffcf95751
| * | | | | | | am 05cba2f8: am 338a5a88: am b171be1a: Merge "Add RecyclerView support." ↵Deepanshu Gupta2015-03-127-10/+332
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '05cba2f8acd88d40e1bb149915fe590d4a21b74d': Add RecyclerView support.
| | * | | | | | am 338a5a88: am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-devDeepanshu Gupta2015-03-127-10/+332
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '338a5a88fe8ecf8a724fcfaa2888a7c0fe53cb34': Add RecyclerView support.
| | | * | | | | Add RecyclerView support.Deepanshu Gupta2015-03-107-10/+332
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b.android.com/72117 Change-Id: Iba95baff59f1b715f91da25e15acf27bc052d95e
* | | | | | | | Add support for the new native Builder class on StaticLayout.Diego Perez2015-03-101-2/+36
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates StaticLayout_Delegate to support the new Builder class introduced in ag/646289. Change-Id: I9f8c528b8751ce69482e33ac6f1bc42406a0b606
generated by cgit v1.1 at 2025-11-26 22:54:43 +0000