)]}' { "log": [ { "commit": "7f9f99ea11051614a7727dfb9f9578b518e76e3c", "tree": "d39b916bb092a717e028345813b53f6bcfa12f61", "parents": [ "7277f3b9b26f0011475b39da1298484a510aca29" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Aug 11 10:16:17 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Aug 11 12:57:51 2011 -0700" }, "message": "Make some methods/fields package private so that layoutlib can access them.\n\nChange-Id: I4aeadfbaf8a4f6a459fa19937c21ac23d9e5fb64\n" }, { "commit": "ea670054d6c5b59b8481cbf796e6a1cd9f38b672", "tree": "9e9a732c3a9034074ea755782650185b01d418d0", "parents": [ "95b0292fb4e27a9dc273884be60dad8523b8bd7a" ], "author": { "name": "Philip Milne", "email": "pmilne@google.com", "time": "Tue Aug 09 11:22:59 2011 -0700" }, "committer": { "name": "Philip Milne", "email": "pmilne@google.com", "time": "Tue Aug 09 11:25:25 2011 -0700" }, "message": "Implement native println_native in android.util.Log for LayoutLib\n\nChange-Id: I2ab83a131468490cf789bf17f9c12b6360e953a4\n" }, { "commit": "dfee59afb3e4cdcde38f6338f9360655de76da92", "tree": "9581ba1b0c6d7c0034e7ff69fcf85071a9244a1c", "parents": [ "5d4967884132647a75d05bcc2ca1f9ce490b372f" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Fri Aug 05 20:48:30 2011 -0700" }, "committer": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Sun Aug 07 14:17:30 2011 -0700" }, "message": "Fix bug 5011824 - New Holo overflow menu for physical menu key devices\n\nThe new Holo-style overflow menu now appears from the edge of the screen\nwhere the device\u0027s physical menu key can be found. The policy determining\nthis lives in getPreferredOptionsPanelGravity() in WindowManagerService.\n\nChange-Id: I8851a2265547156591e82044e50b5cfc58d3eefa\n" }, { "commit": "162c1dcd5e635d17d8425936d7729d0ae5ed1a62", "tree": "99ee7975eaa6671bdd10b0055eb7f3348c997b91", "parents": [ "b389bdfba291382f9b306dd0e1bf7ba42fd94a4a" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Aug 03 17:20:58 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Aug 03 17:23:12 2011 -0700" }, "message": "Layoutlib: implement Resources.getBoolean(int).\n\nChange-Id: I44cee203bb9a8fabaebfd689fc20ec2f2a9b3561\n" }, { "commit": "569ed054042f0350e898b4352694b792b0fdef9b", "tree": "430d7f0e59b61567513bea1cff1359a59bd96427", "parents": [ "78a29c9fde5debc4abe3b0f093d35ddfcae60565" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Aug 02 10:44:53 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Aug 02 10:55:18 2011 -0700" }, "message": "Layoutlib: simple comment fix.\n\nChange-Id: I402f6b465706e8edd14e512a973d087a14abbfe3\n" }, { "commit": "d2f664d42cc29507b01a98622298b69131463825", "tree": "21379de5fe0625ffcfb9e776dafef6d1e2614f6f", "parents": [ "f7be31ee1062722855602c6b0227f01bdb7c0b80" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Fri Jul 29 17:41:39 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Aug 01 15:08:26 2011 -0700" }, "message": "Misc layoutlib fix in preparation of the access change in framework code.\n\nChange-Id: I873adb7345514be6daa5c4fea4ebabb515f203e2\n" }, { "commit": "395c86f7f659e3ffc834689576cc738b517d3b9e", "tree": "3081a301646215c02456d4c0b6c8b29e471e2a6f", "parents": [ "fcbb4924864976339d5ad8b7adb925d7a050df6a", "6abf2f501e60132a5369ad5b15b388912c8e9e5b" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jul 27 18:43:32 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 27 18:43:32 2011 -0700" }, "message": "am 6abf2f50: am 0b45ca88: am cd01ad7c: am 20339b24: Merge \"Remove Debug Code\"\n\n* commit \u00276abf2f501e60132a5369ad5b15b388912c8e9e5b\u0027:\n Remove Debug Code\n" }, { "commit": "6abf2f501e60132a5369ad5b15b388912c8e9e5b", "tree": "e7b4001eb87e942aa3259e9260c75cd75a72184d", "parents": [ "8ce53e387e2b4427265ae9e43bc15d9fe850643d", "0b45ca8884acfd2e9ccdcb3fbe641a46b116bda0" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jul 27 18:40:49 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 27 18:40:49 2011 -0700" }, "message": "am 0b45ca88: am cd01ad7c: am 20339b24: Merge \"Remove Debug Code\"\n\n* commit \u00270b45ca8884acfd2e9ccdcb3fbe641a46b116bda0\u0027:\n Remove Debug Code\n" }, { "commit": "0b45ca8884acfd2e9ccdcb3fbe641a46b116bda0", "tree": "6ea23c651a81ebec8791b869118a04be3f866815", "parents": [ "c682559d3c39aa4503d5c4d60ae046393aa45b79", "cd01ad7cc7813e3067826945c2a472602f1d3509" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jul 27 18:38:50 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 27 18:38:50 2011 -0700" }, "message": "am cd01ad7c: am 20339b24: Merge \"Remove Debug Code\"\n\n* commit \u0027cd01ad7cc7813e3067826945c2a472602f1d3509\u0027:\n Remove Debug Code\n" }, { "commit": "20339b24394be06c5bfe5157a4b35adc48f665eb", "tree": "9752f9a3abb307c58f1fa8644d7f2b252303eec5", "parents": [ "4d1fa60bfe660fd0fc6671116da597c0027cbb16", "7a09ccfb5052dc555d54ef77177083616e8f1b69" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jul 27 18:26:01 2011 -0700" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Wed Jul 27 18:26:01 2011 -0700" }, "message": "Merge \"Remove Debug Code\"" }, { "commit": "7a09ccfb5052dc555d54ef77177083616e8f1b69", "tree": "f6b1bd9157eaa29ac397d3739193a3299566e18a", "parents": [ "6800a80199477c90fc64af7211a177de06478a02" ], "author": { "name": "Josiah Gaskin", "email": "josiahgaskin@google.com", "time": "Wed Jul 27 17:45:32 2011 -0700" }, "committer": { "name": "Josiah Gaskin", "email": "josiahgaskin@google.com", "time": "Wed Jul 27 17:45:32 2011 -0700" }, "message": "Remove Debug Code\n\nThis change removes debugging code from FileFinder.\nThis code was considered harmful because it uses the std::cout\nfrom \u003ciostream\u003e.\n\nChange-Id: Iad9b5e8a631883bd4854abdb29bc6df8a5b4a056\n" }, { "commit": "3d5a703db83265f7914eed8580de986106abfad2", "tree": "3ef1e72cf1335a1bb9d36ac1b6f86f0a1b84c302", "parents": [ "be922d6006879692d100894dc924d947b50aed34", "bc68a59c024bdb745dac8e2ec7408a9f30595f1a" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Jul 27 15:54:50 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jul 27 15:54:50 2011 -0700" }, "message": "Merge \"Report the external display size to the input reader.\"" }, { "commit": "388432ac4326fc16e69f45784ee76aa1a6260272", "tree": "e6252ab35f329fae56e759fec26014ea0a82fbe2", "parents": [ "d3cb204a7b5140d6f59ed9f9f64ef3cbdae3acba", "af2872d1e324ed67b44b4f44e2d83b1f0d985027" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Jul 27 15:54:39 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jul 27 15:54:39 2011 -0700" }, "message": "Merge \"Change ZipFile flags anonymous enum\"" }, { "commit": "bc68a59c024bdb745dac8e2ec7408a9f30595f1a", "tree": "9b3cfa4dc30eb787cbd828e97f7d816d5a91e68d", "parents": [ "49754db5a304d995c1cc108ff6f19e4ba4265572" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Jul 25 12:58:12 2011 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Jul 25 20:10:12 2011 -0700" }, "message": "Report the external display size to the input reader.\n\nThe input reader needs this information so that it knows how to\ninterpolate touches on an external touch screen.\n\nChanged Display so that it asks the WindowManager what the real\ndisplay size is (as opposed to the raw display size). This means\nit now takes into the forced display size set by\nadb shell am display-size.\n\nReplaced all calls to getRealWidth() / getRealHeight() /\ngetRealMetrics() in the WindowManager and replaced them with direct\nusages of the mCurDisplayWidth / mCurDisplayHeight so that the WM\ndoesn\u0027t end up making a reentrant Binder call into itself.\n\nFixed the table status bar HeightReceiver so that it updates the\nheight on all configuration changes since it is possible that the\ndisplay size changed independently of an external HDMI display\nbeing plugged / unplugged.\n\nImproved the Display class documentation to make the distinctions\nbetweeen the various sizes clearer.\n\nChange-Id: I3f75de559d3ebffed532ab46c4ae52c5e7f1da2b\n" }, { "commit": "4f727fbdc302946b9b677e2518350dd3574d198a", "tree": "66cab48f2a59ec8de46001b97024133ba77d4332", "parents": [ "fa93052d91ab6e6da3195ce3872c4543beb6d5c9", "ed07215e482cae1ffedbba707284821b3afc310f" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Jul 25 17:24:56 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jul 25 17:24:56 2011 -0700" }, "message": "am ed07215e: am 55775e5f: am e70b2b8f: am 9bcf26ea: Merge \"Layoutlib_create flag -p: don\\\u0027t change all accesses to public.\"\n\n* commit \u0027ed07215e482cae1ffedbba707284821b3afc310f\u0027:\n Layoutlib_create flag -p: don\u0027t change all accesses to public.\n" }, { "commit": "af2872d1e324ed67b44b4f44e2d83b1f0d985027", "tree": "248c7929317a9c0eda33da867be4cef25b8f50c2", "parents": [ "b243d5bc7db88396f0da304553687e7a0bccfa3d" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Jul 25 12:55:41 2011 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Jul 25 16:49:17 2011 -0700" }, "message": "Change ZipFile flags anonymous enum\n\nThe arguments that ZipFile takes were apparently meant to be a typed\nenum, but the name of the type was taken out because it creates invalid\nconversion warnings in C++ since this is an invalid use of enum.\n\nJust change the typedef enum to an anonymous enum so we get rid of the\ncompiler warnings. It will be implicitly converted to int instead.\n\nChange-Id: Ie72c4c235c8f9ee8fd1b795e1010b77c55e983de\n" }, { "commit": "ed07215e482cae1ffedbba707284821b3afc310f", "tree": "0a4b4a868ae68249e5ee9f26a7cc9dea5e66201b", "parents": [ "64ed105957098a900d58e7c2598e060cb37755ce", "55775e5f34af8d7c22ab3212c253b3a7d34a6f8a" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Jul 25 12:21:17 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jul 25 12:21:17 2011 -0700" }, "message": "am 55775e5f: am e70b2b8f: am 9bcf26ea: Merge \"Layoutlib_create flag -p: don\\\u0027t change all accesses to public.\"\n\n* commit \u002755775e5f34af8d7c22ab3212c253b3a7d34a6f8a\u0027:\n Layoutlib_create flag -p: don\u0027t change all accesses to public.\n" }, { "commit": "55775e5f34af8d7c22ab3212c253b3a7d34a6f8a", "tree": "87b37b98bfbe1201ed236aef1f563fb914539c04", "parents": [ "e612c881ecf74770098aa9c07d4f0611ac982038", "e70b2b8fe0c265171f3a367a66c99b36c62567c7" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Jul 21 16:25:50 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jul 21 16:25:50 2011 -0700" }, "message": "am e70b2b8f: am 9bcf26ea: Merge \"Layoutlib_create flag -p: don\\\u0027t change all accesses to public.\"\n\n* commit \u0027e70b2b8fe0c265171f3a367a66c99b36c62567c7\u0027:\n Layoutlib_create flag -p: don\u0027t change all accesses to public.\n" }, { "commit": "e70b2b8fe0c265171f3a367a66c99b36c62567c7", "tree": "7bc6330ca5ecd1f2993bb1c0f30ac6e633d77b42", "parents": [ "4f3a8db64d75cd3e88213d3b105dc50fc5bd6262", "9bcf26ea7aa108ce4bf4e973b4774d3e60eebafe" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Jul 21 16:23:18 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jul 21 16:23:18 2011 -0700" }, "message": "am 9bcf26ea: Merge \"Layoutlib_create flag -p: don\\\u0027t change all accesses to public.\"\n\n* commit \u00279bcf26ea7aa108ce4bf4e973b4774d3e60eebafe\u0027:\n Layoutlib_create flag -p: don\u0027t change all accesses to public.\n" }, { "commit": "9bcf26ea7aa108ce4bf4e973b4774d3e60eebafe", "tree": "fc27ba7544aaa9f2c4d52b991f59adea7121f0be", "parents": [ "3cf039876177b5b314b635bb12a1dae1b42f4605", "caed59d90db8626462baaec351e66b2a3280dc34" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Jul 21 16:17:03 2011 -0700" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Thu Jul 21 16:17:03 2011 -0700" }, "message": "Merge \"Layoutlib_create flag -p: don\u0027t change all accesses to public.\"" }, { "commit": "3a8801e0599cfd8f12750d65ee309e20a33e04f6", "tree": "07b015062432700566dec6b77e80779fa2d5eddb", "parents": [ "f5a4dd386fcbe200ad9c5d06ecf66d31ba8d4e30", "b3ab070edb17f00a4b2d0f511ca539c885b28b6f" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jul 20 18:56:52 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 20 18:56:52 2011 -0700" }, "message": "am b3ab070e: am 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge \"Fix to compile for windows\"\n\n* commit \u0027b3ab070edb17f00a4b2d0f511ca539c885b28b6f\u0027:\n Fix to compile for windows\n" }, { "commit": "b3ab070edb17f00a4b2d0f511ca539c885b28b6f", "tree": "6b574399fe937e834584bec3bc6bea4614fb3e19", "parents": [ "84be06e4ce0778fbf0c1ac72f94795ef8433439b", "3a2d1c2351c0b4eeb4dc4d91d1c334b9f8ba00ed" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jul 20 18:55:21 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 20 18:55:21 2011 -0700" }, "message": "am 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge \"Fix to compile for windows\"\n\n* commit \u00273a2d1c2351c0b4eeb4dc4d91d1c334b9f8ba00ed\u0027:\n Fix to compile for windows\n" }, { "commit": "3a2d1c2351c0b4eeb4dc4d91d1c334b9f8ba00ed", "tree": "56cd474eb51d1c1f80cde02a4217937e3081db91", "parents": [ "ea9e6d24a458c06df6237fddd22b6165b2f92cb5", "ddb8e3b24b2fe3e4371ca8c1239748f5c71910f6" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jul 20 18:53:08 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 20 18:53:08 2011 -0700" }, "message": "am ddb8e3b2: am 9bac0a9f: Merge \"Fix to compile for windows\"\n\n* commit \u0027ddb8e3b24b2fe3e4371ca8c1239748f5c71910f6\u0027:\n Fix to compile for windows\n" }, { "commit": "ddb8e3b24b2fe3e4371ca8c1239748f5c71910f6", "tree": "8f481d25b1c34db709fff71195008e94134cc861", "parents": [ "b582af31c74a58922120fdb747c1a3b867d95e90", "9bac0a9f93976ff341fc9c46b3a85be767119a88" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jul 20 18:49:46 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 20 18:49:46 2011 -0700" }, "message": "am 9bac0a9f: Merge \"Fix to compile for windows\"\n\n* commit \u00279bac0a9f93976ff341fc9c46b3a85be767119a88\u0027:\n Fix to compile for windows\n" }, { "commit": "9102165fd8be64bdc9110d0839a84fcdfa5b68cb", "tree": "3c9f6a6449ee315a165192ff8f8b9d2280809bc9", "parents": [ "0bc12a0b13719976aff95a801d88e48c64510d11" ], "author": { "name": "Josiah Gaskin", "email": "josiahgaskin@google.com", "time": "Wed Jul 20 17:33:08 2011 -0700" }, "committer": { "name": "Josiah Gaskin", "email": "josiahgaskin@google.com", "time": "Wed Jul 20 18:22:26 2011 -0700" }, "message": "Fix to compile for windows\n\nThis change includes a workaround for dirent.h on windows not\nincluding d_type.\n\nChange-Id: Ieaa3f298d2e6b32f2d8367384a1d02a2f5d06cca\n" }, { "commit": "ac1fe6f8460448d379721677a064868e103a2260", "tree": "210b3ac8b0e15d02a24ea5b31b29867dfa4cec66", "parents": [ "ae7c0926499491999fa5964d75fd05a1b5f4480d", "84be06e4ce0778fbf0c1ac72f94795ef8433439b" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jul 20 17:49:26 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 20 17:49:26 2011 -0700" }, "message": "am 84be06e4: resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp\n\n* commit \u002784be06e4ce0778fbf0c1ac72f94795ef8433439b\u0027:\n Added Caching for PreProcessed PNGs\n" }, { "commit": "84be06e4ce0778fbf0c1ac72f94795ef8433439b", "tree": "ea9b35882420896cfba281f17293bce74e564089", "parents": [ "a125c937de06b1cc43368743592f47513eb88b76", "ea9e6d24a458c06df6237fddd22b6165b2f92cb5" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jul 20 17:45:11 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jul 20 17:45:11 2011 -0700" }, "message": "resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp\n\nChange-Id: I8e047147a4d2c899b6654c03a5f32b04d929e602\n" }, { "commit": "e53365f6f145303b8c7a0613189ad415959dd697", "tree": "83922948d5c70b79f6b58d05c696291cca3bb291", "parents": [ "0f4e81df9942dbea16f803bb795cae057fb085f5", "a125c937de06b1cc43368743592f47513eb88b76" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jul 20 17:18:04 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 20 17:18:04 2011 -0700" }, "message": "am a125c937: resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp\n\n* commit \u0027a125c937de06b1cc43368743592f47513eb88b76\u0027:\n Add generation of dependency file for .ap_ package\n" }, { "commit": "a125c937de06b1cc43368743592f47513eb88b76", "tree": "514f08565d17813860d4cc240162806f3fda9816", "parents": [ "57aebc6109f2059ba335a02bf95928a494cff4ba", "2c311be720341e3249887e592bbc1881008b02bd" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jul 20 16:31:25 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jul 20 16:31:25 2011 -0700" }, "message": "resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp\n\nChange-Id: I806c7b4ae95f66df621587e52497dd8739a115fe\n" }, { "commit": "ea9e6d24a458c06df6237fddd22b6165b2f92cb5", "tree": "25d5a8f238f4d21b5e219e8c228c18328c9e28c3", "parents": [ "2c311be720341e3249887e592bbc1881008b02bd", "b582af31c74a58922120fdb747c1a3b867d95e90" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jul 20 16:02:33 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 20 16:02:33 2011 -0700" }, "message": "am b582af31: am 0bc12a0b: Merge \"Added Caching for PreProcessed PNGs\"\n\n* commit \u0027b582af31c74a58922120fdb747c1a3b867d95e90\u0027:\n Added Caching for PreProcessed PNGs\n" }, { "commit": "b582af31c74a58922120fdb747c1a3b867d95e90", "tree": "5d173bd4bb432b61324081c45219f62df263999a", "parents": [ "3082449508a8c574d0476fdb988f98d9554637ae", "0bc12a0b13719976aff95a801d88e48c64510d11" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jul 20 16:00:44 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 20 16:00:44 2011 -0700" }, "message": "am 0bc12a0b: Merge \"Added Caching for PreProcessed PNGs\"\n\n* commit \u00270bc12a0b13719976aff95a801d88e48c64510d11\u0027:\n Added Caching for PreProcessed PNGs\n" }, { "commit": "2c311be720341e3249887e592bbc1881008b02bd", "tree": "42355e81f98af1743af7e0c4a70e50d5af4fcdd4", "parents": [ "ba6c98db8f21016f81ecac35bb0ea3c433044bb7", "3082449508a8c574d0476fdb988f98d9554637ae" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jul 20 15:27:39 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 20 15:27:39 2011 -0700" }, "message": "am 30824495: am 1e24ccbd: Merge \"Add generation of dependency file for .ap_ package\"\n\n* commit \u00273082449508a8c574d0476fdb988f98d9554637ae\u0027:\n Add generation of dependency file for .ap_ package\n" }, { "commit": "3082449508a8c574d0476fdb988f98d9554637ae", "tree": "b52bf802f09270f3c564661d57e0450b2ffafd4d", "parents": [ "82943ecfe2c4266cf3db50326240825fefcaa38f", "1e24ccbdd56a45c8bb5f2eba94af5aecd2d02554" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jul 20 15:23:55 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 20 15:23:55 2011 -0700" }, "message": "am 1e24ccbd: Merge \"Add generation of dependency file for .ap_ package\"\n\n* commit \u00271e24ccbdd56a45c8bb5f2eba94af5aecd2d02554\u0027:\n Add generation of dependency file for .ap_ package\n" }, { "commit": "8a39da80b33691b0c82458c3b7727e13ff71277e", "tree": "b6fa94370ecb2dba85d5fdb45c83729cef8708e1", "parents": [ "1e24ccbdd56a45c8bb5f2eba94af5aecd2d02554" ], "author": { "name": "Josiah Gaskin", "email": "josiahgaskin@google.com", "time": "Mon Jun 06 17:00:35 2011 -0700" }, "committer": { "name": "Josiah Gaskin", "email": "josiahgaskin@google.com", "time": "Wed Jul 20 15:20:26 2011 -0700" }, "message": "Added Caching for PreProcessed PNGs\n\nAdded a cache management system for pre-processed PNG files\nalong with unit tests. The cache system will be used if\nthe --no-crunch flag is passed to AAPT during the package\nphase. The cache can be updated by a call to \u0027aapt crunch\u0027\n(see usage statement). Also put in benchmarking code.\n\nChange-Id: I58271fb2ee2f5f9075fd74d4ff6f15e7afabd05c\n" }, { "commit": "caed59d90db8626462baaec351e66b2a3280dc34", "tree": "321f7c680bb71591cb2b95fa0afb0449e0c720f3", "parents": [ "d40c93f61ca5b3f2351b8db716f67b58f1625e85" ], "author": { "name": "Raphael Moll", "email": "ralf@android.com", "time": "Tue Jul 19 22:36:13 2011 -0700" }, "committer": { "name": "Raphael Moll", "email": "ralf@android.com", "time": "Tue Jul 19 22:36:13 2011 -0700" }, "message": "Layoutlib_create flag -p: don\u0027t change all accesses to public.\n\nChange-Id: Icb1709ed0cb275a5a51ca34030695a5e94091499\n" }, { "commit": "af64556de0064eeb5a4d4e6d634c3f074f5f40ce", "tree": "aaeb6dba4b713c2d7a21621d00555d823104316c", "parents": [ "f2cc48fe8bea26bd07cb943b8308a19336536867" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jul 19 15:10:23 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jul 19 15:10:23 2011 -0700" }, "message": "Layoutlib: misc fix + start of AndroidBidi support.\n\nChange-Id: If2ce0b683da8cce01679322d503eed8dd474e521\n" }, { "commit": "c810fffe1ffda8876c083f10b5f2b3b197768809", "tree": "c1156134ff4a0ab798c1c0e588dca02c650be9a4", "parents": [ "e242042b81bc88c6231caf4628d0c7364b29abad", "9139868b6c5cb29b3665984225dceb0193fec31d" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jul 19 10:23:19 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jul 19 10:23:19 2011 -0700" }, "message": "am 9139868b: am ba6c98db: am 82943ecf: am d40c93f6: Merge \"Add dependency generation to Aapt for R.java\"\n\n* commit \u00279139868b6c5cb29b3665984225dceb0193fec31d\u0027:\n Add dependency generation to Aapt for R.java\n" }, { "commit": "e242042b81bc88c6231caf4628d0c7364b29abad", "tree": "ea9531e5b2a3244d12bb541e8b664d56c48dfd0b", "parents": [ "5f9fa8826887dd9a97617d5637a3862baf7b5913", "bf31250ba0858a2e72a3906a1f0216846683bc2e" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jul 19 10:23:16 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jul 19 10:23:16 2011 -0700" }, "message": "am bf31250b: am d5431ed5: am 2e659ae5: am 42755155: Merge \"Copy once-created R.java into library projects\"\n\n* commit \u0027bf31250ba0858a2e72a3906a1f0216846683bc2e\u0027:\n Copy once-created R.java into library projects\n" }, { "commit": "9139868b6c5cb29b3665984225dceb0193fec31d", "tree": "01c3dfab0f56bfcf38d32f2c2054915a6864d10d", "parents": [ "bf31250ba0858a2e72a3906a1f0216846683bc2e", "ba6c98db8f21016f81ecac35bb0ea3c433044bb7" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jul 19 10:18:28 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jul 19 10:18:28 2011 -0700" }, "message": "am ba6c98db: am 82943ecf: am d40c93f6: Merge \"Add dependency generation to Aapt for R.java\"\n\n* commit \u0027ba6c98db8f21016f81ecac35bb0ea3c433044bb7\u0027:\n Add dependency generation to Aapt for R.java\n" }, { "commit": "bf31250ba0858a2e72a3906a1f0216846683bc2e", "tree": "7bcccb6aa598b8c4ffcec17e534f5a84f7a2b2f6", "parents": [ "6e8c7dd2128b2a46f5d56ed46d4d530af6ad38f5", "d5431ed5505a42e5e33c8bf7cc2ff72792979be9" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jul 19 10:18:25 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jul 19 10:18:25 2011 -0700" }, "message": "am d5431ed5: am 2e659ae5: am 42755155: Merge \"Copy once-created R.java into library projects\"\n\n* commit \u0027d5431ed5505a42e5e33c8bf7cc2ff72792979be9\u0027:\n Copy once-created R.java into library projects\n" }, { "commit": "ba6c98db8f21016f81ecac35bb0ea3c433044bb7", "tree": "8b085339eafa29cdb40a777319cd942bae6f1b16", "parents": [ "d5431ed5505a42e5e33c8bf7cc2ff72792979be9", "82943ecfe2c4266cf3db50326240825fefcaa38f" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jul 19 10:15:11 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jul 19 10:15:11 2011 -0700" }, "message": "am 82943ecf: am d40c93f6: Merge \"Add dependency generation to Aapt for R.java\"\n\n* commit \u002782943ecfe2c4266cf3db50326240825fefcaa38f\u0027:\n Add dependency generation to Aapt for R.java\n" }, { "commit": "d5431ed5505a42e5e33c8bf7cc2ff72792979be9", "tree": "dc400c2878d748a178c40ba32a0c3972e2ff1db2", "parents": [ "a4aef41a74a69b0296b88361ffb33d0470a26362", "2e659ae59c17a0c0584d35b8c400a294c9d49e12" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jul 19 10:15:09 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jul 19 10:15:09 2011 -0700" }, "message": "am 2e659ae5: am 42755155: Merge \"Copy once-created R.java into library projects\"\n\n* commit \u00272e659ae59c17a0c0584d35b8c400a294c9d49e12\u0027:\n Copy once-created R.java into library projects\n" }, { "commit": "82943ecfe2c4266cf3db50326240825fefcaa38f", "tree": "4ed53fe7ca63c27c35379236ab80debace4c0108", "parents": [ "2e659ae59c17a0c0584d35b8c400a294c9d49e12", "d40c93f61ca5b3f2351b8db716f67b58f1625e85" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jul 19 10:10:17 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jul 19 10:10:17 2011 -0700" }, "message": "am d40c93f6: Merge \"Add dependency generation to Aapt for R.java\"\n\n* commit \u0027d40c93f61ca5b3f2351b8db716f67b58f1625e85\u0027:\n Add dependency generation to Aapt for R.java\n" }, { "commit": "2e659ae59c17a0c0584d35b8c400a294c9d49e12", "tree": "0001ad6ea39148a4dafb95e331d397aecf9b3fe4", "parents": [ "a74774fd9146aa22801487d3652dc18e9e328b8e", "42755155d6e8ddc3201b08def2bf262a64fa25f2" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jul 19 10:10:15 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jul 19 10:10:15 2011 -0700" }, "message": "am 42755155: Merge \"Copy once-created R.java into library projects\"\n\n* commit \u002742755155d6e8ddc3201b08def2bf262a64fa25f2\u0027:\n Copy once-created R.java into library projects\n" }, { "commit": "03589cc65355220e0a4a0c816189a9fa25cc81fc", "tree": "ebe98e64c530708e8709025e8ad051c714eab9a3", "parents": [ "9bf34ca6f85309c65b0ebdf614cb8266401b49ba" ], "author": { "name": "Josiah Gaskin", "email": "josiahgaskin@google.com", "time": "Mon Jun 27 16:26:02 2011 -0700" }, "committer": { "name": "Josiah Gaskin", "email": "josiahgaskin@google.com", "time": "Mon Jul 18 16:37:55 2011 -0700" }, "message": "Add generation of dependency file for .ap_ package\n\nMake Aapt generate a dependency file in the same directory as the\noutput ap_ file if the --generate-dependencies flag is set.\nThis dependency file can then be read by the ant exec loop task\nto see whether to repackage resources.\n\nChange-Id: I763679414daf76369700aa599c26dcf78d4de099\n" }, { "commit": "91e88122cf28a48fd2e2260da7d3d87dd437227a", "tree": "b448f50dfd296574e5dabc6a9393624ad4a39868", "parents": [ "bd029f64f2c695d49ea169f4c5c107e8172a1de5" ], "author": { "name": "satok", "email": "satok@google.com", "time": "Mon Jul 18 11:11:42 2011 +0900" }, "committer": { "name": "satok", "email": "satok@google.com", "time": "Tue Jul 19 04:59:48 2011 +0900" }, "message": "Enable IMEs to set additional subtypes in background\n\nBug: 4591792\n\nChange-Id: I7e61a576c56d1a3a56001bdf2fd51ad3801add01\n" }, { "commit": "49062e3b4cae08e41a0fee5002eee50d58a827db", "tree": "eb8604fd9bf218162192b52ebd363aa2e667af30", "parents": [ "c1df573aedd20e9ac862765d068cc4e8fcdda953", "b9eba866b203b28e58f35598023f49b4b58a0635" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Thu Jul 14 13:28:00 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jul 14 13:28:00 2011 -0700" }, "message": "Merge \"Fix aidl to cope with multiple collection types per method.\"" }, { "commit": "37b3cc3bbe33df61f227bcf253aa67a4be441233", "tree": "a8886da36bc5f28705379761e7912f62d2ae5b58", "parents": [ "fd909a774cb384b139c5e360cadb2681c3f48c29", "9163a4a686fc25fefc77d5b41c24a4538486a48e" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jul 13 14:53:54 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 13 14:53:54 2011 -0700" }, "message": "am 9163a4a6: am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1.\n\n* commit \u00279163a4a686fc25fefc77d5b41c24a4538486a48e\u0027:\n Merge 36a3a392 from mr1.\n" }, { "commit": "b9eba866b203b28e58f35598023f49b4b58a0635", "tree": "f32811a7b51001e4cd6e85fa44b0f199bf1e8a55", "parents": [ "4a6d113ba0f33ce5dc14e59463e928ba309e1c2e" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Jul 13 12:10:30 2011 -0700" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Jul 13 12:10:30 2011 -0700" }, "message": "Fix aidl to cope with multiple collection types per method.\n\nBug: http://code.google.com/p/android/issues/detail?id\u003d18497\nChange-Id: I152416022524d2860cb16b46c4812c5be6bdcbad\n" }, { "commit": "96131eef3869f2be1300e1620f5c3874b41bb534", "tree": "8c378e7302477213510655ec5b9bae290de9f744", "parents": [ "0a49635b171f3ba366b1a7ebf28791c4661829bd" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jul 12 12:35:50 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jul 12 12:35:50 2011 -0700" }, "message": "LayoutLib: updated fake accessbility manager and ensure there\u0027s an InputMethodManager\n\nWe had replaced the accessibility Manager but it lacked some new API. Obvisouly\nthis is fragile and should be fixed, but this works for now.\n\nAfter fixing this there was another issue with the lack of InputMethodManager.\nTo fix this I had to create an implementation of IInputMethodManager which\nnormally comes from a binder object.\n\nI may want to do a similar trick with the accessibility manager later.\n\nChange-Id: I28c6494e333f39072f348d0199124efac93256a5\n" }, { "commit": "0a49635b171f3ba366b1a7ebf28791c4661829bd", "tree": "5130ff1f492eb1b37beac8a72b1075099738cec4", "parents": [ "77eaa10949dd47532e262f8e74ad5a1536a4952e" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jul 12 11:39:27 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jul 12 11:49:22 2011 -0700" }, "message": "LayoutLib: Delegate for Display and IWindowManager implementation.\n\nThis allows ViewConfiguration to be properly implemented which is now\nrequired for the rendering to happen.\n\nChange-Id: I55629689fa8f5f874b43fcac2aa0789ce02d58f4\n" }, { "commit": "77eaa10949dd47532e262f8e74ad5a1536a4952e", "tree": "217612fa0ac7d51f66e235974287976be8e0a11a", "parents": [ "5623b074977d55a61f29099f44670916c6282e51" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Jul 11 14:32:26 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Jul 11 14:40:48 2011 -0700" }, "message": "new button graphics for layoutlib.\n\nChange-Id: I12a6bf9df87552321452ca3344449814cd3102bb\n" }, { "commit": "9163a4a686fc25fefc77d5b41c24a4538486a48e", "tree": "5ceb5620392bb3ffa4072e5899cb8a95a2a318d0", "parents": [ "3b219a51a9d692807d3fb0f516df81609ca6e4fc", "aa4b1d8ba9d5e317b67638b764d92d17fb810aa0" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Jul 11 12:46:07 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jul 11 12:46:07 2011 -0700" }, "message": "am aa4b1d8b: am d292d2a0: Merge 36a3a392 from mr1.\n\n* commit \u0027aa4b1d8ba9d5e317b67638b764d92d17fb810aa0\u0027:\n Merge 36a3a392 from mr1.\n" }, { "commit": "d292d2a03134eaca8b51b6313610b4b78de53c83", "tree": "a9ab3c83b1b5b5ff11d3d5a8d65aac5b922fb288", "parents": [ "3f3b8cbfa775f2ebff985c069300f8daaeb7a84c" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Fri Jul 08 11:55:00 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Jul 11 12:02:51 2011 -0700" }, "message": "Merge 36a3a392 from mr1.\n\nProtect against OOB index in BridgeTypedArray.\n\nChange-Id: I40be1e039f9eb36c182b6522bd50d6ed98e15b5c\n" }, { "commit": "842725fc642b7ba2c087cc81796973b838c23c76", "tree": "7153de69f4f965e51c0eb8eebc774cfda796dd7a", "parents": [ "9bce27a9ce916bdf363667ee67fc0ce50c533aa3", "4d825e1f3bb6b52ecbea6f0c4aa2081b7f1edc89" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jun 28 18:55:46 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 28 18:55:46 2011 -0700" }, "message": "am 4d825e1f: Merge \"Bring in more layout lib changes from hc-mr1.\" into gingerbread\n\n* commit \u00274d825e1f3bb6b52ecbea6f0c4aa2081b7f1edc89\u0027:\n Bring in more layout lib changes from hc-mr1.\n" }, { "commit": "9bce27a9ce916bdf363667ee67fc0ce50c533aa3", "tree": "1946628579b2bd45a0ba2b48440151a2ba68d7df", "parents": [ "155cf6c1e191bb03fe24db8663715862d8e6a43d", "4753498d5c1ac3cf93b0730e77946a95b6913a82" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jun 28 18:55:42 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 28 18:55:42 2011 -0700" }, "message": "am 4753498d: Merge \"CherryPick 06942bc4 from hc-mr1. do not merge.\" into gingerbread\n\n* commit \u00274753498d5c1ac3cf93b0730e77946a95b6913a82\u0027:\n CherryPick 06942bc4 from hc-mr1. do not merge.\n" }, { "commit": "155cf6c1e191bb03fe24db8663715862d8e6a43d", "tree": "9dfacc0c137a1b6e7b8909778a1c7b14679c46b2", "parents": [ "e0947693c9984727dfa775a747dd32aaaeb90284", "9918ffb07f47430e22f6e53576d59b599f5a3534" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jun 28 18:53:54 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 28 18:53:54 2011 -0700" }, "message": "am 9918ffb0: Merge \"CherryPick 988eeeb5 from hc-mr1. do not merge.\" into gingerbread\n\n* commit \u00279918ffb07f47430e22f6e53576d59b599f5a3534\u0027:\n CherryPick 988eeeb5 from hc-mr1. do not merge.\n" }, { "commit": "9bf34ca6f85309c65b0ebdf614cb8266401b49ba", "tree": "50708801cb3c58aa23a32bc1a1ad39315e3aeff5", "parents": [ "ce89f1531ed8b96b8b790b3f8b18dd4cf483f7f0" ], "author": { "name": "Josiah Gaskin", "email": "josiahgaskin@google.com", "time": "Tue Jun 14 13:57:09 2011 -0700" }, "committer": { "name": "Josiah Gaskin", "email": "josiahgaskin@google.com", "time": "Mon Jun 27 16:44:57 2011 -0700" }, "message": "Add dependency generation to Aapt for R.java\n\nMake Aapt generate a dependency file in the location specified\nby RClassDir for R.java if the --generate-dependencies flag is set.\nThis dependency file is then read by the ant exec loop task\nto see whether to recreate R.java.\n\nChange-Id: I7152dac86b6ea0e448ef65e3a95694afe233c789\n" }, { "commit": "ce89f1531ed8b96b8b790b3f8b18dd4cf483f7f0", "tree": "203ed8910afd70ee30fcece6c3c547383cf20b66", "parents": [ "4fea5373d350f5d855408ffaa41206b8fa743c55" ], "author": { "name": "Josiah Gaskin", "email": "josiahgaskin@google.com", "time": "Wed Jun 08 19:31:40 2011 -0700" }, "committer": { "name": "Josiah Gaskin", "email": "josiahgaskin@google.com", "time": "Mon Jun 27 16:29:38 2011 -0700" }, "message": "Copy once-created R.java into library projects\n\nThis change adds functionality in Aapt to allow specification of\nlibrary projects to copy the generated R.java file into rather\nthan regenerating the file for each library project.\n\nChange-Id: I05939d1dc875bd875be9298ca47cb639235070c6\n" }, { "commit": "b02367778d451e38509ca1fc3fbc1d01dce6af1e", "tree": "f12ac14175b927f9bf93b6bd95822c908f5aba97", "parents": [ "996bdbaaf0b532c77c10a1efea3b17eb50f416db", "f9705ef6d3f1502991dd312bfdbfb93cb07fe672" ], "author": { "name": "Raphael Moll", "email": "ralf@android.com", "time": "Thu Jun 23 14:30:25 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 23 14:30:25 2011 -0700" }, "message": "am f9705ef6: am 2b5f2d01: am e2b41b0d: Merge \"Laoutlib_creator: keep original of delegate methods.\"\n\n* commit \u0027f9705ef6d3f1502991dd312bfdbfb93cb07fe672\u0027:\n Laoutlib_creator: keep original of delegate methods.\n" }, { "commit": "f9705ef6d3f1502991dd312bfdbfb93cb07fe672", "tree": "d140e69c031dc236ed383df4b4fb091b79ba4fe9", "parents": [ "4333de2a8e878b319c0e779942b87c042804d352", "2b5f2d01558ba338042f486c754f63873c4061fe" ], "author": { "name": "Raphael Moll", "email": "ralf@android.com", "time": "Wed Jun 22 18:05:22 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jun 22 18:05:22 2011 -0700" }, "message": "am 2b5f2d01: am e2b41b0d: Merge \"Laoutlib_creator: keep original of delegate methods.\"\n\n* commit \u00272b5f2d01558ba338042f486c754f63873c4061fe\u0027:\n Laoutlib_creator: keep original of delegate methods.\n" }, { "commit": "2b5f2d01558ba338042f486c754f63873c4061fe", "tree": "17b56eb49a6383f0ca1d1f626a31bc85f1db0129", "parents": [ "9e5d0de9a333683533a021e9733e824cac666d18", "e2b41b0d5c8db85a60cd190c7094052db61114b2" ], "author": { "name": "Raphael Moll", "email": "ralf@android.com", "time": "Wed Jun 22 17:44:29 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jun 22 17:44:29 2011 -0700" }, "message": "am e2b41b0d: Merge \"Laoutlib_creator: keep original of delegate methods.\"\n\n* commit \u0027e2b41b0d5c8db85a60cd190c7094052db61114b2\u0027:\n Laoutlib_creator: keep original of delegate methods.\n" }, { "commit": "98e1e18c1cc1ec98a20dbdf0e6497614aacf3d0a", "tree": "25d41dabda547c9e2a1a060d8720e8d3ee4de2be", "parents": [ "8969d9924c662ab4cdacc342bbdc33756db730be" ], "author": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Jun 22 11:35:11 2011 -0700" }, "committer": { "name": "Brian Carlstrom", "email": "bdc@google.com", "time": "Wed Jun 22 11:35:11 2011 -0700" }, "message": "Fix build.\n\ngit cherry-pick --no-commit 22a614142aacce13fc46a0e524dbfb6ca56bf237\n\nChange-Id: I1409bc3dd1f1b3027c12355e8b6aeffa2d857c83\n" }, { "commit": "e86c5b2e9fe79f2a6f4187b6a4f2769c0b64168b", "tree": "607c8bedafd3f300962d776b97ee84a209917690", "parents": [ "157c74e7ace77ae026cb59f48e400fb4ffe3c529", "fc511683b6647295cb645a0118d1b0afd575b3c3" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jun 21 12:19:07 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 21 12:19:07 2011 -0700" }, "message": "Merge \"Add missing delegate to the layoutlib.\"" }, { "commit": "3523325159c083140ba51d36f46270f6adddad77", "tree": "59e5bd628f656bd4adbc4d96b26cc517fd0c7836", "parents": [ "31e92e4f19367bd791c1d962a2627f59eab2ab86", "01f0fd84d085f90ca73e9091618ab3d98b5e1c4a" ], "author": { "name": "Brett Chabot", "email": "brettchabot@android.com", "time": "Tue Jun 21 11:27:29 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 21 11:27:29 2011 -0700" }, "message": "Merge \"Include testdata in layoutlib-tests.\"" }, { "commit": "fc511683b6647295cb645a0118d1b0afd575b3c3", "tree": "14d0c9916008cf406dc45c64ffd10f6e0c319de6", "parents": [ "e2b801e5a437d75151d70a90e73f5f110d8732dd" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jun 21 11:03:29 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jun 21 11:03:29 2011 -0700" }, "message": "Add missing delegate to the layoutlib.\n\nChange-Id: I8de5c1093052c40c0cd327a4d02b01651d3b76b5\n" }, { "commit": "45ccfa5870517374d06e1eec9f61947d8c00cb0d", "tree": "eade784b108e83e2ab5f6076b6ae897ca655b3ef", "parents": [ "df02afe8355e1e7a6f8f02549f41a166c3ee6932" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Mon Jun 20 15:41:08 2011 -0700" }, "committer": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Mon Jun 20 15:41:08 2011 -0700" }, "message": "Output Proguard options for also overlay layouts.\n\nChange-Id: I7bfac476247bd7b532510e295cb1a3e61e9af88b\n" }, { "commit": "865c3bef54228a353fd449a093b0c8d155618296", "tree": "c93e90facdad4fbabb288960427874bd6e7dd2bf", "parents": [ "94062517ae5573f9a1a877a83fe7d8e6d1a2c350" ], "author": { "name": "Raphael Moll", "email": "ralf@android.com", "time": "Fri Jun 17 17:12:52 2011 -0700" }, "committer": { "name": "Raphael Moll", "email": "ralf@android.com", "time": "Fri Jun 17 19:07:13 2011 -0700" }, "message": "Laoutlib_creator: keep original of delegate methods.\n\nFor specific methods, Layoublib_create can rewrite the implementation\nof a method to invoke a delegate instead of the original code. This\nallows layoutlib to implement native code or override existing behavior.\n\nThis patch also \u0027saves\u0027 the original implementation of a rewritten\nmethod so that the delegate can access the original implementation\nas needed. Obviously this is only done for non-native methods.\n\nGiven a non-native SomeClass.MethodName, we generate 2 methods:\n- A copy of the original method named \"SomeClass.MethodName_original\".\n The content is the original method as-is from the reader.\n- A brand new implementation of SomeClass.MethodName which calls to a\n non-existing method named \"SomeClass_delegate.MethodName\".\n The implementation of this \u0027delegate\u0027 method is done in layoutlib_brigde.\n\nChange-Id: I5ca2cd3ac55991a8e8a51c417e75ee447bf9e9e6\n" }, { "commit": "01f0fd84d085f90ca73e9091618ab3d98b5e1c4a", "tree": "c87cda4143344bc8aa8dd7efab63432c9910611c", "parents": [ "576715c75987b64eff120f8800862815753b0c8a" ], "author": { "name": "Brett Chabot", "email": "brettchabot@android.com", "time": "Fri Jun 17 17:03:20 2011 -0700" }, "committer": { "name": "Brett Chabot", "email": "brettchabot@android.com", "time": "Fri Jun 17 17:03:20 2011 -0700" }, "message": "Include testdata in layoutlib-tests.\n\nChange-Id: I79fff895a13d171079b59db54d4b9d2bec555b3c\n" }, { "commit": "ea5f0d0543a2ea78ecb0aa3d080098942ba3a4df", "tree": "29029f0d4b315b537ba876369efb629750a19c0d", "parents": [ "d6465e10c27140647e02be8160d900d6e7e78441" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Jun 09 19:14:06 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Jun 16 18:26:25 2011 -0700" }, "message": "Bring in more layout lib changes from hc-mr1.\n\nfe051bb2 : Change the way the layoutlib instantiate its XmlPullParser.\n\nA lot of the init code was duplicated so I made a ParserFactory class.\n\nAlso created an extension of the KXmlPullParser to override toString().\nThis allows easier debugging when dealing with multiple parsers (which\nis always the case).\n\nAlso added some (disabled) debugging printf to deal with parser stack\nas it can be tricky figuring out which parsers are in the stack at\nwhich point.\n\n8969147c : Fix case where the int[] attrs doesn\u0027t directly match a styleable.\n\nIn the case of the FastScroller the int[] is a custom mix of attr\ninstead of a int[] that exists as R.styleable.foo.\n\nThis makes our reflection based mechanism used to find the styleable\nfail, so instead we search for each attribute separately (like\nwe probably should have done from the beginning).\n\n0c264b35: Fix various cases of getDimension to report error if unit is missing.\n\nif getDimention###() is called for a string that has no unit,\nthen an error is output through LayoutLog, but the rendering keeps\ngoing by using dp as a default.\n\n0beb7eea: Make (Bridge)TypedArray.getInteger() call out to getInt()\n\nOnly getInt() resolved attribute flags/enum and I\u0027m not sure why\nthere\u0027s two to begin with.\n\nChange-Id: I015111263d2a2bee76834978ae71eef79defdae3\n" }, { "commit": "d6465e10c27140647e02be8160d900d6e7e78441", "tree": "9d1d07ec308956d7329535b57d89fb7c46117567", "parents": [ "6b62c82848b9823a26fc107deef8227d9cd516a6" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jun 07 17:48:35 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Jun 16 18:26:25 2011 -0700" }, "message": "CherryPick 06942bc4 from hc-mr1. do not merge.\n\nLayoutlib - use the new getParser callback when possible.\n\nChange-Id: I72b867aa573fcc07d610f139da3c90b1b654633c\n" }, { "commit": "6b62c82848b9823a26fc107deef8227d9cd516a6", "tree": "a55d9486ce41b9e1be56551d4e0c0dd082a16f05", "parents": [ "ec15afca08fcc342d6f22cf02a21975af13091cf" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jun 07 17:03:10 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Jun 16 18:26:24 2011 -0700" }, "message": "CherryPick 988eeeb5 from hc-mr1. do not merge.\n\nSupport for custom declare-styleable attr with enum/flag in layoutlib.\n\nChange-Id: I8a5b7cc629d61996ffade9aabd9d4d10961eb411\n" }, { "commit": "4bd44535feac75fffd2c941183de02c983523f43", "tree": "cab8c964d724ce31c440cb0e728da86a880b5155", "parents": [ "e472fd2b31bef91eb7f66d8ae0b78144b1a2928e", "810dc5980c504a89974c07fcbd28a2b5dffb47de" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Jun 16 14:57:59 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 16 14:57:59 2011 -0700" }, "message": "am 810dc598: am f1c5dbbd: am abd4dffc: Merge \"New orientation handling. Only impacts SDK (aapt dump badging).\" into honeycomb-mr2\n\n* commit \u0027810dc5980c504a89974c07fcbd28a2b5dffb47de\u0027:\n New orientation handling. Only impacts SDK (aapt dump badging).\n" }, { "commit": "810dc5980c504a89974c07fcbd28a2b5dffb47de", "tree": "7c8fa7a76e24224320d1a6c1d0cf14c686a0acc1", "parents": [ "9bf1a0c3c7e3c26df170519867c5daeee959791e", "f1c5dbbd457bb14d3673508aaba497cdc328a1ef" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Jun 16 14:55:01 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 16 14:55:01 2011 -0700" }, "message": "am f1c5dbbd: am abd4dffc: Merge \"New orientation handling. Only impacts SDK (aapt dump badging).\" into honeycomb-mr2\n\n* commit \u0027f1c5dbbd457bb14d3673508aaba497cdc328a1ef\u0027:\n New orientation handling. Only impacts SDK (aapt dump badging).\n" }, { "commit": "abd4dffc86202d48e50bd21807574fa861854dca", "tree": "614575f50f679c7eff2edda86886519a6cece22b", "parents": [ "6b93f976c0cec32be39b3a17ea8195c4ac6b8052", "f77ae6e65a7ab47e7ab0ee1536d708b6e56fe45b" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Jun 16 14:47:53 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 16 14:47:53 2011 -0700" }, "message": "Merge \"New orientation handling. Only impacts SDK (aapt dump badging).\" into honeycomb-mr2" }, { "commit": "9340ab4a213093bd59c79159011d131c9cd6996f", "tree": "69475f53306882ab8fcafba7dcb94cbade1c6cc2", "parents": [ "da672372253002f06085ec6eace38b2fafe0f256", "0be8522b430aca8d90023d7c7e5ef510aa48adc7" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Jun 16 14:04:18 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 16 14:04:18 2011 -0700" }, "message": "am 0be8522b: am d1abd94f: am 04ce8111: Bring in more layout lib changes from hc-mr1.\n\n* commit \u00270be8522b430aca8d90023d7c7e5ef510aa48adc7\u0027:\n Bring in more layout lib changes from hc-mr1.\n" }, { "commit": "0be8522b430aca8d90023d7c7e5ef510aa48adc7", "tree": "e9b8f0d0cb62dd30d41334c8699e365eb94de257", "parents": [ "241b65aca93e263f0869c5bec4ad1dbda0dec6db", "d1abd94f57c0162186c57aea98790e8fa281e0a2" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Jun 16 13:55:30 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 16 13:55:30 2011 -0700" }, "message": "am d1abd94f: am 04ce8111: Bring in more layout lib changes from hc-mr1.\n\n* commit \u0027d1abd94f57c0162186c57aea98790e8fa281e0a2\u0027:\n Bring in more layout lib changes from hc-mr1.\n" }, { "commit": "04ce81113107d2bfa0b8248b13145b4cf24cb943", "tree": "a9715c622a2b04360a8f47fb3a166fd5047b193f", "parents": [ "8e18668d14adf601cbe5973030c310ec23d88461" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Jun 09 19:14:06 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Jun 16 13:23:53 2011 -0700" }, "message": "Bring in more layout lib changes from hc-mr1.\n\nfe051bb2 : Change the way the layoutlib instantiate its XmlPullParser.\n\nA lot of the init code was duplicated so I made a ParserFactory class.\n\nAlso created an extension of the KXmlPullParser to override toString().\nThis allows easier debugging when dealing with multiple parsers (which\nis always the case).\n\nAlso added some (disabled) debugging printf to deal with parser stack\nas it can be tricky figuring out which parsers are in the stack at\nwhich point.\n\n8969147c : Fix case where the int[] attrs doesn\u0027t directly match a styleable.\n\nIn the case of the FastScroller the int[] is a custom mix of attr\ninstead of a int[] that exists as R.styleable.foo.\n\nThis makes our reflection based mechanism used to find the styleable\nfail, so instead we search for each attribute separately (like\nwe probably should have done from the beginning).\n\n0c264b35: Fix various cases of getDimension to report error if unit is missing.\n\nif getDimention###() is called for a string that has no unit,\nthen an error is output through LayoutLog, but the rendering keeps\ngoing by using dp as a default.\n\n0beb7eea: Make (Bridge)TypedArray.getInteger() call out to getInt()\n\nOnly getInt() resolved attribute flags/enum and I\u0027m not sure why\nthere\u0027s two to begin with.\n" }, { "commit": "f77ae6e65a7ab47e7ab0ee1536d708b6e56fe45b", "tree": "05debb40d686a7085287f9e8eeacb7ab89794813", "parents": [ "8e18668d14adf601cbe5973030c310ec23d88461" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Jun 16 11:11:23 2011 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Jun 16 11:13:20 2011 -0700" }, "message": "New orientation handling. Only impacts SDK (aapt dump badging).\n\nThis is a new way of determining whether an application requires\nspecific orientations, done by looking at any requirements in its\nactivity tags. Note that this won\u0027t catch all possible issues,\nbecause applications can still force an orientation through Java\nAPIs, but the vast majority of applications that actually require\na specific orientation should be doing it this way because it the\neasiest way and the only way to cleanly launch into the app from\na different orientation without doing some serious activity tricks.\n\nChange-Id: I11d32104f6bc3d2a72aeeff1ca150b8f1c9f5588\n" }, { "commit": "66743a1ec0dddadec7cd8f026f9b6a2239f515be", "tree": "58668aa8482b43977d7eb5f36d3c3d2c5ea2eee1", "parents": [ "f71e5469441286c6f466043e64a7f6492557cbd9" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jun 15 14:43:42 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jun 15 14:43:42 2011 -0700" }, "message": "Fix changed native method delegates in layoutlib for ICS.\n\nChange-Id: I49306868cd8a41b6b7d919c3e8b108d5c014530e\n" }, { "commit": "711516d140390aeec9e3eefb8fdb2681c3454980", "tree": "f73caa003154567d63dfa36089d443f51bed52df", "parents": [ "f0b517d9d287e86e6e57a372ddcb070cec1fe1c0", "77fc8b8066709a1d09a159901fd65c49b5e6eaa5" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Jun 14 12:17:35 2011 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Jun 14 12:17:35 2011 -0700" }, "message": "resolved conflicts for merge of 77fc8b80 to master\n\nChange-Id: I014f9a886d6f05607d2a5d101ad2052a6841ee8d\n" }, { "commit": "77fc8b8066709a1d09a159901fd65c49b5e6eaa5", "tree": "5a7b35359f2f30947331667e5acbddab9140d558", "parents": [ "aabe5f46846a45163be874dca2d19910ce38c232", "6c0533f994e7991b3bd60cab48362e8e2e6d86f0" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Jun 14 11:40:06 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 14 11:40:06 2011 -0700" }, "message": "am 6c0533f9: am c5193c62: Merge \"Add new landscape and portrait orientation features.\" into honeycomb-mr2\n\n* commit \u00276c0533f994e7991b3bd60cab48362e8e2e6d86f0\u0027:\n Add new landscape and portrait orientation features.\n" }, { "commit": "e289bff0ec2b1af4ba773e0c8d49d5fd46eb9921", "tree": "4103ae9dc1838be1f61c0562fadbff9039949b50", "parents": [ "fd63814abe8e81d5e1e0eb75b5a5a18034e9b4c6" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Jun 13 19:33:22 2011 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue Jun 14 11:23:52 2011 -0700" }, "message": "Add new landscape and portrait orientation features.\n\nUpdates aapt to know about these. Also updates aapt badging to:\n\n- No longer crash due to the change to how we match unspecified\nconfiguration resources.\n- Report the new \"smallest screen\" supported screen configs.\n- Infer old screen size buckets based on new smallest width attrs.\n- Report all of the different labels and icons in an app.\n\nChange-Id: I7376042b817391bd070f549cebbc7f03be4635c8\n" }, { "commit": "ef42dace44f7009b99afe532be2a6fffc802bc41", "tree": "fc4d431841ef349145f98d67ba336bdaacd1f847", "parents": [ "e14674d51555e7c270fb10e465e906fc1b0cd607", "f14dff1219d2a87340dccad657f666f5451d8c6e" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Jun 10 14:08:41 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 10 14:08:41 2011 -0700" }, "message": "am f14dff12: am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on non-public styles.\n\n* commit \u0027f14dff1219d2a87340dccad657f666f5451d8c6e\u0027:\n Okay *now* really enforce the limit on non-public styles.\n" }, { "commit": "173e4c79b4eced0e155c8b31496eb3815ed3571c", "tree": "e8f06602b2a1ff072bd00150eb916bedce8d861a", "parents": [ "32ed8448d20b7b69afc2590eed60163d80e818fe", "9980043e930f877c4cd066de2b3d57dce4fc926e" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Jun 10 13:00:41 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 10 13:00:41 2011 -0700" }, "message": "am 9980043e: am 820caf7b: am 8821ba86: Ummm... f*, stop breaking the build.\n\n* commit \u00279980043e930f877c4cd066de2b3d57dce4fc926e\u0027:\n Ummm... f*, stop breaking the build.\n" }, { "commit": "6b592723c9a9fc816a8ab75c935e8cd20ff65a0e", "tree": "00b93945a1c8051172316575208f14c355e663c3", "parents": [ "08b992c88e60a95b629a70cd197b3d3b9b27fb8d", "f51ded0f8f593d17af82946eb65c05fc04f688b4" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Jun 10 12:45:36 2011 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Jun 10 12:45:36 2011 -0700" }, "message": "resolved conflicts for merge of f51ded0f to master\n\nChange-Id: Ida356524a68aeb2b9b0013dfbb6ab4bd11e616e2\n" }, { "commit": "2dcb6e80b999d93409e66bbd01b94a419c22013c", "tree": "445f90a614ca22ef16487caa717226ddb7387885", "parents": [ "8c6d777da0e96b9ed5f0e2c1e643e767b17cb9e1", "48305f327ff3839ddbfa5a6fb42a57150a69480c" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Fri Jun 10 10:31:52 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 10 10:31:52 2011 -0700" }, "message": "am 48305f32: am 2e0f7118: am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2\n\n* commit \u002748305f327ff3839ddbfa5a6fb42a57150a69480c\u0027:\n Merge 06942bc4 from hc-mr1.\n Merge 988eeeb5 from hc-mr1.\n" }, { "commit": "f14dff1219d2a87340dccad657f666f5451d8c6e", "tree": "32b39d7d93170aed01c11e7353afc53a2b306cb4", "parents": [ "9980043e930f877c4cd066de2b3d57dce4fc926e", "c6adfed6dcea8482e482db58bd396ea8de08426a" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Jun 10 07:45:38 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 10 07:45:38 2011 -0700" }, "message": "am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on non-public styles.\n\n* commit \u0027c6adfed6dcea8482e482db58bd396ea8de08426a\u0027:\n Okay *now* really enforce the limit on non-public styles.\n" }, { "commit": "9980043e930f877c4cd066de2b3d57dce4fc926e", "tree": "75a6babdf701437e03d87c98e02f6ffb706ba8ff", "parents": [ "f51ded0f8f593d17af82946eb65c05fc04f688b4", "820caf7b04f1e5c83599437e9e783e91322eb4f9" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Jun 09 16:18:07 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 09 16:18:07 2011 -0700" }, "message": "am 820caf7b: am 8821ba86: Ummm... f*, stop breaking the build.\n\n* commit \u0027820caf7b04f1e5c83599437e9e783e91322eb4f9\u0027:\n Ummm... f*, stop breaking the build.\n" }, { "commit": "f795e9a86d4f62e5314ef95978c3ea17d90975db", "tree": "6823d69078ce14eb0aeffd2fd774cea163a52263", "parents": [ "8821ba860693f5206c56ae727a4231e4d6f0a735" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Jun 09 16:17:53 2011 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Jun 09 16:17:53 2011 -0700" }, "message": "Okay *now* really enforce the limit on non-public styles.\n\nChange-Id: Ie8df6acf7cc3dec00f615b2fa9a5122ec79a0aae\n" }, { "commit": "8821ba860693f5206c56ae727a4231e4d6f0a735", "tree": "e9184a6f581738ecd6ffc406b73fda17d3625309", "parents": [ "220cd77de62956eb76c5084e1d1341d69bfd214a" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Jun 09 11:29:08 2011 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Jun 09 16:09:15 2011 -0700" }, "message": "Ummm... f*, stop breaking the build.\n\nChange-Id: I6a42cb60e7cebda6d17222e6af1f327889323c40\n" }, { "commit": "f51ded0f8f593d17af82946eb65c05fc04f688b4", "tree": "32b39d7d93170aed01c11e7353afc53a2b306cb4", "parents": [ "5a8455c3c625201f3ae6b9ce32913bf97ba61cc8", "a8d7ea067cf22baeee2ff0a33e5a8c5a35936942" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Jun 09 16:06:07 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 09 16:06:07 2011 -0700" }, "message": "am a8d7ea06: am 220cd77d: Merge \"Enforce public resource restriction on bag parents.\" into honeycomb-mr2\n\n* commit \u0027a8d7ea067cf22baeee2ff0a33e5a8c5a35936942\u0027:\n Enforce public resource restriction on bag parents.\n" }, { "commit": "426431adcc220b6adfbe1d9530247f897e60fa36", "tree": "e9dd34ae5151de5bf9f57edb3055d0d228e1f006", "parents": [ "1d3173c3dc93bb4f2efc5b059fec8e7577b3258a" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Jun 09 11:29:08 2011 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Jun 09 15:27:39 2011 -0700" }, "message": "Enforce public resource restriction on bag parents.\n\nNeed to put some more styles in the SDK to avoid breaking apps.\n\nAlso, welcome Android 3.2.\n\nChange-Id: Ia31d07c9b1b91ad868d8630437fdc1b5ae24f37d\n" }, { "commit": "48305f327ff3839ddbfa5a6fb42a57150a69480c", "tree": "49aebd86c071ec847afedabd909a4080ca30c56e", "parents": [ "e668c0b69896996040f394e0a95f71dd4b9c6257", "2e0f71181792780b55826bcc562ae79951e76f1b" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Thu Jun 09 12:49:55 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 09 12:49:55 2011 -0700" }, "message": "am 2e0f7118: am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2\n\n* commit \u00272e0f71181792780b55826bcc562ae79951e76f1b\u0027:\n Merge 06942bc4 from hc-mr1.\n Merge 988eeeb5 from hc-mr1.\n" }, { "commit": "45b662e1bcff23dc59fb3a47bc32c99e63b2ac35", "tree": "43cf38fd15a568b875a029c83a4c15f9a6280abe", "parents": [ "beb5fb622b71693c21b6fab562a98e7000c64273" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jun 07 17:48:35 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jun 08 17:11:40 2011 -0700" }, "message": "Merge 06942bc4 from hc-mr1.\n\nLayoutlib - use the new getParser callback when possible.\n\nChange-Id: Idbb70f5391addd539afa5c2f5b55c70beefed223\n" }, { "commit": "beb5fb622b71693c21b6fab562a98e7000c64273", "tree": "2363646dabecde6e300f2483625e5b0d401f4e0a", "parents": [ "cea03df201dc6659654234bc5fbfebf1b6a06e42" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jun 07 17:03:10 2011 -0700" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed Jun 08 17:10:11 2011 -0700" }, "message": "Merge 988eeeb5 from hc-mr1.\n\nSupport for custom declare-styleable attr with enum/flag in layoutlib.\n\nChange-Id: I10426a3f2c76bed207c03fab7885b4269337a70f\n" }, { "commit": "f18e311ee5d35db0cae96f0b216a88e5b42604dc", "tree": "60ddaf1c2c9936d4711c93a82705cdd325e1fa53", "parents": [ "c8307c885f8462f2baf9f06c9916d1521f7fdcfb", "abc838716816107754ab0479242d03807ce79fc2" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue Jun 07 17:17:11 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 07 17:17:11 2011 -0700" }, "message": "am abc83871: am f6e47999: am 2a6dc7f1: Merge \"Import the Layoutlib from hc-mr1.\" into honeycomb-mr2\n\n* commit \u0027abc838716816107754ab0479242d03807ce79fc2\u0027:\n Import the Layoutlib from hc-mr1.\n" }, { "commit": "abc838716816107754ab0479242d03807ce79fc2", "tree": "bef8829598097960aa0fe3714e98fad27bb141ef", "parents": [ "cf3036ebef2929f84bc4e34ed1e9d96eefd6a5e7", "f6e479993e7c85265692829990ceb3879fbce424" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Jun 06 18:11:33 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 06 18:11:33 2011 -0700" }, "message": "am f6e47999: am 2a6dc7f1: Merge \"Import the Layoutlib from hc-mr1.\" into honeycomb-mr2\n\n* commit \u0027f6e479993e7c85265692829990ceb3879fbce424\u0027:\n Import the Layoutlib from hc-mr1.\n" }, { "commit": "67f09cd090adae6365ca36546b0a517e51255876", "tree": "b791f629d87bd1d47f4c5494a3183b27a9496de5", "parents": [ "ab3f5779aecb46d7ddfb141f9b0ff8fc0eaed17f", "d6ce6791f26fd0a7cf89ded2847011a4894013e1" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Jun 06 18:08:40 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 06 18:08:40 2011 -0700" }, "message": "am d6ce6791: Merge \"Cherrypick d1ed33c4 from hc-mr1. do not merge.\" into gingerbread\n\n* commit \u0027d6ce6791f26fd0a7cf89ded2847011a4894013e1\u0027:\n Cherrypick d1ed33c4 from hc-mr1. do not merge.\n" }, { "commit": "ab3f5779aecb46d7ddfb141f9b0ff8fc0eaed17f", "tree": "4c4f5f9996e54d578e17146a26686d630c5872ce", "parents": [ "fbef58faad5a31faf36294e4d160cbd148ed5458", "ee1b497648a0c3c03b09c4739619f23315d491fb" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Jun 06 18:08:32 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 06 18:08:32 2011 -0700" }, "message": "am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread\n\n* commit \u0027ee1b497648a0c3c03b09c4739619f23315d491fb\u0027:\n Cherrypick 5b61ea6b from hc-mr1\n LayoutLib: enable the LAYOUT_ONLY capability.\n Merge dba35f1b from honeycomb-mr1. do not merge.\n" } ], "next": "fb93ce9684120a36862b5b5e67b1865a652907e9" }