Jason Parks
bd6af1a484
Fix positive button when the click listener is not null.
...
Fixes changes made in ag/20171885:
https://screenshot.googleplex.com/4WeHHjy75A96wgf
https://screenshot.googleplex.com/3oQcLiY6AgYurB9
Bug: 252967902
Test: manual
Change-Id: I07985d540347c7b56982a90d386a5f93721344ea
2023-08-01 14:28:35 +00:00
Treehugger Robot
363d4b26b4
Merge "Implement the battery tips cards.(1/2)" into main
2023-08-01 12:39:09 +00:00
SongFerng Wang
f15c4c2fe5
Merge "Fix testcase failed" into udc-qpr-dev am: b2c60799af am: b93774ab40
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24196278
Change-Id: If190cc993cf44254658d234289ad7b57dd8445dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-01 12:20:38 +00:00
SongFerng Wang
b93774ab40
Merge "Fix testcase failed" into udc-qpr-dev am: b2c60799af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24196278
Change-Id: I017d432a9abe3f141436f185c156838b393d3d58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-01 11:39:35 +00:00
SongFerng Wang
b2c60799af
Merge "Fix testcase failed" into udc-qpr-dev
2023-08-01 10:55:39 +00:00
mxyyiyi
c4ac74872b
Implement the battery tips cards.(1/2)
...
Bug: 291689623
Test: Manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3ff665bd3292986030fdd8a3689b35bbf6f5a615 )
Change-Id: I4443cdb21b3ba30900fc2f6fcc21c4c56dc1293f
2023-08-01 10:49:01 +00:00
Quang Luong
d170deeed9
Merge "Fix duplicate network request entry during connection" into udc-qpr-dev am: af1715e4a0 am: f55e922301
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24196268
Change-Id: I58a9aca5402c06e36711432f67f72da38c7c2287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-31 09:57:35 +00:00
Quang Luong
f55e922301
Merge "Fix duplicate network request entry during connection" into udc-qpr-dev am: af1715e4a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24196268
Change-Id: Ie52f8c49a6aaaae0c6932083e7efeba4121298a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-31 09:16:58 +00:00
Quang Luong
af1715e4a0
Merge "Fix duplicate network request entry during connection" into udc-qpr-dev
2023-07-31 08:34:49 +00:00
Quang Anh Luong
ae485a6774
Fix duplicate network request entry during connection
...
When connecting to a network request, a new NetworkRequestEntry is
created by WifiPickerTracker alongside the unsaved regular network,
which results in two of the same network appearing during the L2
connection phase. To fix this, filter out any disconnected networks that
have the same SSID and security type as the currently connecting
network.
Bug: 292064115
Test: manually verify no duplicate network appears when connecting to
network request
Change-Id: I3d6abb0d0a1e4eeab1b8fa396660851ba090c611
2023-07-31 14:51:07 +09:00
Graciela Putri
677c476a2c
Merge "[4/n] Add fullscreen option in user aspect ratio settings" into udc-qpr-dev am: 1f1c2a7db9 am: c97131b90b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24213103
Change-Id: I079c6d10edbba5635e095a29067f21e22945bf85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-28 19:32:58 +00:00
Graciela Putri
9cba6cf4b9
Merge "[3/n] Add aspect ratio app info page" into udc-qpr-dev am: 386b02e906 am: e5e57a8d9e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23819685
Change-Id: I0a880774214c804f2c22fb7aa876c39349e71b62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-28 19:32:46 +00:00
Treehugger Robot
a3d930a7c0
Merge "Define the anomaly proto for anomaly detection project" into udc-qpr-dev am: a9a8c4ed19 am: 4b038ad59b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24239143
Change-Id: I0a1edc9535e3dff85f00daa6df7dfda73746a42c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-28 19:30:09 +00:00
YK Hung
7fe2a92cf3
Merge "Imple call method to detect settings anomaly(1/2)" into udc-qpr-dev am: 1a4979753e am: 716c50d296
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24151397
Change-Id: I5bcfa9f799dd16a881875ebf45c129d683092ba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-28 19:27:25 +00:00
YK Hung
d8f0731f60
Merge "Fix inconsistent connected without charging state in the Settings" into udc-qpr-dev am: 296322ad47 am: 4b1d5b8e8e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24219784
Change-Id: I11be4dc1c925f0100183d842fe2d2b3a13ae2741
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-28 19:21:21 +00:00
Treehugger Robot
a9f6161365
Merge "Update WhenToDreamPicker to unique page id" into udc-qpr-dev am: fd956769c1 am: 26579447e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24199981
Change-Id: I8850c40d902895e56b73013a860b89dc58f0e280
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-28 19:21:05 +00:00
Graciela Putri
c97131b90b
Merge "[4/n] Add fullscreen option in user aspect ratio settings" into udc-qpr-dev am: 1f1c2a7db9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24213103
Change-Id: Ie0f2338c707cc45dd1cbe57931102bf22df4184a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-28 18:24:45 +00:00
Graciela Putri
e5e57a8d9e
Merge "[3/n] Add aspect ratio app info page" into udc-qpr-dev am: 386b02e906
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23819685
Change-Id: I5f187502bc04d21629bdc1b434f74497f9def14a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-28 18:21:45 +00:00
Treehugger Robot
4b038ad59b
Merge "Define the anomaly proto for anomaly detection project" into udc-qpr-dev am: a9a8c4ed19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24239143
Change-Id: Ifaf16ef9b3ccfbc3c0e8bb755c91208f5c22832e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-28 18:16:23 +00:00
YK Hung
716c50d296
Merge "Imple call method to detect settings anomaly(1/2)" into udc-qpr-dev am: 1a4979753e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24151397
Change-Id: I6ef35baa3a7df6b28fb5fe7deb0085a4e7a59a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-28 18:14:31 +00:00
YK Hung
4b1d5b8e8e
Merge "Fix inconsistent connected without charging state in the Settings" into udc-qpr-dev am: 296322ad47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24219784
Change-Id: I866b3a26f917feb79371cb4d9ff5a086cdb16c6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-28 18:08:22 +00:00
Treehugger Robot
26579447e5
Merge "Update WhenToDreamPicker to unique page id" into udc-qpr-dev am: fd956769c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24199981
Change-Id: Ica5220033baeda6812f4cbbe2f2ef442d0bd1645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-28 18:05:34 +00:00
Graciela Putri
1f1c2a7db9
Merge "[4/n] Add fullscreen option in user aspect ratio settings" into udc-qpr-dev
2023-07-28 13:15:52 +00:00
Graciela Putri
386b02e906
Merge "[3/n] Add aspect ratio app info page" into udc-qpr-dev
2023-07-28 13:14:03 +00:00
Treehugger Robot
a9a8c4ed19
Merge "Define the anomaly proto for anomaly detection project" into udc-qpr-dev
2023-07-28 11:25:39 +00:00
Graciela Wissen Putri
fa945cc808
[4/n] Add fullscreen option in user aspect ratio settings
...
Apps > App Info > Advanced > Aspect ratio
Adds fullscreen option to aspect ratio settings gated by fullscreen
build time and runtime flags. If fullscreen option is disabled, return
app default option.
To enable feature:
adb shell device_config put window_manager
enable_app_compat_user_aspect_ratio_settings true
adb shell am force-stop com.android.settings
Bug: 291900454
Test: All Settings CUJs passed
atest SettingsUnitTests:UserAspectRatioManagerTest
Change-Id: I8f8d0c08ac81f088d6c25e8dfb3550f807f336b6
2023-07-28 10:09:56 +00:00
Graciela Wissen Putri
57984f02d5
[3/n] Add aspect ratio app info page
...
Apps > App Info > Advanced > Aspect ratio
Adds link from aspect ratio app list page to app info. Stops activity if
user chooses a different aspect ratio override.
To enable feature:
adb shell device_config put window_manager enable_app_compat_user_aspect_ratio_settings true
adb shell am force-stop com.android.settings
Bug: 287448187
Test: Manual
All Settings CUJs passed
atest SettingsRoboTests:UserAspectRatioDetailsTest
atest SettingsSpaUnitTests:UserAspectRatioAppPreferenceTest
Change-Id: Id47f291459e62267bf15d629c163dde73d96928a
2023-07-28 09:53:11 +00:00
Zaiyue Xue
77bb2e1ce0
Define the anomaly proto for anomaly detection project
...
Bug: 284893240
Test: presubmit
Change-Id: Ifecc0c952392c58f5c10147d37d3de21a05157b5
2023-07-28 08:35:33 +00:00
YK Hung
1a4979753e
Merge "Imple call method to detect settings anomaly(1/2)" into udc-qpr-dev
2023-07-28 06:43:13 +00:00
YK Hung
296322ad47
Merge "Fix inconsistent connected without charging state in the Settings" into udc-qpr-dev
2023-07-28 05:53:16 +00:00
Wesley Wang
456ca0177c
Imple call method to detect settings anomaly(1/2)
...
Bug: 290893324
Test: make SettingsRoboTests
Change-Id: I6c13f9cee29b723cbd9332fc5d84567be83699c3
2023-07-28 12:32:39 +08:00
Treehugger Robot
fd956769c1
Merge "Update WhenToDreamPicker to unique page id" into udc-qpr-dev
2023-07-28 00:03:28 +00:00
ykhung
0610d2b682
Fix inconsistent connected without charging state in the Settings
...
Make the "connected, not charging" state condition is the same between
Settings main page (in the TopLevelBatteryPreferenceController), and
sub- battery settings page (in the BatteryHeaderPreferenceController).
https://source.corp.google.com/h/googleplex-android/platform/superproject/main/+/main:packages/apps/Settings/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java;l=116-119
Fix: 285204150
Test: make RunSettingsRoboTests -j40
Change-Id: I9b09d521ca71b18e180c779f1a048d1ea4ba161a
2023-07-27 08:21:49 +00:00
Tetiana Meronyk
80ccb0351a
Merge "Fix keyboard showing after dialog dismissed" into udc-qpr-dev am: 98df5bcde2 am: 414c82a2f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24174129
Change-Id: I11b0555e8c4a8db2e5799799fc778732d1fe8ec2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 19:13:31 +00:00
Chris Antol
b95ceb53ba
Merge "Storage Apps Lists SPA migration" into main
2023-07-26 19:00:40 +00:00
Tetiana Meronyk
414c82a2f2
Merge "Fix keyboard showing after dialog dismissed" into udc-qpr-dev am: 98df5bcde2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24174129
Change-Id: I111635a0c02a4a37e4a2f1bfe0ecaf0067a1703f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 18:11:04 +00:00
Tetiana Meronyk
98df5bcde2
Merge "Fix keyboard showing after dialog dismissed" into udc-qpr-dev
2023-07-26 16:47:18 +00:00
SongFerngWang
7cbfe4a10e
Fix testcase failed
...
Bug: 292979979
Test: [Pass]make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDeviceDetailsFragmentTest
Change-Id: If09f4d8ad9c974c2a7f72932d544490655b92cf7
2023-07-26 17:54:20 +08:00
Treehugger Robot
6bcb048b13
Merge "Match APN types with ignoring the case" into main am: 720fd136ed am: 9a44907d9e am: 3d47657593 am: ff78df4b72 am: 4405824d2c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056
Change-Id: I0fc8f2564d064eb4af752d0414ca5437e28ad1fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 08:28:01 +00:00
Treehugger Robot
4405824d2c
Merge "Match APN types with ignoring the case" into main am: 720fd136ed am: 9a44907d9e am: 3d47657593 am: ff78df4b72
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056
Change-Id: Ibd736933f8d0aa649930a1d432611b958d09f292
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 07:19:20 +00:00
Treehugger Robot
ff78df4b72
Merge "Match APN types with ignoring the case" into main am: 720fd136ed am: 9a44907d9e am: 3d47657593
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056
Change-Id: Ie247ffcc6ec787912e50474ec1d51744e6dfc5ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 06:38:47 +00:00
Treehugger Robot
3d47657593
Merge "Match APN types with ignoring the case" into main am: 720fd136ed am: 9a44907d9e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056
Change-Id: If5c4c47dd5d1b05635e8d5102e52a58f5442a9da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 05:31:45 +00:00
Wenhui Yang
d1f2c04069
Merge "Revert "Fix rotate device at face unlock detailed page, device will display"" into udc-d1-dev am: 5239911c6b am: b1feaf710d am: c7240489b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24199674
Change-Id: I04ec7f26fe4ce68d2083b6ce480735af4a22d6b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 05:14:18 +00:00
Treehugger Robot
9a44907d9e
Merge "Match APN types with ignoring the case" into main am: 720fd136ed
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056
Change-Id: I502a8c1c156c26bb68f73afc4a2c5d438aef5dd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 04:47:15 +00:00
Wenhui Yang
c7240489b0
Merge "Revert "Fix rotate device at face unlock detailed page, device will display"" into udc-d1-dev am: 5239911c6b am: b1feaf710d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24199674
Change-Id: I015c68ff6531bb497e50ac2e21a4c11ba37394b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 04:24:43 +00:00
Wenhui Yang
b1feaf710d
Merge "Revert "Fix rotate device at face unlock detailed page, device will display"" into udc-d1-dev am: 5239911c6b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24199674
Change-Id: I1ed93893d170141ac974b2ad64fd2ddb6fe98bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 03:17:46 +00:00
Wenhui Yang
16dc3ed748
Merge "Revert "Fix rotate device at face unlock detailed page, device will display"" into udc-d1-dev am: 5239911c6b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24199674
Change-Id: I7292307f085c72568e2220a718268b487dd73345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 03:16:57 +00:00
Wenhui Yang
5239911c6b
Merge "Revert "Fix rotate device at face unlock detailed page, device will display"" into udc-d1-dev
2023-07-26 02:44:08 +00:00
Cassie Wang
6dbba6d9e3
Merge "Add a config to show the Vpn options menu." into main
2023-07-26 02:23:40 +00:00
Treehugger Robot
4f21f99c6d
Merge "Correct used size of Storage Settings." into udc-d1-dev am: d86ec6652a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23898724
Change-Id: I837d4842ba1031e5270d54af8b29955ead10fb78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 02:07:33 +00:00