Remove rebase junk, update CMakeLists.txt, update Android.mk.

This commit is contained in:
The Dax 2013-10-19 23:39:13 -04:00
parent 83c70baada
commit cdf819c9eb
4 changed files with 5 additions and 12 deletions

View file

@ -74,10 +74,10 @@ void TouchControlVisibilityScreen::CreateViews() {
for (auto i = keyToggles.begin(); i != keyToggles.end(); ++i) {
LinearLayout *row = new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT));
row->SetSpacing(0);
imageFinder = keyImages.find(i->first);
row->Add(new CheckBox(i->second, "", "", new LinearLayoutParams(50, WRAP_CONTENT)));
imageFinder = keyImages.find(i->first);
if (imageFinder != keyImages.end()) {
row->Add(new Choice(keyImages[imageFinder->first], new LinearLayoutParams(1.0f)));
} else {