{"push_id":732642825,"size":1,"distinct_size":1,"ref":"refs/heads/merge_fix","head":"7fe3e5888bc945fb6fb8f4b461bbe54434ae2c58","before":"71431ad9181eb94d31d8931d73cdbe66bfe1745d","commits":[{"sha":"7fe3e5888bc945fb6fb8f4b461bbe54434ae2c58","author":{"email":"f0efb33dd1abeac39d91e7125fe4c3c2c9936571@googlemail.com","name":"z31s1g"},"message":"[WIP] gui: stock theme rework\n\nTries to combine the current theme with a touch of material.\nPage structure is untouched for the most part.\nLayout grid is changed to achieve a \"less random\" placement of objects on a page.\n\nPlease test and comment away...\n\nready for testing\n-----------------------------------------------------------------------\n480x800, 1080x1920, 800x480, 1920x1200\n\nto do\n-----------------------------------------------------------------------\nwatch\n\nstate of merge conflicts\n-----------------------------------------------------------------------\n- WIP: Multiple language support (will be there for a while I guess)\n- reduce size (wait for new commit)\n- add \" to the keyboard shift for X (is included)\n\nChange-Id: Icaf796be410431b17d5be6ccc1134d40912bef0b\n\nConflicts:\n\tgui/devices/1080x1920/res/images/keyboard1.png\n\tgui/devices/1080x1920/res/images/keyboard2.png\n\tgui/devices/1080x1920/res/images/keyboard3.png\n\tgui/devices/1080x1920/res/images/keyboard4.png\n\tgui/devices/1080x1920/res/ui.xml\n\tgui/devices/1920x1200/res/images/keyboard1.png\n\tgui/devices/1920x1200/res/images/keyboard2.png\n\tgui/devices/1920x1200/res/images/keyboard3.png\n\tgui/devices/1920x1200/res/images/keyboard4.png\n\tgui/devices/1920x1200/res/ui.xml\n\tgui/devices/480x800/res/images/keyboard1.png\n\tgui/devices/480x800/res/images/keyboard2.png\n\tgui/devices/480x800/res/images/keyboard3.png\n\tgui/devices/480x800/res/images/keyboard4.png\n\tgui/devices/480x800/res/ui.xml\n\tgui/devices/landscape/res/landscape.xml\n\tgui/devices/portrait/res/portrait.xml","distinct":true,"url":"https://api.github.com/repos/zombi-x/android_bootable_recovery/commits/7fe3e5888bc945fb6fb8f4b461bbe54434ae2c58"}]}