Bill Lin
2bd88c6513
Merge "2/ Set Swipe bottom for notification OFF by default" into sc-dev am: 9f046e55b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13856783
Change-Id: I48372fe8a551f218a6636e381b47c823dcb5b5ee
2021-03-23 01:52:06 +00:00
Bill Lin
9f046e55b6
Merge "2/ Set Swipe bottom for notification OFF by default" into sc-dev
2021-03-23 01:22:38 +00:00
Peter Kalauskas
1f160cf666
Merge "Introduce guest user metrics" into sc-dev am: 01f77d8e00
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13935767
Change-Id: Ic9949bb8a11addd5742b856c65ef883f65b71e55
2021-03-22 20:54:11 +00:00
Peter Kalauskas
01f77d8e00
Merge "Introduce guest user metrics" into sc-dev
2021-03-22 20:17:20 +00:00
Sally Yuen
b35c405705
Merge "Reduce RBC test flakiness" into sc-dev am: 1908c5357c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13919447
Change-Id: I6db7640c76e6a9f86674e685b229e9f926115b42
2021-03-22 19:24:25 +00:00
Sally Yuen
1908c5357c
Merge "Reduce RBC test flakiness" into sc-dev
2021-03-22 16:27:49 +00:00
SongFerng Wang
6274dd765b
[automerger skipped] Merge "Change the behavior of notifyAllowedNetworkTypesChanged." am: 3ac3cce15b
am: b3f2e9090a
am: 34c8d35cd3
-s ours am: 2160d5fc4c
-s ours
...
am skip reason: skip tag Change-Id Ic94816415920bf25896ef2b198e228f369039c94 with SHA-1 4ccbe5d785
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641828
Change-Id: I0bcc53c2eb2194521e64eff5148b1d2966424538
2021-03-22 13:53:03 +00:00
SongFerng Wang
2160d5fc4c
[automerger skipped] Merge "Change the behavior of notifyAllowedNetworkTypesChanged." am: 3ac3cce15b
am: b3f2e9090a
am: 34c8d35cd3
-s ours
...
am skip reason: skip tag Change-Id Ic94816415920bf25896ef2b198e228f369039c94 with SHA-1 4ccbe5d785
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641828
Change-Id: I7cd5fd91bf1fe1d784df2d2082274adb32b5e754
2021-03-22 12:29:12 +00:00
Arc Wang
86940142ad
Merge "Only show storage category stats preferences for private volumes" into sc-dev am: e98a5a9932
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13922070
Change-Id: I260581ae4f06bb976f8a9b2b90a25a3c34687998
2021-03-22 11:41:32 +00:00
Arc Wang
e98a5a9932
Merge "Only show storage category stats preferences for private volumes" into sc-dev
2021-03-22 11:06:47 +00:00
Jeremy Goldman
3216c16fe4
Merge "Connect VPN warning help icon with the network & internet page."
2021-03-22 10:13:44 +00:00
Alex Johnston
beff3ecba9
Merge "Allow enabled IMEs to be disabled in Settings" into sc-dev am: caf50d1203
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13676765
Change-Id: I2ccba2a65579c22293f626bba670e1d573ce936b
2021-03-22 09:54:54 +00:00
Alex Johnston
caf50d1203
Merge "Allow enabled IMEs to be disabled in Settings" into sc-dev
2021-03-22 09:26:27 +00:00
Arc Wang
40396d532f
Only show storage category stats preferences for private volumes
...
Hide it because there is no framework API to get storage
category stats of public volumes.
Bug: 174964885
Test: manual
Observe storage settings UI of a USB flash drive.
Change-Id: I7272cd18c186793f86548a87b5cb88bb957ff8d5
2021-03-22 16:28:59 +08:00
Jeremy Goldman
7a68eb3b5e
Connect VPN warning help icon with the network & internet page.
...
New VpnInfoPreference created to control the presence or absence
of the warning icon based on the vpn type.
The VpnPreferenceController type casts the preference based on
whether the provider model is enabled. It also detects legacy vpns
by using the LegacyVpnProfileStore, and comparing VPN profile
usernames with the active VPN config's user.
note: because of the junit test migration, I will add test
files in a separate CL
Screenshot: https://screenshot.googleplex.com/AfGrH8wRusTvbf4
Test: atest -c SettingsUnitTests
Bug: Bug: 176821216
Change-Id: I1aa93be5b90b404d9d9cb9bf47ea76fdc9aad401
2021-03-22 16:26:24 +08:00
SongFerng Wang
552639ac25
Merge "Provider model CarrierItem's subtitle show no connection" into sc-dev am: 826a146c20
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13922069
Change-Id: I26dca0c67486767ad996fe29869e06848f5d8bbe
2021-03-22 08:14:49 +00:00
SongFerng Wang
826a146c20
Merge "Provider model CarrierItem's subtitle show no connection" into sc-dev
2021-03-22 07:45:20 +00:00
SongFerngWang
fb2a1d9db9
Provider model CarrierItem's subtitle show no connection
...
CarrierItem's subtitle show no connection when Wi-Fi
off + no service
Bug: 182433548
Test: atest ProviderModelSliceTest
atest ProviderModelSliceHelperTest
atest NetworkProviderWorkerTest
atest InternetConnectivityPanelTest
make RunSettingsRoboTests -j
Change-Id: I04778cf2b184c0a75dc6999ffde011a9ad5e0690
2021-03-22 14:21:55 +08:00
Tiffany Nguyen
f5ce0c371f
Add new battery settings feature provider. am: 34fb874647
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13915239
Change-Id: Ica2285c297ddc740793bd3a0f0bca08b4f8ecd50
2021-03-22 05:45:46 +00:00
Tiffany Nguyen
34fb874647
Add new battery settings feature provider.
...
Test: No-op class
Bug: 181827863
Change-Id: Iafd4c6128ba63d3c794c076edaaa7638e3de3a42
2021-03-22 05:22:38 +00:00
SongFerng Wang
34c8d35cd3
Merge "Change the behavior of notifyAllowedNetworkTypesChanged." am: 3ac3cce15b
am: b3f2e9090a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641828
Change-Id: I5ba679ca3d2a6f6411dae1ffdc441527508d4763
2021-03-22 03:56:36 +00:00
SongFerng Wang
b3f2e9090a
Merge "Change the behavior of notifyAllowedNetworkTypesChanged." am: 3ac3cce15b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1641828
Change-Id: I74750b2abd69c47b753cd3ee6e69e4ec1bbd7339
2021-03-22 03:12:24 +00:00
Chiachang Wang
9c918200e3
Merge "Remove hidden @Transport usage" into sc-dev am: b2eb0317a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13922079
Change-Id: I3592c4b292dbaf8930438d0f2f2c1d92514035d3
2021-03-22 03:10:16 +00:00
Chiachang Wang
b2eb0317a4
Merge "Remove hidden @Transport usage" into sc-dev
2021-03-22 02:43:59 +00:00
TreeHugger Robot
40cc4f0d4c
Merge "Hide edit menu if network is uneditable" into sc-dev am: 8bdbdf4b91
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13916847
Change-Id: I0f5cb8d9de98a43a027bc1c46994285acf309103
2021-03-22 02:29:47 +00:00
TreeHugger Robot
8bdbdf4b91
Merge "Hide edit menu if network is uneditable" into sc-dev
2021-03-22 01:53:59 +00:00
sallyyuen
b75902f0ba
Reduce RBC test flakiness
...
Read the setting directly, which is successfully being set by the
display manager
Bug: 182099323
Test: forrest
Change-Id: Ia68c8206187995fc5a615d6815f04b8ad01f9312
2021-03-21 18:03:35 +00:00
SongFerng Wang
3ac3cce15b
Merge "Change the behavior of notifyAllowedNetworkTypesChanged."
2021-03-21 16:45:59 +00:00
TreeHugger Robot
9c912b76c6
[automerger skipped] Merge changes from topic "revamp storage settings header" into sc-dev am: d7fff5790a
-s ours
...
am skip reason: skip tag Change-Id I85fa117ff0a49ec7a53ba36580591c7ce7f5a8dc with SHA-1 ba79fe6676
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13715539
Change-Id: Iec1d57d81fc875cfda6b940da4c717ca63ba4311
2021-03-20 16:48:58 +00:00
TreeHugger Robot
d7fff5790a
Merge changes from topic "revamp storage settings header" into sc-dev
...
* changes:
Add option menu in StorageDashboardFragment
Revamp Storage Settings header part
2021-03-20 16:06:50 +00:00
Arc Wang
5fa38bbba2
Merge changes from topic "revamp storage settings header - master"
...
* changes:
Add option menu in StorageDashboardFragment
Revamp Storage Settings header part
2021-03-20 15:31:21 +00:00
Oli Lan
dd091f8bae
Merge "Add a setting to turn clipboard access notifications on/off." into sc-dev am: 228cc886ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13872509
Change-Id: I4f84bdbba6ca340ed140c7033247737c53bd2c76
2021-03-20 12:43:15 +00:00
Oli Lan
228cc886ae
Merge "Add a setting to turn clipboard access notifications on/off." into sc-dev
2021-03-20 12:07:41 +00:00
Peter Kalauskas
10adda880d
Introduce guest user metrics
...
Bug: 169783558
Test: statsd_testdrive -terse 97
Change-Id: I87ce1dba20daadfba68bfff08d9b875872fd07a1
2021-03-19 19:16:23 -07:00
Rubin Xu
3bc1027ce9
Merge "Fix Settings password robo tests." into sc-dev am: 88cd3dae5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13930307
Change-Id: Ibd2b04d640dbdcf5a0d92d4bbdd5fdcf8563dc07
2021-03-19 17:03:58 +00:00
Rubin Xu
88cd3dae5f
Merge "Fix Settings password robo tests." into sc-dev
2021-03-19 16:23:59 +00:00
TreeHugger Robot
7cf3b8e846
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3fe6e67bda
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13922998
Change-Id: I4dca9a5bee9ae29452dd38e320c067c39f9bc9bb
2021-03-19 16:05:30 +00:00
TreeHugger Robot
605178344c
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-03-19 15:37:58 +00:00
TreeHugger Robot
3fe6e67bda
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-03-19 15:32:50 +00:00
Bill Yi
64b1135ccf
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I751f6e9c87a337b5bea1bae51d0e920e4788a7b0
2021-03-19 13:24:39 +00:00
Chiachang Wang
3157509885
Remove hidden @Transport usage
...
NetworkCapabilities is moving to connectivity mainline module.
The hidden methods and constants accesses are not allowed
anymore for Settings, so remove the usage.
Bug: 172183305
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.network.InternetUpdaterTest
Change-Id: I3adec99748451f32698ac19bfeaeb9db43282e3e
2021-03-19 21:03:25 +08:00
Bill Yi
1bb0aa9c07
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If3d9a1fa2a2e441308c16e2e2bee2f32d7484182
2021-03-19 12:57:04 +00:00
Wesley Wang
c6d68b0b12
Merge "Reindexing Settings Battery main page(1/2)" into sc-dev am: 5f225c611b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13922077
Change-Id: I5450f605db779b349155d55430c1c55e9a64250c
2021-03-19 12:43:27 +00:00
TreeHugger Robot
172a3e0251
Merge "Change Magnification Mode Settings UI" into sc-dev am: b4205dc1bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13871567
Change-Id: If528451bc8b46de7a767e9d222d73dc76379ac90
2021-03-19 12:42:08 +00:00
Wesley Wang
5f225c611b
Merge "Reindexing Settings Battery main page(1/2)" into sc-dev
2021-03-19 12:24:50 +00:00
TreeHugger Robot
b4205dc1bd
Merge "Change Magnification Mode Settings UI" into sc-dev
2021-03-19 12:07:17 +00:00
Rubin Xu
d9b740df26
Fix Settings password robo tests.
...
Bug: 151913744
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Change-Id: I7d4f221f4f4c0375f06780f907b769946aebd272
2021-03-19 11:37:25 +00:00
Chiachang Wang
9806f2b3b8
Merge "Modify the value of intent-filter" into sc-dev am: ba3bf73e86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13640540
Change-Id: I0e90eadbae48e59419ebdc8ba8c7972d851da837
2021-03-19 10:47:38 +00:00
Zoey Chen
12496ec5b5
Merge "[Settings] Revert the test for using mPhoneStateListener since the Robolectric test is broken" into sc-dev am: fd52e36de9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13922073
Change-Id: I9bfee4fc90425d4a7f3fb97d94f0ae93d60a86d3
2021-03-19 10:47:25 +00:00
Chiachang Wang
ba3bf73e86
Merge "Modify the value of intent-filter" into sc-dev
2021-03-19 10:40:49 +00:00