Bill Yi
b702508730
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c96329e0ea
-s ours am: 3a84da72b6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24947164
Change-Id: Ifad7e44d1f7fa6439b07ec778f7e29ab58e8aa95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-05 14:17:21 +00:00
Bill Yi
6cbee3165b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 074f4414b9
-s ours am: 6b55c4fd10
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24946783
Change-Id: I749108664c22521fefbbe55ce5cc810505058f93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-05 14:17:03 +00:00
Bill Yi
bff9733180
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ff577eb181
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24947164
Change-Id: Ic8bf0a1d16cf28553df8d56f7cb2192f0dc9c576
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-05 13:32:50 +00:00
Bill Yi
3a84da72b6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c96329e0ea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24947164
Change-Id: I7bbe29a34381ac1d3df282c062467438eec51d89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-05 13:32:42 +00:00
Bill Yi
6b55c4fd10
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 074f4414b9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24946783
Change-Id: I6465c16b725848f7dbb6e2f79e79626d6e23ed5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-05 13:32:23 +00:00
Bill Yi
ff577eb181
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-10-05 12:57:34 +00:00
Bill Yi
a223c7644e
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-10-05 05:07:58 +00:00
Bill Yi
074f4414b9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I28c0c489fdde63242fd894d923e53a2a412216df
2023-10-04 17:51:12 -07:00
Bill Yi
c96329e0ea
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8267aa212eafd5182fc64ab90f314f4b91cfac64
2023-10-04 17:49:43 -07:00
Gil Cukierman
18403f2adc
Merge changes from topic "cukie-300248708-hide2gremoval" into main
...
* changes:
Stop honoring CarrierConfigManager.KEY_HIDE_ENABLE_2G
Add feature flag for removal of KEY_HIDE_ENABLE_2G
2023-10-04 20:12:53 +00:00
Bill Yi
a24b9e3ef2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 96e0207271
-s ours am: dd6debb22f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24934926
Change-Id: Ib539a286744568c8c4f410b8c413e13f3ecfa91e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 19:24:01 +00:00
Bill Yi
de13a0a43a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ffa2b27001
-s ours am: c3e24ca42c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24934926
Change-Id: Ica4c897be0a4b703543062ff1982db99240e07ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 19:23:55 +00:00
Bill Yi
a2cb242ee2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7ca5a82a184eabd298e8caa7ba4a22c8fb595795
2023-10-04 12:09:38 -07:00
Bill Yi
dd6debb22f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 96e0207271
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24934926
Change-Id: I8c2343a538b7b1b306a903ee6fb7af687645b134
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 19:09:37 +00:00
Bill Yi
c3e24ca42c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ffa2b27001
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24934926
Change-Id: I156313ba2806839cf54b910464c1a45a8a00086d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 19:09:21 +00:00
Graciela Putri
23d3a3ca92
Merge "Add controller to Advanced category in Apps page" into udc-qpr-dev am: 963869ecda
am: 641b310890
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24937325
Change-Id: I0ccca7ab6beed64a51efa56e7a7dd4a26adbce94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 18:48:33 +00:00
Bill Yi
96e0207271
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-10-04 18:44:46 +00:00
Graciela Putri
641b310890
Merge "Add controller to Advanced category in Apps page" into udc-qpr-dev am: 963869ecda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24937325
Change-Id: I39d4b0e6ffa0f071d97e4dd9b2c36c1ed22c3a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 18:16:08 +00:00
Joy Babafemi
45c932f9a6
Merge "Set ACTION_REQUEST_SET_AUTOFILL_SERVICE to route to DefaultCombinedActivity" into main
2023-10-04 18:12:21 +00:00
Graciela Putri
963869ecda
Merge "Add controller to Advanced category in Apps page" into udc-qpr-dev
2023-10-04 17:54:24 +00:00
Hakjun Choi
5e8e07ce7c
Merge "Changed API name from 'isNtn()' to 'isOnlyNonTerrestrialNetwork()' and updated related methods and variables according to API Council recommendations." into main
2023-10-04 17:35:54 +00:00
Matt Pietal
9695477373
Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513
am: 705507d68f
am: 8d4d73f152
am: 9e233f3284
am: 84076896f6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870
Change-Id: I361b6926ca06f22211048ad5738b58d3bf21c473
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 16:57:42 +00:00
Matt Pietal
84076896f6
Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513
am: 705507d68f
am: 8d4d73f152
am: 9e233f3284
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870
Change-Id: I91198eb53fda60d1f5801e5fa8512be2800304e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 16:26:27 +00:00
Matt Pietal
9e233f3284
Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513
am: 705507d68f
am: 8d4d73f152
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870
Change-Id: I9a436c40d689ad4db65a9ff9def5ea04c8115894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 15:55:50 +00:00
Matt Pietal
8d4d73f152
Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513
am: 705507d68f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870
Change-Id: Icf1ee16bfff74c784b67417dec19f56caf2fd6a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 15:23:35 +00:00
Matt Pietal
705507d68f
Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870
Change-Id: Ia1bfae20044369b8a8e463e21a2393cf9b6e9250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 14:54:22 +00:00
Matt Pietal
3be411d513
Merge "Add support to configure double line clock in lockscreen [2/2]" into main
2023-10-04 14:25:38 +00:00
Graciela Wissen Putri
7bc951d205
Add controller to Advanced category in Apps page
...
Settings > Apps > Advanced (category)
Fix: 303309762
Test: Manually by disabling aspect ratio settings
Change-Id: I262fc954ad8d5ad65b24cc0966b8e5392cea65e5
2023-10-04 14:12:03 +00:00
Graciela Putri
f861f64769
Merge "Update aspect ratio summary strings" into udc-qpr-dev am: 242bde10c8
am: fafb4bf5ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24867213
Change-Id: I169898d72e09964a762726782acfe57906468608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 14:03:45 +00:00
Graciela Putri
74849c1458
Merge "Add warning text to Aspect ratio app info header" into udc-qpr-dev am: b5b8bd54a0
am: 112b5765e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24904381
Change-Id: I03e18dc136080e77054f42452b4ad928fd2a8a6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 14:03:32 +00:00
Gil Cukierman
761fd612c4
Stop honoring CarrierConfigManager.KEY_HIDE_ENABLE_2G
...
KEY_HIDE_ENABLE_2G is soft removed in Android API level 35
because it hides a security feature. This patch
introduces simplified logic that ignores the
carrier config value. The new behavior is behind a feature flag.
This patch also includes some cleanup.
1. It removes an unneeded check for null carrier config
2. It removes test logic that set the value of KEY_HIDE_ENABLE_2G
in places where it had no impact on the test.
Bug: 300248708
Test: atest Enable2gPreferenceControllerTest
Change-Id: I892d115d1ae173d2f3cd69e8f8b97bc5bfa7c67b
2023-10-04 13:59:55 +00:00
Graciela Putri
fafb4bf5ba
Merge "Update aspect ratio summary strings" into udc-qpr-dev am: 242bde10c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24867213
Change-Id: I4e6ef486029a3f70cf7c267320c200c19384787a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 13:32:50 +00:00
Graciela Putri
112b5765e0
Merge "Add warning text to Aspect ratio app info header" into udc-qpr-dev am: b5b8bd54a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24904381
Change-Id: I6ad5d7d6d9972dca2e42462440648e90f09b28e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 13:32:33 +00:00
Graciela Putri
242bde10c8
Merge "Update aspect ratio summary strings" into udc-qpr-dev
2023-10-04 13:04:36 +00:00
Graciela Putri
b5b8bd54a0
Merge "Add warning text to Aspect ratio app info header" into udc-qpr-dev
2023-10-04 13:04:26 +00:00
Hakjun Choi
aa911b312b
Changed API name from 'isNtn()' to 'isOnlyNonTerrestrialNetwork()' and updated related methods and variables according to API Council recommendations.
...
isNtn() -> isOnlyNonTerrestrialNetwork()
No changes in logic.
Bug: 301620244
Test: PreferredSimDialogFragmentTest SimListDialogFragmentTest
Change-Id: I2b64262ed4d9f81f830f76b10a2174ad1e1d649f
2023-10-04 08:23:30 +00:00
Bill Yi
ffa2b27001
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia3a5770648f70f431777132ab3b8ea1bcfb5992b
2023-10-03 22:40:57 -07:00
Treehugger Robot
d02ebcc3bf
Merge "Update .gitignore
list" into main
2023-10-03 20:04:55 +00:00
Treehugger Robot
edc4e3c5e8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: b1c087f6ea
-s ours am: a05cf53404
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24927781
Change-Id: If12c2e85db335cc265a6e093d6b0f1d0fff8b0a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 18:17:59 +00:00
Bill Yi
aecd7f8dd0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f060312e5b
-s ours am: b290497a03
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24927781
Change-Id: Ic4e1253b1eaf50c5a2f9ce502ef1faa06c838753
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 18:17:52 +00:00
Treehugger Robot
a05cf53404
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: b1c087f6ea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24927781
Change-Id: Ie08d6d71c54e1b4d3e8cf7e889f29fea0df69b36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 18:02:34 +00:00
Bill Yi
b290497a03
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f060312e5b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24927781
Change-Id: I7a79e434084e4fa39ee559b5b3424972dc5ef1c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 18:02:21 +00:00
Treehugger Robot
3772065d38
Merge "Fix code inspection test for slice controllers" into main
2023-10-03 17:44:42 +00:00
Joseph Vincent
2c95736e1a
Merge "Hide settings app for private profile from launcher." into main
2023-10-03 17:38:13 +00:00
Treehugger Robot
b1c087f6ea
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-10-03 17:27:10 +00:00
Becca Hughes
e768897435
Merge "Update settings dialog to use new string" into main
2023-10-03 15:59:08 +00:00
Graciela Wissen Putri
e08d0f88d3
Add warning text to Aspect ratio app info header
...
Settings > Apps > App info > Aspect ratio
Fix: 301440671
Test: Manual
Change-Id: I1d24a38c37cfb95e5711308c96f1fc8da91d5e53
2023-10-03 14:34:18 +00:00
josephpv
1e5c7aea0b
Hide settings app for private profile from launcher.
...
Bug: 296994499
Test: Manually verifed that settings app is not shown for Private Profile from launcher.
Change-Id: Ie8c328eacbd0f42772562f10026ced78d095956f
2023-10-03 11:33:54 +00:00
Jason Chiu
1926318cdc
Merge "Enable the suggesiton test on disabled components" into main
2023-10-03 09:29:43 +00:00
Treehugger Robot
4cc92858f4
Merge "Config battery info page(1/2)" into main
2023-10-03 08:53:01 +00:00