Sunny Shao
9669cf5db9
Fix theme differences between left/right pane problem
...
- Add a callback class to monitor the split behavior of the activity
embedding and update UI if necessary.
Fixes: 279516059
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.homepage.SettingsHomepageActivity
Change-Id: I32e86265638684ddde067539a0f493be4c04afae
2023-08-28 20:43:46 +08:00
Treehugger Robot
84c4ec936a
Merge "Fixed battery tips card UI." into udc-qpr-dev am: 646c676ff6
am: 7f3062b52e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24457990
Change-Id: I3b925eba90c8413a8531f50407e03637bf756f71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 18:18:50 +00:00
Treehugger Robot
998d8d13df
[automerger skipped] Merge "Add UI metrics logging for battery tips card." into udc-qpr-dev am: 40fa6ebbd8
am: 498b6493d1
-s ours
...
am skip reason: Merged-In I925e4d887c3435239aed0aa0fde7cda2c3a95b3c with SHA-1 f838f5d5fa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24484970
Change-Id: I9c0e07413ced39b6c95138f6731e12f7f6f2d350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 18:18:34 +00:00
Treehugger Robot
40c8611c71
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 4b59201c53
-s ours am: cf0b06e047
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24530147
Change-Id: Ie323a7a365c659020bf48b6375d316f9cf9e4f24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 18:14:58 +00:00
Bill Yi
accfdc3b1b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 974293cb11
-s ours am: cd4817bdde
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24530147
Change-Id: I822b60a6fd6146f4a8a9752c8c6343a5695c9aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 18:14:47 +00:00
Treehugger Robot
2ecb75fa8c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ecddb596e1
-s ours am: a02253459b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24529665
Change-Id: Ic39b1e004b42f16c26351458fe5a93390197693a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 18:14:34 +00:00
Bill Yi
0b5d8565a0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 44369ed065
-s ours am: 8c215bf85f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24529665
Change-Id: Id1b3cd602f378b82e8f34c38373bd5fcbe02bbe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 18:14:17 +00:00
Bill Yi
c8dc6febc6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 582bd62c87
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24529885
Change-Id: I868e4c26106ddccceb8a3e10e961c5e2ef2d18f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 17:24:27 +00:00
Bill Yi
94deed1ed6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fac65474fc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24529885
Change-Id: I85b76a936e538a43fc2468f04a7eea3a55e09db4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 17:24:16 +00:00
Bill Yi
e39de2cc99
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b1e1cd32da
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24529884
Change-Id: Ide1151d8f9a39347626b00caeca8cb7a24802b5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 17:12:56 +00:00
Bill Yi
5e86c208a8
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-08-25 16:37:00 +00:00
Bill Yi
51152c5462
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-08-25 16:37:00 +00:00
Bill Yi
582bd62c87
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2023-08-25 13:38:02 +00:00
Zaiyue Xue
068adaf153
Enable i18n for battery tips card and fix b/297036263.
...
Bug: 291689623
Bug: 297036263
Fix: 297036263
Test: manual
Change-Id: I41aff99c73ace995ef9dfa8f1dc28024cd12d236
2023-08-25 20:40:45 +08:00
mxyyiyi
d9360ec326
Impl dismiss action in battery tips cards.
...
- Use SharedPreferences to record and filter the already dimissed anomaly.
Bug: 291689623
Test: manual
Change-Id: I4fd4a39066591a4a201857f9586b6595b7d5c43b
2023-08-25 20:17:31 +08:00
mxyyiyi
c68e038508
Fixed battery tips card UI.
...
- Add highlight effect after navigate to new page.
- Update text format inside button.
Screenshot: https://screenshot.googleplex.com/8ib66dWzn6PZmhy
Fix: 296001546
Fix: 296339767
Bug: 291689623
Test: manual
Change-Id: Ic789e5feb684a109582477c553963a9a3f9936b8
2023-08-25 20:17:04 +08:00
Allen Su
540647741f
Merge "Migrate LocaleNotification to main trunk" into main
2023-08-25 09:39:24 +00:00
Treehugger Robot
7f3062b52e
Merge "Fixed battery tips card UI." into udc-qpr-dev am: 646c676ff6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24457990
Change-Id: I410f00abe1785cca6a45ac63abd3e89a818c2a10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 09:36:12 +00:00
Treehugger Robot
498b6493d1
Merge "Add UI metrics logging for battery tips card." into udc-qpr-dev am: 40fa6ebbd8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24484970
Change-Id: I470efd81e3be7ece7226d7f2300352d45cf3f1a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 09:35:32 +00:00
Treehugger Robot
646c676ff6
Merge "Fixed battery tips card UI." into udc-qpr-dev
2023-08-25 08:31:44 +00:00
Treehugger Robot
40fa6ebbd8
Merge "Add UI metrics logging for battery tips card." into udc-qpr-dev
2023-08-25 08:31:07 +00:00
Treehugger Robot
cf0b06e047
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 4b59201c53
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24530147
Change-Id: Iec0b29e8bb61a812d1863be393d16038ab1ad137
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 08:10:09 +00:00
Bill Yi
cd4817bdde
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 974293cb11
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24530147
Change-Id: Ia92102a2672c830dbc201d0f67935e97f2ef422f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 08:10:04 +00:00
Treehugger Robot
a02253459b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ecddb596e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24529665
Change-Id: Ia1cf94309ae3b67d7868889a5ae4922f1d437051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 08:09:55 +00:00
Bill Yi
8c215bf85f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 44369ed065
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24529665
Change-Id: I3532130b34f2e0f98b3d335a85a3b14c01360c34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 08:09:29 +00:00
Treehugger Robot
4b59201c53
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-08-25 07:27:08 +00:00
Treehugger Robot
ecddb596e1
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-08-25 07:27:08 +00:00
Allen Su
9eb3b3db7c
[automerger skipped] Merge "Rollback language source metrics" into udc-qpr-dev am: 23a5af27e3
am: 9d7b1f86d8
-s ours
...
am skip reason: Merged-In I9b1239a6e98f074456def43cdbb7deb0bcc1cc3c with SHA-1 8e7c93ec57
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24527327
Change-Id: Ia4370f20bc35eaac038492bc00154f686ca611e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 06:45:59 +00:00
Allen Su
9d7b1f86d8
Merge "Rollback language source metrics" into udc-qpr-dev am: 23a5af27e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24527327
Change-Id: I85452d98d3a96ea452c1a803af450cf440c6e3f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 06:03:43 +00:00
Allen Su
23a5af27e3
Merge "Rollback language source metrics" into udc-qpr-dev
2023-08-25 05:17:14 +00:00
Allen Su
f22d5e98c0
Migrate LocaleNotification to main trunk
...
Bug: 248514263
Test: make RunSettingsRoboTests -j128 ROBOTEST_FILTER=AppLocalePickerActivityTest LocaleListEditorTest LocaleNotificationDataManagerTest NotificationCancelReceiverTest NotificationControllerTest
Change-Id: Iac7ffd493485be8ebb10ae63e5ca4ea7a57c8c78
2023-08-25 05:14:56 +00:00
Treehugger Robot
bf64f92c1e
Merge "[Refional Preference] Fix test case fail" into udc-qpr-dev am: 073b6fae16
am: a4f1545925
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24527775
Change-Id: Ifbab5c429c8a77d4a72b91a12fda82c10502fe19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-24 22:50:36 +00:00
Treehugger Robot
c755e44e3d
[automerger skipped] Merge "[PK settings] Remove metrics." into udc-qpr-dev am: ff791fa973
am: c234e5a6a8
-s ours
...
am skip reason: Merged-In I6f5292c686d3eaac641c6e7f7631152b34a0085b with SHA-1 bdf89255a0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24526049
Change-Id: I385082777a2c37c466f7e29302bc386dc1b9374e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-24 22:49:19 +00:00
Treehugger Robot
a4f1545925
Merge "[Refional Preference] Fix test case fail" into udc-qpr-dev am: 073b6fae16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24527775
Change-Id: I8701f80a441e86ef24a44bec8c40ae7e2bd56d9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-24 22:08:33 +00:00
Treehugger Robot
c234e5a6a8
Merge "[PK settings] Remove metrics." into udc-qpr-dev am: ff791fa973
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24526049
Change-Id: I6866aa3d71a9f891863fe0ccd273633a06daae19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-24 22:05:25 +00:00
Roshan Pius
8cb0308f1b
Implement DISALLOW_NFC AE user restriction am: f72a53a595
am: d6a7a97493
am: cd04e59741
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24525697
Change-Id: I41a1dc0e4f49ad8f15dc1f847f77d9a0c63212e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-24 21:38:24 +00:00
Roshan Pius
cd04e59741
Implement DISALLOW_NFC AE user restriction am: f72a53a595
am: d6a7a97493
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24525697
Change-Id: I3c4100861ed8e5e3b991853b652fc1e7a3a9b803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-24 21:21:30 +00:00
Treehugger Robot
073b6fae16
Merge "[Refional Preference] Fix test case fail" into udc-qpr-dev
2023-08-24 21:13:50 +00:00
Treehugger Robot
ff791fa973
Merge "[PK settings] Remove metrics." into udc-qpr-dev
2023-08-24 21:12:47 +00:00
Roshan Pius
d6a7a97493
Implement DISALLOW_NFC AE user restriction am: f72a53a595
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24525697
Change-Id: Id14e0be72914fb8effc08cb17856d6efa0a750ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-24 20:51:58 +00:00
Treehugger Robot
e23bb57fdf
Merge "Show Hotspot network icon (Wi-Fi Slice)" into udc-qpr-dev am: f5023f3805
am: e456621260
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24533568
Change-Id: Ie548f74405de03e73686abbd13f3fc4bb308209c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-24 14:09:35 +00:00
Treehugger Robot
e456621260
Merge "Show Hotspot network icon (Wi-Fi Slice)" into udc-qpr-dev am: f5023f3805
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24533568
Change-Id: I2e20d12d78888908c8d1fe53043b4b6aec719c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-24 13:26:55 +00:00
Treehugger Robot
f5023f3805
Merge "Show Hotspot network icon (Wi-Fi Slice)" into udc-qpr-dev
2023-08-24 12:33:08 +00:00
Chaohui Wang
56dfd4a57a
Merge "Clean up used EntityHeaderController" into main
2023-08-24 09:23:18 +00:00
Angela Wang
0e4aa4ea50
Merge "Run hearing devices survey for qualified users" into main
2023-08-24 06:48:37 +00:00
Zoey Chen
2011921be7
[Refional Preference] Fix test case fail
...
Test: make RunSettingsRoboTests -j128 ROBOTEST_FILTER=LocaleListEditorTest
Bug: 297304863
Change-Id: Ib59c033de3215c240b62a21885a6be4f813b292c
2023-08-24 06:17:57 +00:00
Chaohui Wang
0aca2ffbdb
Clean up used EntityHeaderController
...
From DataUsageSummaryPreferenceController and
BatteryHeaderPreferenceController.
There are no entity header UI for these 2 controllers, so no need to
create EntityHeaderController instance.
Bug: 295260929
Test: manual - on mobile settings page
Test: manual - on data usage page
Test: manual - on battery settings page
Change-Id: Ib96c9ae93de31f86434e5203ef4acac3af50e0ef
2023-08-24 14:08:17 +08:00
Joe Bolinger
c0ee0944f7
[automerger skipped] Merge "Fix talkback not announcing requirement in ChooseLock" into udc-d1-dev am: d27e383edf
-s ours am: ab684e146d
-s ours am: 5c2ebc0545
-s ours
...
am skip reason: Merged-In Ia274af9cc515d3ac9d344bd41d008ab5b4dbcabd with SHA-1 5a4105b324
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24498831
Change-Id: I9166655aa6e8e6b6c86a47ba4408418a849821b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-24 05:44:13 +00:00
Austin Delgado
b6a9a92dff
[automerger skipped] Fix talkback not announcing requirement in ChooseLock am: a73cee24d4
-s ours am: 3106ac6fe3
-s ours am: 9eb059f8ca
-s ours
...
am skip reason: Merged-In Ia274af9cc515d3ac9d344bd41d008ab5b4dbcabd with SHA-1 5a4105b324
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24498831
Change-Id: Ie8c1a34944f3ea4161737ac5c07d377a06084645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-24 05:44:09 +00:00
Zoey Chen
0c66486e62
[automerger skipped] Merge "[Regional Preference] Need to remove the metrics by the metrics concil team's comment." into udc-qpr-dev am: 6116750110
am: 6609d39b8f
-s ours
...
am skip reason: Merged-In I8eecba55288bfad6f81b5c8c1a8290afccdd5ef8 with SHA-1 ae32c8e8a5
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24521607
Change-Id: Ib64765eb63957b1b958137300abf73c9573ba8fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-24 05:43:46 +00:00