summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | am 311a0f54: Merge "Fix layoutlib tests." into lmp-devDeepanshu Gupta2015-03-2421-37/+97
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | * commit '311a0f54ac95a1649474498748fff8327b0c917d': Fix layoutlib tests.
| | | | * | | Fix layoutlib tests.Deepanshu Gupta2015-03-1721-37/+97
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The date picker and calendar widgets show the current date. Comparing widgets showing current date with a static golden image wasn't the best idea. - Change the widgets to custom widgets that set a predefined date/time so that the rendering is independent of the system date. - Change the layout slightly to make it look nicer. - Update gradle plugin version. Change-Id: Ia3fb4965a372a28087a0d8c9df40fd6779df6050
* | | | | | 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
* | | | | | 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 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
* | | | | | 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 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 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 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
* | | | | | 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
* | | | | | am f8d6a4ba: resolved conflicts for merge of 701f9c2f to stage-aosp-masterDan Albert2015-03-053-26/+19
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | * commit 'f8d6a4ba8739e16e13ae0014efa099ec564939a7': Stop using namespace std.
| * | | | | resolved conflicts for merge of 701f9c2f to stage-aosp-masterDan Albert2015-03-053-26/+19
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I42e0411c0acef4b15137491ecaaed95d9b1cd0c1
| | * | | | | Stop using namespace std.Dan Albert2015-03-043-26/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pattern of #include and using namespace std here fails to build with GCC. At first glance it's a GCC bug rather than libc++ doing something wrong. Regardless, it can be worked around by just specifying std:: where appropriate. Bug: 19606303 Change-Id: I5652682eae7ca7559cf2a9307909859013440781
* | | | | | | am fb96187b: am 32dc37b7: am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge ↵Deepanshu Gupta2015-03-022-517/+37
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Correct PorterDuff filters." into lmp-dev * commit 'fb96187bb6004e5d0b22e4d942aa236a08d8913b': Correct PorterDuff filters.
| * | | | | | am 32dc37b7: am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct ↵Deepanshu Gupta2015-03-022-517/+37
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PorterDuff filters." into lmp-dev * commit '32dc37b72e787ca9323c01aa86e65694b6ff0cf7': Correct PorterDuff filters.
| | * | | | | am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-devDeepanshu Gupta2015-03-022-517/+37
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | * commit '6ed9b75a45ec4bc62b4a0fac2c86479d61918863': Correct PorterDuff filters.
| | | * | | | am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-devDeepanshu Gupta2015-03-022-517/+37
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | | | | | | | | | | | | | | * commit '72d75f8d9fb46c04f0458e1f36b064e2b8c3de71': Correct PorterDuff filters.
| | | | * | | Merge "Correct PorterDuff filters." into lmp-devDeepanshu Gupta2015-03-022-517/+37
| | | | |\ \ \
| | | | | * | | Correct PorterDuff filters.Deepanshu Gupta2015-02-262-517/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Remove unused modes - makes the class more manageable, and missing modes can always be readded from the git history. 2. Reuse the existing BlendComposite instances where possible. 3. Fix incorrect alpha computation for multiply mode. 4. Change the alpha computation for all blend modes to compenstate for the fact that the color filter image that we create extends beyond the image it is inteded to be applied to. Change-Id: Iedebf289a23325ee4c6d406dcad46a9edb1855c7
* | | | | | | | am 7c4ab9de: am 4e87709b: am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix ↵Deepanshu Gupta2015-03-021-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | codestyle for switch statements." into lmp-dev * commit '7c4ab9deaaea0e0a273c7bdf37b6d9d1c8cbab07': Fix codestyle for switch statements.
| * | | | | | | am 4e87709b: am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for ↵Deepanshu Gupta2015-03-021-1/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | switch statements." into lmp-dev * commit '4e87709b8b41a12d6caf2bd1110beed20e5b88e5': Fix codestyle for switch statements.
| | * | | | | | am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into ↵Deepanshu Gupta2015-03-021-1/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit 'd003e8133167f2b6741f8eb925fdc9f77c2800a5': Fix codestyle for switch statements.
| | | * | | | | am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-devDeepanshu Gupta2015-03-021-1/+0
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '369ad57b00f1c94c80f0f80ef2e7063a23a94a84': Fix codestyle for switch statements.
| | | | * | | | Merge "Fix codestyle for switch statements." into lmp-devDeepanshu Gupta2015-03-021-1/+0
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Fix codestyle for switch statements.Deepanshu Gupta2015-02-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix intellij's codestyle settings for indenting switch/case statement. Change-Id: I905231538fef0fcd7fa4e742f937b8da34f2e30f
* | | | | | | | am 4a194d3b: am 62500307: am aff0ec93: am 81449b2c: am 10d620ff: Merge ↵Deepanshu Gupta2015-03-021-3/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Better error msg for StateList/Hexadecimal Color." into lmp-dev * commit '4a194d3b7f3ea4aebc5a1a8f95ccaac248c1b89d': Better error msg for StateList/Hexadecimal Color.
| * | | | | | | am 62500307: am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg ↵Deepanshu Gupta2015-03-021-3/+13
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for StateList/Hexadecimal Color." into lmp-dev * commit '6250030736e3ea25bacc92eba4c269dc6a6ee3db': Better error msg for StateList/Hexadecimal Color.
| | * | | | | | am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal ↵Deepanshu Gupta2015-03-021-3/+13
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Color." into lmp-dev * commit '81449b2c4a63392bff22d77f331f4db52011884b': Better error msg for StateList/Hexadecimal Color.