TreeHugger Robot
d46ff8c6d3
[automerger skipped] Merge "Disable entry point of output switcher" into rvc-qpr-dev am: faf7a2ad78
am: e71dc5640e
-s ours
...
am skip reason: Change-Id I8906878e1ba769d6940041f17d83b5de6b2a32c0 with SHA-1 b6840ced0d
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12686593
Change-Id: Ia415edfd5886cfaf700f3d0362a52d488c3fe0e0
2020-09-25 09:59:34 +00:00
TreeHugger Robot
61956e9575
[automerger skipped] Merge "Fix output switcher will display previous media session" into rvc-qpr-dev am: 27a7be8a24
am: 0306995bbd
-s ours
...
am skip reason: Change-Id Iebfc7904609e243d5bf0222307bae98a952a3331 with SHA-1 c3fe8d87d6
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12660648
Change-Id: I4ced6e84f7f87c2114296c63fb1bbbf543121bf1
2020-09-25 09:59:10 +00:00
TreeHugger Robot
e71dc5640e
Merge "Disable entry point of output switcher" into rvc-qpr-dev am: faf7a2ad78
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12686593
Change-Id: I981a5fdc4356e41ceaf353b005077765568c6944
2020-09-25 09:31:06 +00:00
TreeHugger Robot
0306995bbd
Merge "Fix output switcher will display previous media session" into rvc-qpr-dev am: 27a7be8a24
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12660648
Change-Id: Ia152136adbbf6a32ee79d08a06ba23a75b948ddc
2020-09-25 09:30:08 +00:00
TreeHugger Robot
faf7a2ad78
Merge "Disable entry point of output switcher" into rvc-qpr-dev
2020-09-25 09:04:36 +00:00
TreeHugger Robot
27a7be8a24
Merge "Fix output switcher will display previous media session" into rvc-qpr-dev
2020-09-25 09:03:50 +00:00
Jason Chiu
c39bf6fd64
[automerger skipped] Merge "[DO NOT MERGE] Fix the blank space on contextual card loading timeout" into rvc-qpr-dev am: e8b34c64f4
am: 21b7365c8f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12533604
Change-Id: I246af174a27b666b28cfa60c80bed4df149be22c
2020-09-25 07:35:25 +00:00
Jason Chiu
248a187c83
[automerger skipped] [DO NOT MERGE] Fix the blank space on contextual card loading timeout am: 4753adfb52
am: cad3c395da
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12533604
Change-Id: I0e0a5483008a645da1f7bfa96907381c67e2e752
2020-09-25 07:35:22 +00:00
Jason Chiu
21b7365c8f
Merge "[DO NOT MERGE] Fix the blank space on contextual card loading timeout" into rvc-qpr-dev am: e8b34c64f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12533604
Change-Id: I7781d02a644e089685c3673619114de334defdc9
2020-09-25 07:18:17 +00:00
Jason Chiu
cad3c395da
[DO NOT MERGE] Fix the blank space on contextual card loading timeout am: 4753adfb52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12533604
Change-Id: I974883a20ebcac94cf72ccbfdd9cab18b23d1690
2020-09-25 07:18:13 +00:00
Pihuei Wang
6a553f7214
Merge "deprecated applyPartnerCustomizationStyle"
2020-09-25 07:06:58 +00:00
Jason Chiu
e8b34c64f4
Merge "[DO NOT MERGE] Fix the blank space on contextual card loading timeout" into rvc-qpr-dev
2020-09-25 07:05:25 +00:00
Hugh Chen
455a0a3186
Disable entry point of output switcher
...
It adds a minimum value if it shows only one available
cast device in the output switcher. Because users can only
change the volume slider or stop control in the output switcher.
It's too hidden to have the user stop cast in the UI.
- This CL will disable the entry point of the output switcher
if there is only one available cast device in the list.
- Update test cases.
Bug: 163095048
Test: make -j42 RunSettingsRoboTests
Change-Id: I8906878e1ba769d6940041f17d83b5de6b2a32c0
Merged-In: I8906878e1ba769d6940041f17d83b5de6b2a32c0
(cherry picked from commit b6840ced0d
)
2020-09-25 03:18:05 +00:00
TreeHugger Robot
bbdb762140
Merge "Disable entry point of output switcher"
2020-09-25 03:13:55 +00:00
Hugh Chen
b6840ced0d
Disable entry point of output switcher
...
It adds a minimum value if it shows only one available
cast device in the output switcher. Because users can only
change the volume slider or stop control in the output switcher.
It's too hidden to have the user stop cast in the UI.
- This CL will disable the entry point of the output switcher
if there is only one available cast device in the list.
- Update test cases.
Bug: 163095048
Test: make -j42 RunSettingsRoboTests
Change-Id: I8906878e1ba769d6940041f17d83b5de6b2a32c0
2020-09-25 02:38:19 +00:00
Bill Yi
505e290f56
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 434bffe9e2
-s ours am: dca9841ca2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12686851
Change-Id: I1a8537c8739b2e608adc27b16aebe90490ae780b
2020-09-24 23:46:23 +00:00
Bill Yi
dca9841ca2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 434bffe9e2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12686851
Change-Id: Ie40fdb3891e27f7c43766ed324422fde6b56e11f
2020-09-24 21:31:25 +00:00
Bill Yi
434bffe9e2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I14b1b7cb5aac3ce15594e0fe470b447e0adf72d6
2020-09-24 12:49:23 -07:00
Jeremy Goldman
29dda35456
Merge "create junit MobileNetworkPreferenceControllerTest."
2020-09-24 14:42:15 +00:00
tim peng
031b364e40
Merge "Set highest priority as default value to Bluetooth codec" am: 594849082b
am: d3a9f472a2
am: f01d260512
am: 3501adcc86
am: 0c786c8321
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1435258
Change-Id: I09e625e2d827d871a660f07b68d3184083baddd7
2020-09-24 13:30:52 +00:00
tim peng
0c786c8321
Merge "Set highest priority as default value to Bluetooth codec" am: 594849082b
am: d3a9f472a2
am: f01d260512
am: 3501adcc86
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1435258
Change-Id: I336bae8e93101a682eea6b51f08c52fb83cc1fc9
2020-09-24 13:21:55 +00:00
TreeHugger Robot
2cb6dd369c
Merge "Guard against flickering of dynamic injection items" into rvc-qpr-dev am: 28b05910d8
am: d2f2f4b13e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12682503
Change-Id: I5fa97bb1a3feac16a64fd74696aa6713b8aeb2aa
2020-09-24 13:21:52 +00:00
tim peng
3501adcc86
Merge "Set highest priority as default value to Bluetooth codec" am: 594849082b
am: d3a9f472a2
am: f01d260512
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1435258
Change-Id: Iaaef48f2af763fb1905596205bedd6b33574750e
2020-09-24 13:05:41 +00:00
TreeHugger Robot
d2f2f4b13e
Merge "Guard against flickering of dynamic injection items" into rvc-qpr-dev am: 28b05910d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12682503
Change-Id: I9bbb023a738a2d58e178b8dc78e19a5d70a28feb
2020-09-24 13:05:22 +00:00
tim peng
f01d260512
Merge "Set highest priority as default value to Bluetooth codec" am: 594849082b
am: d3a9f472a2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1435258
Change-Id: I92cf2605c1e9ee48abedc483a1e461d196b09ef2
2020-09-24 12:39:06 +00:00
TreeHugger Robot
28b05910d8
Merge "Guard against flickering of dynamic injection items" into rvc-qpr-dev
2020-09-24 12:32:20 +00:00
tim peng
d3a9f472a2
Merge "Set highest priority as default value to Bluetooth codec" am: 594849082b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1435258
Change-Id: Ie0aed850c6d0818070d162f4e99c633dc50ef204
2020-09-24 12:02:53 +00:00
tim peng
594849082b
Merge "Set highest priority as default value to Bluetooth codec"
2020-09-24 11:48:51 +00:00
pihuei
59e3fa1a3e
deprecated applyPartnerCustomizationStyle
...
change applyPartnerCustomizationStyle to applyPartnerCustomizationHeavyStyle
Bug: 162723150
Test: manual
Change-Id: Ie13b1e2cd372582236a8244cee5671e0a4b239c6
2020-09-24 19:12:14 +08:00
Jason Chiu
a7d76af933
Guard against flickering of dynamic injection items
...
The summary of injected items may flicker when the data is change from
URI.
Root cause:
If an external app injects an entry to Settings with a dynamic summary,
Settings will observe the summary change via the provideed URI. However,
sometimes when Settings observes the data change and then refreshes the
UI, the data doesn't really change and settings still gets the same
summary. If it happens in a short period, the summary will seem
flickering.
Solution:
Check if the data really changes before refresh UI. Guard both title and
summary.
Fixes: 168309941
Fixes: 166785977
Test: robotest
Change-Id: I137fc317dcfd8919195c10fa8cf7d2559fe1029d
2020-09-24 17:25:48 +08:00
Treehugger Robot
5840576d2c
Merge "Modify Wi-Fi settings owners file" am: 9d4bc729d9
am: 37be325d99
am: b28e9291ec
am: b6aa1db254
am: 058fe396c3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1432713
Change-Id: Ib2308be4afab8ee76b697659389edc07f7435231
2020-09-24 07:28:06 +00:00
Treehugger Robot
058fe396c3
Merge "Modify Wi-Fi settings owners file" am: 9d4bc729d9
am: 37be325d99
am: b28e9291ec
am: b6aa1db254
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1432713
Change-Id: I2eb5a9f13fa3943f6263edbccb138005dfceae67
2020-09-24 07:12:26 +00:00
Treehugger Robot
b6aa1db254
Merge "Modify Wi-Fi settings owners file" am: 9d4bc729d9
am: 37be325d99
am: b28e9291ec
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1432713
Change-Id: I5b73f4ca105ae2584db008e87372dd52f4c2211c
2020-09-24 06:22:23 +00:00
Treehugger Robot
b28e9291ec
Merge "Modify Wi-Fi settings owners file" am: 9d4bc729d9
am: 37be325d99
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1432713
Change-Id: Ic856efa4218938ba4b05d0003fcd266f6e5f1a42
2020-09-24 06:00:40 +00:00
Treehugger Robot
37be325d99
Merge "Modify Wi-Fi settings owners file" am: 9d4bc729d9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1432713
Change-Id: I4ca6e91aeba1cf349255101c0fe1629dc80aeaee
2020-09-24 05:43:13 +00:00
Treehugger Robot
9d4bc729d9
Merge "Modify Wi-Fi settings owners file"
2020-09-24 05:24:27 +00:00
timhypeng
a45a0e8980
Set highest priority as default value to Bluetooth codec
...
-To set highest priority when codec modification comes from development setting
Bug: 165442632
Test: make -j42 RunSettingsRoboTests
Change-Id: I8cfbaa276f3b3e269f4a80e8aae987fbb90f646e
2020-09-24 12:01:01 +08:00
Kevin Chyn
9096f09405
Merge "Update settings together with frameworks/base"
2020-09-23 21:33:35 +00:00
Jeremy Goldman
6620c84d89
create junit MobileNetworkPreferenceControllerTest.
...
1. androidx lifecycle used rather than settingslib wrapper. This allows
us to handle lifecycle events from junit tests as well.
2. Use Mocks or get/set functions rather than robolectric shadows.
MobileNetworkPreferenceControllerTest Diff:
https://diff.googleplex.com/#key=5P0b2G4iYmcz
Test: atest -c MobileNetworkPreferenceControllerTest
Change-Id: If49fe64e5db89a0cdcac7d26329b8c18626a00de
2020-09-23 17:26:14 +00:00
SongFerng Wang
1fa6f33033
Merge "Fix for incorrect display of preferred network type on UI" am: bb25d4841c
am: 59996190cc
am: 14d4ca3cc0
am: f4e466d20c
am: e149bf93b3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1431699
Change-Id: Ifc97dcc346e0457098c12f53fe4c641ce7e3ddc4
2020-09-23 11:30:24 +00:00
SongFerng Wang
e149bf93b3
Merge "Fix for incorrect display of preferred network type on UI" am: bb25d4841c
am: 59996190cc
am: 14d4ca3cc0
am: f4e466d20c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1431699
Change-Id: I12a4d0f18bbffd891e46d3e6bef880cbe74eee34
2020-09-23 11:02:25 +00:00
SongFerng Wang
f4e466d20c
Merge "Fix for incorrect display of preferred network type on UI" am: bb25d4841c
am: 59996190cc
am: 14d4ca3cc0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1431699
Change-Id: Icfb3a897844380990971bab39e19ef1d137e2b53
2020-09-23 10:36:19 +00:00
SongFerng Wang
14d4ca3cc0
Merge "Fix for incorrect display of preferred network type on UI" am: bb25d4841c
am: 59996190cc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1431699
Change-Id: I09f8fc61950baac0f3d987efe84c7c6aaa6c5c13
2020-09-23 09:50:37 +00:00
SongFerng Wang
59996190cc
Merge "Fix for incorrect display of preferred network type on UI" am: bb25d4841c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1431699
Change-Id: I51e37f71b93af68a88c989b29a0230d3c771e26b
2020-09-23 09:10:26 +00:00
Hugh Chen
49fbc8fdb0
Fix output switcher will display previous media session
...
Before this CL, the same request code will cause intent to
be cached. It will cause the output switcher to display the
previous media session.
This CL uses the package name as an unique request code to
fix this issue.
Bug: 169077753
Test: make -j42 RunSettingsRoboTests
Change-Id: Iebfc7904609e243d5bf0222307bae98a952a3331
Merged-In: Iebfc7904609e243d5bf0222307bae98a952a3331
(cherry picked from commit c3fe8d87d6
)
2020-09-23 09:06:10 +00:00
SongFerng Wang
bb25d4841c
Merge "Fix for incorrect display of preferred network type on UI"
2020-09-23 08:49:19 +00:00
Mill Chen
ef39404b28
[automerger skipped] Update battery saver preference key am: 19843031ae
am: a740b65932
-s ours
...
am skip reason: Change-Id Ifb5b0a6786d60d1e67567272610cc3cb078f11a4 with SHA-1 db534d9c4e
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12369339
Change-Id: I1907d8ec0568ae40e5e13749a0840de35acf0a1e
2020-09-23 08:48:10 +00:00
Mill Chen
a740b65932
Update battery saver preference key am: 19843031ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12369339
Change-Id: Ibbedebc554c0566157f28f9fc95e60b3ca9f142f
2020-09-23 08:27:42 +00:00
Wesley.CW Wang
ff0e65c7f7
Add intent extra when launching WallpaperPicker from SUW and Settings
...
- Add extra to these intents to help WallpaperPicker log the launch
source
Bug: 154781896
Test: make SettingsRoboTests
Change-Id: Ifb0ed22ab8ebfbb3c2ad24e9b7bad80007162b6e
2020-09-23 08:06:52 +00:00
Kevin Chyn
8d63b98272
Update settings together with frameworks/base
...
Bug: 169195610
Test: Builds
Change-Id: I2c732dba78eb8c90ef71351562415e06949b31bb
2020-09-23 00:17:56 -07:00