diff options
author | Cole Faust <colefaust@google.com> | 2019-04-26 10:22:46 -0700 |
---|---|---|
committer | Cole Faust <colefaust@google.com> | 2019-04-26 18:18:40 +0000 |
commit | 2b73b131ca5a4e8a274d9691748bfa6e23fd59f0 (patch) | |
tree | a397705ed1288ee226884ca8a6551aee19424a8a | |
parent | 39a1e264bb5fa1c7cd92d24cc0a2fc5b1407e105 (diff) | |
download | Dialer-2b73b131ca5a4e8a274d9691748bfa6e23fd59f0.tar.gz |
Added preupload hooks to dialer.
The PREUPLOAD.cfg was taken from libs, and is also in a number of other car projects.
Adding it here to ensure a consistent style.
Test: Manually
Change-Id: Ib18cc3cdfb9c3b2415de24016fee00fbe339f40d
5 files changed, 16 insertions, 9 deletions
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg new file mode 100644 index 00000000..38f98003 --- /dev/null +++ b/PREUPLOAD.cfg @@ -0,0 +1,7 @@ +[Hook Scripts] +checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT} +ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py -f ${PREUPLOAD_FILES} + +[Builtin Hooks] +commit_msg_changeid_field = true +commit_msg_test_field = true diff --git a/src/com/android/car/dialer/ui/activecall/InCallViewModel.java b/src/com/android/car/dialer/ui/activecall/InCallViewModel.java index 2540578d..e71fc5d9 100644 --- a/src/com/android/car/dialer/ui/activecall/InCallViewModel.java +++ b/src/com/android/car/dialer/ui/activecall/InCallViewModel.java @@ -28,13 +28,13 @@ import androidx.lifecycle.MediatorLiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.Transformations; +import com.android.car.dialer.livedata.CallDetailLiveData; +import com.android.car.dialer.livedata.CallStateLiveData; +import com.android.car.dialer.livedata.HeartBeatLiveData; import com.android.car.dialer.log.L; import com.android.car.dialer.telecom.InCallServiceImpl; import com.android.car.dialer.telecom.UiCallManager; import com.android.car.telephony.common.CallDetail; -import com.android.car.dialer.livedata.CallDetailLiveData; -import com.android.car.dialer.livedata.CallStateLiveData; -import com.android.car.dialer.livedata.HeartBeatLiveData; import com.android.car.telephony.common.TelecomUtils; import com.google.common.collect.Lists; diff --git a/src/com/android/car/dialer/ui/calllog/CallLogViewHolder.java b/src/com/android/car/dialer/ui/calllog/CallLogViewHolder.java index 8aa0bc5f..03e6390a 100644 --- a/src/com/android/car/dialer/ui/calllog/CallLogViewHolder.java +++ b/src/com/android/car/dialer/ui/calllog/CallLogViewHolder.java @@ -24,14 +24,13 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import com.android.car.dialer.R; -import com.android.car.dialer.log.L; -import com.android.car.telephony.common.Contact; -import com.android.car.telephony.common.InMemoryPhoneBook; -import com.android.car.telephony.common.TelecomUtils; import com.android.car.dialer.telecom.UiCallManager; import com.android.car.dialer.ui.common.entity.UiCallLog; import com.android.car.dialer.widget.CallTypeIconsView; +import com.android.car.telephony.common.Contact; +import com.android.car.telephony.common.InMemoryPhoneBook; import com.android.car.telephony.common.PhoneCallLog; +import com.android.car.telephony.common.TelecomUtils; /** * {@link RecyclerView.ViewHolder} for call history list item, responsible for presenting and diff --git a/src/com/android/car/dialer/ui/contact/ContactListAdapter.java b/src/com/android/car/dialer/ui/contact/ContactListAdapter.java index 85f934ea..9c9be76e 100644 --- a/src/com/android/car/dialer/ui/contact/ContactListAdapter.java +++ b/src/com/android/car/dialer/ui/contact/ContactListAdapter.java @@ -20,10 +20,11 @@ import android.content.Context; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; + import com.android.car.dialer.R; -import com.android.car.dialer.log.L; import com.android.car.telephony.common.Contact; import java.util.ArrayList; diff --git a/tests/robotests/src/com/android/car/dialer/ui/dialpad/DialpadFragmentTest.java b/tests/robotests/src/com/android/car/dialer/ui/dialpad/DialpadFragmentTest.java index f319356b..d4bad9c2 100644 --- a/tests/robotests/src/com/android/car/dialer/ui/dialpad/DialpadFragmentTest.java +++ b/tests/robotests/src/com/android/car/dialer/ui/dialpad/DialpadFragmentTest.java @@ -44,9 +44,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.Config; import org.robolectric.Robolectric; import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; @RunWith(CarDialerRobolectricTestRunner.class) |