Commit Graph

101801 Commits

Author SHA1 Message Date
SongFerng Wang
c9e1a00fea Merge "[LE adudio] The condition of right location is wrong." am: 75869b5fef am: 285952a80e am: eefaf62ba7 am: 08e5d43e54
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2037423

Change-Id: I08863750462b894c6d06f436b77fe6f2b9185ea9
2022-03-23 03:19:15 +00:00
SongFerng Wang
08e5d43e54 Merge "[LE adudio] The condition of right location is wrong." am: 75869b5fef am: 285952a80e am: eefaf62ba7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2037423

Change-Id: I1a191387a358a40da753539284bba70d050a9bcd
2022-03-23 02:54:26 +00:00
SongFerng Wang
eefaf62ba7 Merge "[LE adudio] The condition of right location is wrong." am: 75869b5fef am: 285952a80e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2037423

Change-Id: Iabc7d3cf66470bd96c2b5caac2469eac888b2ae2
2022-03-23 02:34:07 +00:00
SongFerng Wang
285952a80e Merge "[LE adudio] The condition of right location is wrong." am: 75869b5fef
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2037423

Change-Id: I98125699c5fe13fe7acbd7668be1e12b6bcedcd6
2022-03-23 02:11:19 +00:00
TreeHugger Robot
e3c72714e4 Merge "Remove myself from OWNERS." 2022-03-23 02:08:23 +00:00
SongFerng Wang
75869b5fef Merge "[LE adudio] The condition of right location is wrong." 2022-03-23 01:52:05 +00:00
Kweku Adams
cb369d3cf0 Merge "Fix inaccessible view issue." into tm-dev am: 240e85be9f am: 45b3c9f280
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17260259

Change-Id: I268445fd2f6f1982273b07f47ae231b1fed776d1
2022-03-22 19:25:27 +00:00
Kweku Adams
bf86bbb5a7 Merge "Make reward constants configurable." into tm-dev am: 32edc913a7 am: 81e1f511d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17263186

Change-Id: I81d11ff81b193064640cd8fb07f879997d4e6350
2022-03-22 19:24:44 +00:00
Kweku Adams
f264728eaf Merge "Fix inaccessible view issue." into tm-dev am: 240e85be9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17260259

Change-Id: Ifefec87c41acdf4e8e47a78f82cd2aba809e9389
2022-03-22 19:08:04 +00:00
Kweku Adams
e1b959bbef Merge "Make reward constants configurable." into tm-dev am: 32edc913a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17263186

Change-Id: I366f2939c28b8a00b164c6912af59c6f717038ea
2022-03-22 19:07:43 +00:00
Kweku Adams
45b3c9f280 Merge "Fix inaccessible view issue." into tm-dev am: 240e85be9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17260259

Change-Id: If6df2836e323f94f99c4fd1a629ff015253a11b2
2022-03-22 19:06:45 +00:00
Kweku Adams
81e1f511d7 Merge "Make reward constants configurable." into tm-dev am: 32edc913a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17263186

Change-Id: I8fc365e90a44177b5f5dc25a9f8a9e513c36bb99
2022-03-22 19:06:38 +00:00
Kweku Adams
240e85be9f Merge "Fix inaccessible view issue." into tm-dev 2022-03-22 18:59:25 +00:00
SongFerngWang
418d78f978 [LE adudio] The condition of right location is wrong.
1. Fix the condition of right location.
2. If the location is left+right, showing the legacy battery style.

Bug: 225800014
Test: build pass. local test.
Change-Id: I03d1d7bfe26d52e0b69d24aec6bd3216350403a0
2022-03-23 02:55:06 +08:00
Yanli Wan
e80aad534a Merge "Update financed device info strings" 2022-03-22 18:53:27 +00:00
Eric Biggers
af587fd3df Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82 am: 465363a312 am: b79a82260c am: 98ac6a6c01 am: b28d6c6c76
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423

Change-Id: I61aac53cb4f668db3f092d8379bbf358ed3f5774
2022-03-22 18:51:28 +00:00
Kweku Adams
32edc913a7 Merge "Make reward constants configurable." into tm-dev 2022-03-22 18:45:36 +00:00
Eric Biggers
9e3afb97ca Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82 am: 465363a312 am: b79a82260c am: 98ac6a6c01
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423

Change-Id: I54f937fb29a9c16816911dc3e851b732e71b8c72
2022-03-22 18:32:34 +00:00
Eric Biggers
b28d6c6c76 Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82 am: 465363a312 am: b79a82260c am: 98ac6a6c01
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423

Change-Id: Icc017c4f8cfeba0e0d5eabcbb592337bf296fbf0
2022-03-22 18:31:43 +00:00
Eric Biggers
98ac6a6c01 Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82 am: 465363a312 am: b79a82260c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423

Change-Id: I46e1ca934dff648e8730d445046fa3150913891b
2022-03-22 18:04:27 +00:00
Eric Biggers
b79a82260c Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82 am: 465363a312
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423

Change-Id: Ieb1bf012ee0f735dcfc4d579eee9fc587bfbdbe1
2022-03-22 17:47:03 +00:00
Eric Biggers
465363a312 Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423

Change-Id: Ieadee7a7c884500a836b5f118fce9b649e9e179b
2022-03-22 17:46:14 +00:00
Eric Biggers
d106ae0f82 Merge "Remove EXTRA_KEY_TYPE intent data" 2022-03-22 17:37:33 +00:00
Kweku Adams
eee64f2f73 Fix inaccessible view issue.
When fully expanded, the last item in the ExpandableListView was half
off the screen, making it hard to see what the value was and update it.
Tweaking the layout to ensure the last item is properly visible.

Bug: 158300259
Bug: 189850067
Test: Visual inspection
Change-Id: Ifc60e220276db6ee6d4dea57957b0b52b1934dbe
2022-03-22 17:37:22 +00:00
Kweku Adams
10ef599170 Make reward constants configurable.
Make it possible to configure the instant and max values of all
supported actions. Ongoing rewards will be enabled later.

Bug: 158300259
Bug: 189850067
Bug: 191876714
Bug: 191877052
Test: Manual
Change-Id: Ia854f18820f3fe95b3b1448c5fa8411853859052
2022-03-22 17:37:07 +00:00
Michael Lu
b4e07cdff4 Remove myself from OWNERS.
Test: N/A
Change-Id: I6a8139e569a31ea3983df0db970a36b841e646d4
2022-03-22 17:29:48 +00:00
TreeHugger Robot
a002d1c937 Merge "Make sure vibration previews in Settings apply latest intensities" into tm-dev am: 285cfcda41 am: 5f6672c459
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17292747

Change-Id: I378ecfc73abeb71f4b9f9c6cb6a984be81f77f86
2022-03-22 15:08:32 +00:00
TreeHugger Robot
5f6672c459 Merge "Make sure vibration previews in Settings apply latest intensities" into tm-dev am: 285cfcda41
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17292747

Change-Id: I8f887febbba78ad0e002322c846375dd5883eb65
2022-03-22 14:48:09 +00:00
TreeHugger Robot
af18f6353c Merge "Make sure vibration previews in Settings apply latest intensities" into tm-dev am: 285cfcda41
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17292747

Change-Id: I4f24c0f10032ef9d661e1ba1d555099f6bfe7e8d
2022-03-22 14:43:36 +00:00
TreeHugger Robot
285cfcda41 Merge "Make sure vibration previews in Settings apply latest intensities" into tm-dev 2022-03-22 14:42:43 +00:00
Yuri Ufimtsev
ba1b11800a Merge "Register Safety Center as SubSetting for two-pane mode" into tm-dev am: b39ab3e1c4 am: f295baf541
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17253603

Change-Id: I1b66c45efac0c81a6536f03897a986bdc3f7f2e0
2022-03-22 14:11:42 +00:00
Yuri Ufimtsev
c6e1936960 Merge "Declare task affinity for entries that could be launched by SafetyCenter" into tm-dev am: 7e7d3f898e am: aa30c6c595
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17134743

Change-Id: I15e64d86e0b880870d6c2b35aaf8899427cda9c3
2022-03-22 14:10:56 +00:00
Yuri Ufimtsev
d4165ec9e1 Merge "Register Safety Center as SubSetting for two-pane mode" into tm-dev am: b39ab3e1c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17253603

Change-Id: Ied8cb07c3ddd89a28e167c6eb18eaea534c6a250
2022-03-22 13:55:41 +00:00
Yuri Ufimtsev
f295baf541 Merge "Register Safety Center as SubSetting for two-pane mode" into tm-dev am: b39ab3e1c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17253603

Change-Id: Ie8a10ade44a05142451df6fdccc8ac6262a66bd2
2022-03-22 13:55:38 +00:00
Yuri Ufimtsev
b1469cce58 Merge "Declare task affinity for entries that could be launched by SafetyCenter" into tm-dev am: 7e7d3f898e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17134743

Change-Id: Ic2fe73e794f3f41708308762757270024e696a93
2022-03-22 13:55:33 +00:00
Yuri Ufimtsev
aa30c6c595 Merge "Declare task affinity for entries that could be launched by SafetyCenter" into tm-dev am: 7e7d3f898e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17134743

Change-Id: Ieb3dc8368db13a43d95c981d2602d182d7ccbf01
2022-03-22 13:55:02 +00:00
Yuri Ufimtsev
b39ab3e1c4 Merge "Register Safety Center as SubSetting for two-pane mode" into tm-dev 2022-03-22 13:41:33 +00:00
Yuri Ufimtsev
7e7d3f898e Merge "Declare task affinity for entries that could be launched by SafetyCenter" into tm-dev 2022-03-22 13:41:09 +00:00
Chaohui Wang
e38c655bc0 Merge "Fix SetupSkipDialogTest" into tm-dev am: 9512dfd7a2 am: 209c747910
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17312727

Change-Id: Id9af1c4f97a4f33f3eab56b07201c1abb2e43936
2022-03-22 12:41:12 +00:00
PETER LIANG
3ea5261a40 Merge "Polish and humanize the strings for the preview of mail content." into tm-dev am: 679e6a140e am: bd67c07268
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17312729

Change-Id: I8d74fa26160d3b621869c322a852be580766d746
2022-03-22 12:39:59 +00:00
Chaohui Wang
46d1fa4b82 Merge "Fix SetupSkipDialogTest" into tm-dev am: 9512dfd7a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17312727

Change-Id: If75b43150ced9d15d36e24fd3bb3c0b92338fa48
2022-03-22 12:25:25 +00:00
PETER LIANG
04f5262673 Merge "Polish and humanize the strings for the preview of mail content." into tm-dev am: 679e6a140e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17312729

Change-Id: Idbfc8799acf7e9e22df3d9dc0b63467eb5d89135
2022-03-22 12:25:15 +00:00
Chaohui Wang
209c747910 Merge "Fix SetupSkipDialogTest" into tm-dev am: 9512dfd7a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17312727

Change-Id: I82eca0f59431a6fb16fb6909844fda7d78480fcf
2022-03-22 12:24:53 +00:00
PETER LIANG
bd67c07268 Merge "Polish and humanize the strings for the preview of mail content." into tm-dev am: 679e6a140e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17312729

Change-Id: Iea6e169d4db4ba9bb2ad31d85388cc9978d60176
2022-03-22 12:24:24 +00:00
Chaohui Wang
9512dfd7a2 Merge "Fix SetupSkipDialogTest" into tm-dev 2022-03-22 12:11:04 +00:00
PETER LIANG
679e6a140e Merge "Polish and humanize the strings for the preview of mail content." into tm-dev 2022-03-22 12:08:19 +00:00
TreeHugger Robot
3e9c8b4aae Merge "Ignore PrivateVolumeForgetTest#test_invalidSetupDoesNotCrashSettings" into tm-dev am: 5376e4bf59 am: d34438c0d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17309763

Change-Id: If4f7e0fd66495a86a9b3f2444af411df1bd549fb
2022-03-22 11:57:20 +00:00
TreeHugger Robot
d34438c0d5 Merge "Ignore PrivateVolumeForgetTest#test_invalidSetupDoesNotCrashSettings" into tm-dev am: 5376e4bf59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17309763

Change-Id: Id54f1d3b24202f9993157cfa1c4d4eff2c53976b
2022-03-22 11:42:53 +00:00
TreeHugger Robot
77c7fbc845 Merge "Ignore PrivateVolumeForgetTest#test_invalidSetupDoesNotCrashSettings" into tm-dev am: 5376e4bf59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17309763

Change-Id: Iedd37ad8905a2418c455924a54a136956abf40a4
2022-03-22 11:42:08 +00:00
TreeHugger Robot
5376e4bf59 Merge "Ignore PrivateVolumeForgetTest#test_invalidSetupDoesNotCrashSettings" into tm-dev 2022-03-22 11:20:55 +00:00