ykhung
d8d5335096
Build a bridge to control whether the graph is clickable or not
...
Create a bridge to read phenotype flag from GoogleSettings to control
whether each time slot in the graph is clickable or not.
Bug: 185308803
Test: make SettingsRoboTests
Change-Id: If8b58dcaa50ad5fb6b447ca5b7146639ee31a9df
2021-05-09 04:46:41 +00:00
Bill Yi
ad89ad031d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia6b625e3577e40db1357ae8e8fa3f7ff41ae6081
2021-05-08 20:19:39 -07:00
Bill Yi
3c692fcca9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib5d8a690731678d03128d9df5cde738ea4e25f2e
2021-05-08 20:10:20 -07:00
ykhung
5b27fd923a
Fix UI flashes issue when entering to the app in the cold start
...
1. fix the chart % info will flash issue by deferring the showing time
until the chart content is ready to show (set default as invisible)
2. fix the category title will flash issue by set the default value as
empty to avoid refresh the title twice in the start time
Bug: 177406865
Test: make SettingsRoboTests
Change-Id: If8f247cf5b01c529bc5e4d18fcf409ba296cc2f4
2021-05-09 01:56:09 +00:00
Treehugger Robot
e704cef070
[automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 7e8f5aca00
am: 8c84477a04
-s ours am: d13156d85a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700137
Change-Id: Ie66323fe2c9c5903b5da7bb152b854ec09a9be08
2021-05-08 23:07:35 +00:00
Xin Li
ff21be103b
[automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: bb6f5b264f
am: c41debcf7f
-s ours am: 06e9e8b3a9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700137
Change-Id: Ib023e63046bc2fc541d2a8754a544e4f17aad2a1
2021-05-08 23:07:26 +00:00
Treehugger Robot
d13156d85a
[automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 7e8f5aca00
am: 8c84477a04
-s ours
...
am skip reason: Merged-In I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700137
Change-Id: Iccb4a95dc5c6863ea96897a392049b6ade646abf
2021-05-08 22:45:15 +00:00
Xin Li
06e9e8b3a9
[automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: bb6f5b264f
am: c41debcf7f
-s ours
...
am skip reason: Merged-In I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700137
Change-Id: I17c63dac08252e5f31b334731e25837ace0ab965
2021-05-08 22:45:12 +00:00
Treehugger Robot
8c84477a04
Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 7e8f5aca00
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700137
Change-Id: I38f2d600c3bd14f3b59de36152a19a4f3a994e9d
2021-05-08 22:01:03 +00:00
Xin Li
c41debcf7f
DO NOT MERGE - Merge RQ2A.210505.003. am: bb6f5b264f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700137
Change-Id: I7325883698b037f16083f2dfa39db84feb21f698
2021-05-08 22:00:38 +00:00
Treehugger Robot
7e8f5aca00
Merge "DO NOT MERGE - Merge RQ2A.210505.003."
2021-05-08 21:38:02 +00:00
Yu-Han Yang
f730edaaac
Merge "Revert "Remove dynamic location settings footer"" into sc-dev
2021-05-08 15:58:10 +00:00
Curtis Belmonte
5ece4babd3
Merge "Revert "Turn on the transition flag"" into sc-dev
2021-05-08 07:38:45 +00:00
Edgar Wang
9da824db15
Merge "Rename PreferenceTheme.SettingsBase to PreferenceTheme.SettingsLib" into sc-dev
2021-05-08 07:29:36 +00:00
Xin Li
bb6f5b264f
DO NOT MERGE - Merge RQ2A.210505.003.
...
Bug: 187544653
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Change-Id: I9a8ebe5b65b682015225c8c1ba9de1984bac7a8d
2021-05-07 23:32:36 -07:00
TreeHugger Robot
67fd37c837
Merge "Controls/Wallet privacy settings" into sc-dev
2021-05-08 02:46:54 +00:00
Xin Li
e49a0d1b4e
[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: 6811428c9c
-s ours am: 1b68f3bfd3
-s ours am: a7d220aad7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700268
Change-Id: I6d1066d472d9b053a19ac80c8dba094d0017a271
2021-05-08 02:37:05 +00:00
Xin Li
a7d220aad7
[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: 6811428c9c
-s ours am: 1b68f3bfd3
-s ours
...
am skip reason: Merged-In Ic91dd36f6de39ef79f1ced90083e1c5c7836c651 with SHA-1 6f3630c393
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700268
Change-Id: I810710363abf4ab5cffa5d3c05095468716d2466
2021-05-08 02:13:47 +00:00
Xin Li
1b68f3bfd3
[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: 6811428c9c
-s ours
...
am skip reason: Merged-In Ic91dd36f6de39ef79f1ced90083e1c5c7836c651 with SHA-1 6f3630c393
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700268
Change-Id: Ifc6c1d5d1192a56c9f33ded1a984e1d4b73157c9
2021-05-08 01:48:55 +00:00
Xin Li
6811428c9c
Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged."
2021-05-08 01:28:18 +00:00
TreeHugger Robot
0c847ab549
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 31e0f46d87
-s ours am: 2332a37557
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469856
Change-Id: I1ac1d36b4343b3d008d21090ee9ac69caae48460
2021-05-07 23:36:59 +00:00
Bill Yi
8d2d27953d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ced13c831
-s ours am: d32b02b4b4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469860
Change-Id: I82d19d77c91088c415ec95a3c9ecf794893eac2a
2021-05-07 23:36:52 +00:00
TreeHugger Robot
fc9217fca5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 2450eeb436
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469644
Change-Id: Ie591b4ce89aaf28b338d6f854f06e13444e5acd7
2021-05-07 23:28:02 +00:00
Bill Yi
bd905bff88
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b5d257a72d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469653
Change-Id: If064a2ddcfb826ccfacfe5b9ec2b96ad89d04384
2021-05-07 23:27:34 +00:00
TreeHugger Robot
2332a37557
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 31e0f46d87
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469856
Change-Id: I3b468892d531003b9ada3fac1ffb0b54866e61e9
2021-05-07 23:19:54 +00:00
Bill Yi
d32b02b4b4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ced13c831
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14469860
Change-Id: I9e49484d667bbe12c60fc975be09cf477e090877
2021-05-07 23:19:11 +00:00
TreeHugger Robot
2450eeb436
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-05-07 23:17:12 +00:00
TreeHugger Robot
31e0f46d87
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-05-07 23:07:35 +00:00
Curtis Belmonte
1e1b259445
Revert "Turn on the transition flag"
...
This reverts commit 1be773da62
.
Reason for revert: b/187517936
Fixes: 187517936
Change-Id: I57d0a7a16bdb76e105b0febd43bdf81521e69e3a
2021-05-07 22:43:05 +00:00
Xin Li
7df22b02ca
DO NOT MERGE - Mark RQ2A.210105.001 as merged.
...
Bug: 180401296
Merged-In: Ic91dd36f6de39ef79f1ced90083e1c5c7836c651
Change-Id: I82a9266b107ebaf80b897deb8066e6976642644b
2021-05-07 14:32:28 -07:00
TreeHugger Robot
0842cc9adc
Merge "Prevent multi-sensor enrollment from doing nothing." into sc-dev
2021-05-07 20:25:35 +00:00
Julia Reynolds
540ad99d88
Fix work profile setting appearing too often
...
That is, when the user didn't have work profile
Test: robotests, manual
Fixes: 187520760
Change-Id: I9394359a6bc278d58ef13b30f8ce99cbaa595c25
2021-05-07 15:02:54 -04:00
Matt Pietal
a13e30c11a
Controls/Wallet privacy settings
...
Addressing feedback from ag/14353975
Fixes: 185597511
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I4de5b7f94d4be44820b1fa463d97f4f098f64bff
2021-05-07 14:54:54 -04:00
Julia Reynolds
2fe3273f3a
Handle NLS metadata when provided as strings
...
Test: atest
Bug: 181175697
Change-Id: I40d935ffb7c1fb9f978160d28297da84412501fb
2021-05-07 18:37:10 +00:00
ykhung
bf5dd80d4f
Fix corner case IndexOutOfBound exception for null content
...
Bug: 184807417
Test: make SettingsRoboTests
Change-Id: Icf35b4084bcea62c2879a100d1b35b5448d8276d
2021-05-08 01:15:21 +08:00
Bill Yi
5ced13c831
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I77632e0a713314bd782dfaa3256e5181078ef332
2021-05-07 16:57:00 +00:00
Bill Yi
51221d77f7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I830341ac6e908b358eb878baa11e62ebbf4fcfd9
2021-05-07 16:53:34 +00:00
Bill Yi
b5d257a72d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib60837c4552e1516120c5c6f988fc4b103788f4a
2021-05-07 16:50:54 +00:00
Bill Yi
3bc6bf4361
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I33d29fb6c9a4362b326a72b354aa44a219b813ba
2021-05-07 16:47:30 +00:00
Alex Stetson
413893244d
Merge "Use shared model for non-system overlay toggle" into sc-dev
2021-05-07 14:08:52 +00:00
Syaoran Kuo
87cc2e19e5
Add more log for debugging resource id issue.
...
Bug: 187485845
Test: atest SettingsComponentTests
Change-Id: I6268809eca172b0b4aa9f1a252e0d519ad758083
2021-05-07 18:49:26 +08:00
Edgar Wang
b54caf63f2
Rename PreferenceTheme.SettingsBase to PreferenceTheme.SettingsLib
...
Bug: 182179573
Test: robotest & manual
Change-Id: Iadb51c8601b49294eef2f6fb13369576e62e5b7a
2021-05-07 17:41:02 +08:00
TreeHugger Robot
180051cf05
Merge "Refine the interpolation rule and clip the usage time data" into sc-dev
2021-05-07 09:35:35 +00:00
TreeHugger Robot
ac1b7661ad
Merge "Turn on the transition flag" into sc-dev
2021-05-07 09:01:00 +00:00
Yanting Yang
c37abc9edb
Merge "Add summary back to the homepage" into sc-dev
2021-05-07 09:00:32 +00:00
ykhung
4280a7f897
Refine the interpolation rule and clip the usage time data
...
Bug: 184807417
Test: make SettingsRoboTests
Change-Id: I6c115beed34abd393e5c615cc59d3c4c323dfa0b
2021-05-07 16:36:56 +08:00
Syaoran Kuo
7dd05a8c05
Merge "Remove wifi related test." into sc-dev
2021-05-07 07:54:25 +00:00
Syaoran Kuo
bc1e5321ab
Remove wifi related test.
...
To add these case back, add a success case to avoid empty test error.
Bug: 186372528
Test: atest SettingsComponentTest
Change-Id: I6d973a244338f67e3d35e9657d1d46eba8ba4501
2021-05-07 13:44:08 +08:00
Yi-Ling Chuang
1be773da62
Turn on the transition flag
...
Test: robotests
Bug: 186701900
Change-Id: I09c821e17fca88ee532f6535031a52c4c832a1e8
2021-05-07 13:21:42 +08:00
TreeHugger Robot
db624992ed
Merge "Wallet/controls - Migrate existing settings" into sc-dev
2021-05-07 05:05:34 +00:00