jenna
/
hardware_samsung
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lineagehw: hidl: touch: run clang-format

Browse Source 
Change-Id: If7126936fc4e0804c29061c7ecc706228654af15
tirimbino
Jan Altensen 5 years ago committed by Paul Keith
parent 53afa33078
commit 6f3af5aed8
9 changed files with 31 additions and 32 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 11
      lineagehw/hidl/touch/.clang-format
  2. 6
      lineagehw/hidl/touch/GloveMode.cpp
  3. 3
      lineagehw/hidl/touch/GloveMode.h
  4. 3
      lineagehw/hidl/touch/KeyDisabler.h
  5. 6
      lineagehw/hidl/touch/StylusMode.cpp
  6. 3
      lineagehw/hidl/touch/StylusMode.h
  7. 6
      lineagehw/hidl/touch/TouchscreenGesture.cpp
  8. 3
      lineagehw/hidl/touch/TouchscreenGesture.h
  9. 22
      lineagehw/hidl/touch/service.cpp

11
lineagehw/hidl/touch/.clang-format
Unescape View File

@ -0,0 +1,11 @@
BasedOnStyle: Google
AccessModifierOffset: -2
AllowShortFunctionsOnASingleLine: Inline
ColumnLimit: 100
CommentPragmas: NOLINT:.*
DerivePointerAlignment: false
IndentWidth: 4
PointerAlignment: Left
TabWidth: 4
UseTab: Never
PenaltyExcessCharacter: 32

6
lineagehw/hidl/touch/GloveMode.cpp
Unescape View File

@ -29,8 +29,7 @@ bool GloveMode::isSupported() {
if (file.is_open()) {
std::string line;
while (getline(file, line)) {
if (!line.compare("glove_mode"))
return true;
if (!line.compare("glove_mode")) return true;
}
file.close();
}
@ -43,8 +42,7 @@ Return<bool> GloveMode::isEnabled() {
if (file.is_open()) {
std::string line;
getline(file, line);
if (!line.compare("glove_mode,1:OK"))
return true;
if (!line.compare("glove_mode,1:OK")) return true;
file.close();
}
return false;

3
lineagehw/hidl/touch/GloveMode.h
Unescape View File

@ -17,9 +17,9 @@
#ifndef VENDOR_LINEAGE_TOUCH_V1_0_GLOVEMODE_H
#define VENDOR_LINEAGE_TOUCH_V1_0_GLOVEMODE_H
#include <vendor/lineage/touch/1.0/IGloveMode.h>
#include <hidl/MQDescriptor.h>
#include <hidl/Status.h>
#include <vendor/lineage/touch/1.0/IGloveMode.h>
namespace vendor {
namespace lineage {
@ -46,7 +46,6 @@ class GloveMode : public IGloveMode {
Return<bool> setEnabled(bool enabled) override;
// Methods from ::android::hidl::base::V1_0::IBase follow.
};
} // namespace samsung

3
lineagehw/hidl/touch/KeyDisabler.h
Unescape View File

@ -17,9 +17,9 @@
#ifndef VENDOR_LINEAGE_TOUCH_V1_0_KEYDISABLER_H
#define VENDOR_LINEAGE_TOUCH_V1_0_KEYDISABLER_H
#include <vendor/lineage/touch/1.0/IKeyDisabler.h>
#include <hidl/MQDescriptor.h>
#include <hidl/Status.h>
#include <vendor/lineage/touch/1.0/IKeyDisabler.h>
namespace vendor {
namespace lineage {
@ -46,7 +46,6 @@ class KeyDisabler : public IKeyDisabler {
Return<bool> setEnabled(bool enabled) override;
// Methods from ::android::hidl::base::V1_0::IBase follow.
};
} // namespace samsung

6
lineagehw/hidl/touch/StylusMode.cpp
Unescape View File

@ -29,8 +29,7 @@ bool StylusMode::isSupported() {
if (file.is_open()) {
std::string line;
while (getline(file, line)) {
if (!line.compare("hover_enable"))
return true;
if (!line.compare("hover_enable")) return true;
}
file.close();
}
@ -43,8 +42,7 @@ Return<bool> StylusMode::isEnabled() {
if (file.is_open()) {
std::string line;
getline(file, line);
if (!line.compare("hover_enable,1:OK"))
return true;
if (!line.compare("hover_enable,1:OK")) return true;
file.close();
}
return false;

3
lineagehw/hidl/touch/StylusMode.h
Unescape View File

@ -17,9 +17,9 @@
#ifndef VENDOR_LINEAGE_TOUCH_V1_0_STYLUSMODE_H
#define VENDOR_LINEAGE_TOUCH_V1_0_STYLUSMODE_H
#include <vendor/lineage/touch/1.0/IStylusMode.h>
#include <hidl/MQDescriptor.h>
#include <hidl/Status.h>
#include <vendor/lineage/touch/1.0/IStylusMode.h>
namespace vendor {
namespace lineage {
@ -46,7 +46,6 @@ class StylusMode : public IStylusMode {
Return<bool> setEnabled(bool enabled) override;
// Methods from ::android::hidl::base::V1_0::IBase follow.
};
} // namespace samsung

6
lineagehw/hidl/touch/TouchscreenGesture.cpp
Unescape View File

@ -27,14 +27,15 @@ namespace samsung {
static constexpr const char* kGeasturePath = "/sys/class/sec/sec_epen/epen_gestures";
const std::map<int32_t, TouchscreenGesture::GestureInfo> TouchscreenGesture::kGestureInfoMap = {
// clang-format off
{0, {0x2f1, "Swipe up stylus"}},
{1, {0x2f2, "Swipe down stylus"}},
{2, {0x2f3, "Swipe left stylus"}},
{3, {0x2f4, "Swipe right stylus"}},
{4, {0x2f5, "Long press stylus"}},
// clang-format on
};
bool TouchscreenGesture::isSupported() {
std::ifstream file(kGeasturePath);
return file.good();
@ -57,7 +58,7 @@ Return<bool> TouchscreenGesture::setGestureEnabled(
std::fstream file(kGeasturePath);
int gestureMode;
int mask = 1 << gesture.id;
file >> gestureMode;
if (enabled)
@ -70,7 +71,6 @@ Return<bool> TouchscreenGesture::setGestureEnabled(
return !file.fail();
}
// Methods from ::android::hidl::base::V1_0::IBase follow.
} // namespace samsung

3
lineagehw/hidl/touch/TouchscreenGesture.h
Unescape View File

@ -17,9 +17,9 @@
#ifndef VENDOR_LINEAGE_TOUCH_V1_0_TOUCHSCREENGESTURE_H
#define VENDOR_LINEAGE_TOUCH_V1_0_TOUCHSCREENGESTURE_H
#include <vendor/lineage/touch/1.0/ITouchscreenGesture.h>
#include <hidl/MQDescriptor.h>
#include <hidl/Status.h>
#include <vendor/lineage/touch/1.0/ITouchscreenGesture.h>
namespace vendor {
namespace lineage {
@ -50,7 +50,6 @@ class TouchscreenGesture : public ITouchscreenGesture {
const char* name;
} GestureInfo;
static const std::map<int32_t, GestureInfo> kGestureInfoMap; // id -> info
};
// FIXME: most likely delete, this is only for passthrough implementations

22
lineagehw/hidl/touch/service.cpp
Unescape View File

@ -74,9 +74,8 @@ int main() {
if (gloveMode->isSupported()) {
status = gloveMode->registerAsService();
if (status != OK) {
LOG(ERROR)
<< "Could not register service for Touch HAL GloveMode Iface ("
<< status << ")";
LOG(ERROR) << "Could not register service for Touch HAL GloveMode Iface (" << status
<< ")";
goto shutdown;
}
}
@ -84,9 +83,8 @@ int main() {
if (keyDisabler->isSupported()) {
status = keyDisabler->registerAsService();
if (status != OK) {
LOG(ERROR)
<< "Could not register service for Touch HAL KeyDisabler Iface ("
<< status << ")";
LOG(ERROR) << "Could not register service for Touch HAL KeyDisabler Iface (" << status
<< ")";
goto shutdown;
}
}
@ -94,9 +92,8 @@ int main() {
if (stylusMode->isSupported()) {
status = stylusMode->registerAsService();
if (status != OK) {
LOG(ERROR)
<< "Could not register service for Touch HAL StylusMode Iface ("
<< status << ")";
LOG(ERROR) << "Could not register service for Touch HAL StylusMode Iface (" << status
<< ")";
goto shutdown;
}
}
@ -104,16 +101,15 @@ int main() {
if (touchscreenGesture->isSupported()) {
status = touchscreenGesture->registerAsService();
if (status != OK) {
LOG(ERROR)
<< "Could not register service for Touch HAL TouchscreenGesture Iface ("
<< status << ")";
LOG(ERROR) << "Could not register service for Touch HAL TouchscreenGesture Iface ("
<< status << ")";
goto shutdown;
}
}
LOG(INFO) << "Touch HAL service is ready.";
joinRpcThreadpool();
// Should not pass this line
// Should not pass this line
shutdown:
// In normal operation, we don't expect the thread pool to shutdown

Write Preview
Loading…
Cancel
Save