Jason Chiu
4753adfb52
[DO NOT MERGE] Fix the blank space on contextual card loading timeout
...
Root cause:
Sometimes loading contextual cards exceeds 1 second and a timeout
expires. In the past, we used the timeout in order not to update
homepage UI and to avoid screen scrolling. But we've introduced a
mechanism of card space pre-allocation to avoid flickering, so when the
timeout expires, the pre-allocated space will be always blank.
Solution:
Display a card on timeout if the one-card space is pre-allocated.
Fixes: 165886791
Test: robotest
Change-Id: I79b29c5fd6d9c4fe6b53dd4f5eab4cd3a606d76d
2020-09-21 09:47:19 +00:00
Arc Wang
2421aeaa94
Modify Wi-Fi settings owners file
...
Test: N/A.
Change-Id: I03afd97db30b82661f2acd73e4720ab56dd2a5f2
2020-09-21 17:46:03 +08:00
TreeHugger Robot
b243b9a871
Merge "Fix cast volume control bar not work" into rvc-qpr-dev am: 35f15fdbff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12613115
Change-Id: Icd301ba334760add2f730e4a7739fc942528680e
2020-09-21 09:43:49 +00:00
TreeHugger Robot
35f15fdbff
Merge "Fix cast volume control bar not work" into rvc-qpr-dev
2020-09-21 09:23:22 +00:00
Bill Yi
95e4eb59e4
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 94c8353286
am: e7038aa1a3
-s ours am: 657e0f3008
-s ours am: 379ae6c7b8
-s ours
...
am skip reason: Change-Id Ifa4dc400eb8c87c2514a3629288657520476fbfd with SHA-1 ccc406381a
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1430073
Change-Id: Ia188911bc5dffe63a0dc7a576314efecb1b5ba05
2020-09-19 08:01:56 +00:00
Bill Yi
bd90a0d0ff
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 48a84d855f
am: 5d7f242557
-s ours am: d50cfa9b63
-s ours am: 5ff5b3187c
-s ours
...
am skip reason: Change-Id Ifa4dc400eb8c87c2514a3629288657520476fbfd with SHA-1 ccc406381a
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1430073
Change-Id: I07395bbd3c6d17c709d7506df657025e0306adc3
2020-09-19 08:01:02 +00:00
Bill Yi
379ae6c7b8
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 94c8353286
am: e7038aa1a3
-s ours am: 657e0f3008
-s ours
...
am skip reason: Change-Id Ifa4dc400eb8c87c2514a3629288657520476fbfd with SHA-1 ccc406381a
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1430073
Change-Id: I9bffdf82e1739f2d962e3f5b5aa5369a45d0533b
2020-09-19 07:01:22 +00:00
Bill Yi
5ff5b3187c
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 48a84d855f
am: 5d7f242557
-s ours am: d50cfa9b63
-s ours
...
am skip reason: Change-Id Ifa4dc400eb8c87c2514a3629288657520476fbfd with SHA-1 ccc406381a
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1430073
Change-Id: I208048eb3581ea9f380b6e51a8f253106e942ece
2020-09-19 07:00:56 +00:00
TreeHugger Robot
9e25089aee
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4ac22e55fe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12642763
Change-Id: I0c569b44137ea6efbd324021d06e876cf145e61b
2020-09-19 06:25:36 +00:00
Bill Yi
657e0f3008
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 94c8353286
am: e7038aa1a3
-s ours
...
am skip reason: Change-Id Ifa4dc400eb8c87c2514a3629288657520476fbfd with SHA-1 ccc406381a
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1430073
Change-Id: I0201d683bb94a0143cd81fa094993007aa7aad6d
2020-09-19 05:51:28 +00:00
Bill Yi
d50cfa9b63
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 48a84d855f
am: 5d7f242557
-s ours
...
am skip reason: Change-Id Ifa4dc400eb8c87c2514a3629288657520476fbfd with SHA-1 ccc406381a
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1430073
Change-Id: I4463fa09a3cc3cd986293a03a0cd8424cfa20a41
2020-09-19 05:50:34 +00:00
TreeHugger Robot
4ac22e55fe
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-09-19 05:30:57 +00:00
Bill Yi
e7038aa1a3
Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 94c8353286
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1430073
Change-Id: I5307234cb034d2f255307cbcff5ebee1a470d79b
2020-09-19 05:23:11 +00:00
Bill Yi
5d7f242557
Merge mainline-release 6664920 to master - DO NOT MERGE am: 48a84d855f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1430073
Change-Id: I0c107d09b4793a6c16b86a559bebc1a5e92e6e96
2020-09-19 05:22:34 +00:00
Bill Yi
420fdf0a89
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d033b41dc
-s ours am: 46678afcad
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12642138
Change-Id: I6292129f399ab3e9d68176c73be4e98902028b70
2020-09-19 02:27:11 +00:00
Bill Yi
014c717f5c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d033b41dc
-s ours am: 15c3938b96
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12642138
Change-Id: I3613bf5148830f5ce78e4bfd7ce1d286fa23cb16
2020-09-19 02:25:55 +00:00
Bill Yi
46678afcad
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d033b41dc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12642138
Change-Id: I75912992dfd44e72c3e8daf2721be656dbc114b9
2020-09-19 01:49:34 +00:00
Bill Yi
15c3938b96
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d033b41dc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12642138
Change-Id: I8a8a7ada0c4b307ec2088f21037fd7e3696d5684
2020-09-19 01:47:35 +00:00
Bill Yi
6fbc044374
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I05ee4abf21aa97acf518dbb3f7f1fec36a70445c
2020-09-18 17:33:58 -07:00
Bill Yi
1d033b41dc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2553421a8fef1330908cba8afc10013ce6331778
2020-09-18 16:54:49 -07:00
Bill Yi
94c8353286
Merge "Merge mainline-release 6664920 to master - DO NOT MERGE"
2020-09-18 18:47:53 +00:00
Lyn Han
245a6aff75
Update global bubble settings mp4
...
Fixes: 160797563
Test: compiles with updated overflow button icon
Change-Id: Iaa1319bfb6f111b7675f5682258a8d282c27c6ce
2020-09-18 15:08:57 +00:00
Bill Yi
48a84d855f
Merge mainline-release 6664920 to master - DO NOT MERGE
...
Merged-In: Ifa4dc400eb8c87c2514a3629288657520476fbfd
Change-Id: Ib4c9dcb035b9b3e6168309d6d85a310c10e987af
2020-09-17 21:57:11 -07:00
TreeHugger Robot
53fd973ae0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 0be898b31b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12628780
Change-Id: I29e5d492b9ed5b2977c20a9357b7be78cbf513b1
2020-09-17 19:14:06 +00:00
TreeHugger Robot
aa6dc66b38
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 697d2e1fad
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12628378
Change-Id: I5a2d9116459ef22917eb56baae0f8d30eea9f929
2020-09-17 19:12:46 +00:00
Beth Thibodeau
62384851e0
Merge "[DO NOT MERGE] Revert "Allow user to block individual apps from resuming."" into rvc-qpr-dev am: 7ca988cab1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12597795
Change-Id: I8e7a6c1974a2cd78438bcaa79ee003c787133aa9
2020-09-17 19:12:18 +00:00
Beth Thibodeau
51499b2f51
[DO NOT MERGE] Revert "Allow user to block individual apps from resuming." am: 70920bd9ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12597795
Change-Id: I4019b79c2ee725d518ff9c7b6714bda772133d47
2020-09-17 19:12:14 +00:00
TreeHugger Robot
0be898b31b
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-09-17 18:27:09 +00:00
TreeHugger Robot
697d2e1fad
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-09-17 18:20:10 +00:00
Beth Thibodeau
7ca988cab1
Merge "[DO NOT MERGE] Revert "Allow user to block individual apps from resuming."" into rvc-qpr-dev
2020-09-17 17:56:29 +00:00
Beth Thibodeau
70920bd9ff
[DO NOT MERGE] Revert "Allow user to block individual apps from resuming."
...
Revert submission 12392268-cherrypick-mediaappsettings-5fxuo164a2
Bug: 161813143
Reason for revert: no longer want change in QPR
Reverted Changes:
Id3de52419:Allow user to block individual apps from resuming....
I8c85bc937:Allow user to block individual apps from resuming
Change-Id: Ieacef217587476532246b466d680219351bc1657
2020-09-17 17:55:56 +00:00
Bill Yi
17d8f4e53a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic2d693eb2a6060bd39063cd1e1b6a677c555a500
2020-09-17 13:36:15 +00:00
Bill Yi
fc1e97b985
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I808f46f1aaebeccdfd1bf4c0c561925830b97717
2020-09-17 13:01:33 +00:00
Hugh Chen
c3d4b9ace9
Fix cast volume control bar not work
...
Use hashcode as a requestCode id, since the
same requestCode will cause the intent be cached.
Bug: 163095633
Test: make -j42 RunSettingsRoboTests
Change-Id: I2c120f18e24a66aeff5565e952fa4064149ec540
Merged-In: I2c120f18e24a66aeff5565e952fa4064149ec540
(cherry picked from commit 7f3efd4357
)
2020-09-17 08:53:11 +00:00
Jiashen Wang
6538ee53cf
Do not display eSIM activation option if the device is eSIm ignored am: f537a702dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12620221
Change-Id: If39f36992de53f89ce07ef5ff1ddb597800dff58
2020-09-17 02:27:04 +00:00
Jiashen Wang
f537a702dd
Do not display eSIM activation option if the device is eSIm ignored
...
For the device listed as eSIM ignored device, we should always hide the
eSIM activation button even in the developer mode.
Bug: 168266928
Test: Manually tested
Change-Id: Ide3043606de202c5903e520aa550302ff0d103d3
2020-09-16 15:33:51 -07:00
TreeHugger Robot
cdf6fb31f0
Merge "Fix settings crash" into rvc-qpr-dev am: 19af143fe7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12523486
Change-Id: I3de2dab20767ae2e3a132cf611b85b77cbe1fc56
2020-09-16 03:43:32 +00:00
TreeHugger Robot
e8b47df453
Merge "Show just disconnected device on previously connected" into rvc-qpr-dev am: 2b52c56eac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12493714
Change-Id: Ic3f113e706c9fe3f74eb61a2b980df9a271d806a
2020-09-16 03:42:54 +00:00
TreeHugger Robot
19af143fe7
Merge "Fix settings crash" into rvc-qpr-dev
2020-09-16 03:09:38 +00:00
TreeHugger Robot
2b52c56eac
Merge "Show just disconnected device on previously connected" into rvc-qpr-dev
2020-09-16 03:09:30 +00:00
TreeHugger Robot
9dc594b90d
Merge "Show all devices, including connected ones, into "Previously connected" page" into rvc-qpr-dev am: a21c26df38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12493713
Change-Id: I2bd0c2be1c9d9856f568df93339d526d1fed145a
2020-09-15 10:21:23 +00:00
Arc Wang
84ac360560
Merge "[DO NOT MERGE][Wi-Fi] Fix fatal exception in WifiConnectionPreferenceController" into rvc-qpr-dev am: b576c802fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12584109
Change-Id: I1831acc1db85fbf374a927897d0a57d29f43c2f0
2020-09-15 10:20:55 +00:00
Arc Wang
3782ff7edd
[DO NOT MERGE][Wi-Fi] Fix fatal exception in WifiConnectionPreferenceController am: d785fbab68
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12584109
Change-Id: I862192e840cbf25f8fe713b243fd17a054906c16
2020-09-15 10:20:53 +00:00
TreeHugger Robot
a21c26df38
Merge "Show all devices, including connected ones, into "Previously connected" page" into rvc-qpr-dev
2020-09-15 09:54:08 +00:00
Bonian Chen
5d1da01e80
Merge "[Testing] Remove Robolectric import and use AndroidJUnit4 instead in MobileDataEnabledListenerTest" am: f5fa52884b
am: 49936c5eb5
am: ccc406381a
am: 3864e2f218
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427810
Change-Id: I3223c2748176ebd6624ce3b7f66dbd76c4b0bd88
2020-09-15 09:34:01 +00:00
Arc Wang
b576c802fd
Merge "[DO NOT MERGE][Wi-Fi] Fix fatal exception in WifiConnectionPreferenceController" into rvc-qpr-dev
2020-09-15 09:30:12 +00:00
Bonian Chen
3864e2f218
Merge "[Testing] Remove Robolectric import and use AndroidJUnit4 instead in MobileDataEnabledListenerTest" am: f5fa52884b
am: 49936c5eb5
am: ccc406381a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427810
Change-Id: I65499d47dfa6b2905f65bcf6729f4f5e2ab02af9
2020-09-15 09:09:28 +00:00
TreeHugger Robot
bf4a795692
Merge "Display "pair new" only when local output device is available." into rvc-qpr-dev am: eacabd567f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12493712
Change-Id: I1ef85337bfd34f3a78e1d1191d9fd6307d2f6f14
2020-09-15 08:41:20 +00:00
TreeHugger Robot
2dfac98e04
Merge "Display "see all" option when bluetooth is off" into rvc-qpr-dev am: c21ad3649e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12392571
Change-Id: Idc4c231882c8868bf6970f19f5bc73b391302ef1
2020-09-15 08:40:43 +00:00
Bonian Chen
ccc406381a
Merge "[Testing] Remove Robolectric import and use AndroidJUnit4 instead in MobileDataEnabledListenerTest" am: f5fa52884b
am: 49936c5eb5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427810
Change-Id: Ifa4dc400eb8c87c2514a3629288657520476fbfd
2020-09-15 08:40:08 +00:00