Da Pa 35dbbd6a31 Merge branch 'master' into y5_patch_test ... # Conflicts: # GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java # app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/jyou/TeclastH30/TeclastH30Coordinator.java # app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java # app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java # app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java # app/src/main/res/values/strings.xml		2020-01-01 06:55:54 +02:00
..
arrays.xml	Amazfit Cor: Fix setting band to Chinese manually	2019-12-28 00:17:49 +01:00
attrs.xml	Do not override the android:* text colors, define our own. This fixes a crash on API 19.	2017-04-08 15:49:00 +02:00
colors.xml	Add alternative color to heartrate in charts	2019-10-24 22:59:52 +02:00
dimens.xml	Use a new GUI for the controlcenter.	2016-10-21 13:01:30 +02:00
ic_launcher_background.xml	Adaptive launcher icon background color (forgotten file)	2018-02-20 07:43:09 +01:00
strings.xml	Merge branch 'master' into y5_patch_test	2020-01-01 06:55:54 +02:00
styles.xml	Splash screen	2018-08-01 21:40:41 +02:00
values.xml	Mi Band 3/4: Allow enabling the "NFC" menu where supported	2019-08-01 23:07:28 +02:00