Commit Graph

28806 Commits

Author SHA1 Message Date
Zaiyue Xue
3e22025c95 Merge "Change battery usage screen component name" into udc-dev am: 6ebcbdb27e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802757

Change-Id: I363378cfdfa7a353f5b3c71dee9933a81d468b47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 07:12:55 +00:00
Zaiyue Xue
cb1e45b5fc Merge "Change battery usage screen component name" into udc-dev am: 6ebcbdb27e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802757

Change-Id: I5c27b7be02cea142cf239463112fbbc3600492b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 07:12:51 +00:00
Zaiyue Xue
6ebcbdb27e Merge "Change battery usage screen component name" into udc-dev 2023-04-24 06:59:21 +00:00
Chaohui Wang
3cdad40840 Fix EID dialog related issues
Fix the following issues,
- After eid dialog dismissed, enter other page and back will trigger
  eid dialog again
- After screen rotation, dialog content disappeared

Fix: 277871671
Test: Manual
Change-Id: Ibd0ffb182cf69ea40e4b3fe0e8e840931d705df6
2023-04-23 15:49:52 +08:00
Zaiyue Xue
ca8e34e073 Change battery usage screen component name
Bug: 278022529
Test: manual
Change-Id: Ief9c2d83d1eae06047d64578886c0e1572bdcf0d
2023-04-23 15:42:22 +08:00
Chaohui Wang
6e13054555 Merge changes I50fb79aa,I5a84a9b1,Iea61c06d into udc-dev am: 0fa23e9791 am: ab18cb8bcf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22790519

Change-Id: Ie67e1905ca48f5bde13414fad83cb9830af8ef57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-23 06:27:05 +00:00
Chaohui Wang
80112c15cb Merge changes I50fb79aa,I5a84a9b1,Iea61c06d into udc-dev am: 0fa23e9791
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22790519

Change-Id: I3c6edaaeb38ccb7a1a7f13e78450e18625fd77a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-23 05:47:08 +00:00
Chaohui Wang
ab18cb8bcf Merge changes I50fb79aa,I5a84a9b1,Iea61c06d into udc-dev am: 0fa23e9791
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22790519

Change-Id: Ia6778caaba3325bcd0c06da3190850182858438c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-23 05:47:07 +00:00
Bill Yi
1c43541f1c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7379e50c5abc890323f0ee25431f2a3c363f71a0
2023-04-21 20:03:55 -07:00
Bill Yi
5457c4b50b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I833dc4787dcceff5026542ea5ed0dfaa06a80291
2023-04-21 20:01:11 -07:00
Bill Yi
6d4b01e8c9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I52fd610af8f3b68cdaf5e4c7540d37c1891da780
2023-04-21 19:58:33 -07:00
Bill Yi
1d92367e32 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If7ad9a5450d05a49e86a7ae93cf43ddd0d70c2b4
2023-04-21 19:56:30 -07:00
Chaohui Wang
8397287f87 Fix flicker for Data Usage page
Both "Mobile data usage" & "Non-carrier data usage".

By,
1. Use summary placeholder for usage amount to avoid shift
2. Before fix CycleListener's onItemSelected() is called multiple times,
   cause the app list to flash, let DataUsageList to handle the dedup
   logic to better handling.
3. Before fix if return from App Usage page, no loading view is
   displayed (only first enter has it), move this to onResume() to fix.
4. Before fix the cycles passed to App Usage page is cached (even when
   the cycles are changed), clear the cache when onResume() to fix.
5. Listener in SpinnerPreference could be null, add safety guard to it.

Cherry-pick from Change-Id: I95e544c46333496f4f30ed77dafa4779b4d66019

Fix: 277162513
Test: manual visual test
Test: Unit test
Change-Id: I50fb79aa3c888651a79fd1d030da554bebb6a660
2023-04-22 08:47:22 +08:00
Bill Yi
71c7b5f54c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I747a6dd6b0d5c4b2d23e7334887745ec86c51c11
2023-04-21 17:19:35 -07:00
Bill Yi
5c646d4394 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I127281eb9e0cd43de528e58fe5db67ae55fe10b1
2023-04-21 17:16:56 -07:00
Presubmit Automerger Backend
56c8b39d51 [automerge] Replace the SlicePreference with Preference 2p: 794fc58235
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956

Bug: 270544054
Change-Id: I88bb34649b2a1da21e6a3a36d90bd32c17ffb5ae
2023-04-21 15:08:44 +00:00
SongFerngWang
794fc58235 Replace the SlicePreference with Preference
The Settings' 2 panel did not support SlicePreference, since it
always open activity with NEW_TASK and it casues the settings can't
set new page at right side.

Bug: 270544054
Test: build pass. local test: the phone pair the buds with fastpair, and
then check the slice preferences.
atest BlockingPrefWithSliceControllerTest (pass)

Change-Id: I0e8abfd284492f04ab322a5bed13741fc6b25b34
2023-04-21 23:08:06 +08:00
Ioana Alexandru
e18a7140f3 Add keywords for AOD setting.
Used the WiFi slice for inspiration: ag/6793584

Also added "ambient" to the keywords, since "ambient display" is another
phrase used for AOD.

Bug: 279029717
Test: manually checked that the setting shows up when searching for
"aod"
Change-Id: I8a3a4a6635c9724565426b859722242d2bae9e49
2023-04-21 12:54:56 +00:00
Philip Junker
9e34ccd80f Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: 134bea1957 am: a9e09ac0ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22724663

Change-Id: I5d184e66b6581e5eeb6620ed0d17fc493384e602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 10:37:38 +00:00
Philip Junker
a9e09ac0ce Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: 134bea1957
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22724663

Change-Id: I7edb0846e9d07ad966fdb3753d02481d4b959cfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 10:20:25 +00:00
Philip Junker
92dbbe576e Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: 134bea1957
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22724663

Change-Id: Iebc8f31e8fac4bddee8687c124c56c3883784b08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 10:20:24 +00:00
Philip Junker
134bea1957 Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev 2023-04-21 10:07:47 +00:00
TreeHugger Robot
6697ace351 Merge "[Settings] Dialog does not show full msg and title in landscape mode" into udc-dev am: 06a4e06291 am: c49f871054
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22747102

Change-Id: I6e29d1464b7e9697dab861a4931219b534b545aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 05:43:48 +00:00
TreeHugger Robot
e7a1f12ea0 Merge "[Settings] Dialog does not show full msg and title in landscape mode" into udc-dev am: 06a4e06291
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22747102

Change-Id: Iae6ef0f7100dde1b24cffbb2fc447fec14597f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 05:05:11 +00:00
TreeHugger Robot
c49f871054 Merge "[Settings] Dialog does not show full msg and title in landscape mode" into udc-dev am: 06a4e06291
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22747102

Change-Id: Ic68000e73a6ea830c39820400ca5da9aec2d3435
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 05:04:03 +00:00
TreeHugger Robot
06a4e06291 Merge "[Settings] Dialog does not show full msg and title in landscape mode" into udc-dev 2023-04-21 04:28:19 +00:00
Treehugger Robot
68c9175e02 Merge "Change battery usage dropdown list item texts from "Breakdown by ..." to "By ..."" into udc-dev am: 8609ef2291 am: 533e6d80e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22753624

Change-Id: I345f4b068ff3cd4f371d6ee9f69b4b26de1abf8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 20:53:38 +00:00
Treehugger Robot
c2c783ef17 Merge "Update the proper App battery usage string on App info page" into udc-dev am: bc67d885ec am: d5f6278e49
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22753622

Change-Id: I6d3e0541db7d4c04d5c72f5606a20b7e956ad2b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 20:53:29 +00:00
ykhung
c80cc83b88 Update battery tip main icon into materiel theme design am: ff65a02ff8 am: a756df402f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22746582

Change-Id: Ic0cad0444c3d895334e972947b271dbe53687625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 20:53:19 +00:00
Chaohui Wang
3da7ecc4a4 Merge "Fix button label missing in the SIM card pop ups" into udc-dev am: ac2dc8dd01 am: 95cb923575
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22731782

Change-Id: I63ecd391ab3b962d92792eeaf475572fbaf82e51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 20:52:59 +00:00
TreeHugger Robot
01cea04949 Merge "Fix RTL display problem in Open by default" into udc-dev am: fb52240afe am: 168534ecb4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22700244

Change-Id: I69669fcd858f08a294739d538ea905fdde92f089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 20:52:41 +00:00
Julia Tuttle
e5cbf9f05f Merge "Clarify full screen intent permission text" into udc-dev am: 8af4cf48ea am: e81af0ad4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22680610

Change-Id: Ibe6ccc182416e42ff5ab8c1ebff1639eb742ff0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 20:19:11 +00:00
Treehugger Robot
72823d814d Merge "Change battery usage dropdown list item texts from "Breakdown by ..." to "By ..."" into udc-dev am: 8609ef2291
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22753624

Change-Id: Ib73a0321690d7b5f62125052b40497a0c4dbadbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 20:12:34 +00:00
Treehugger Robot
36ed86a6c5 Merge "Update the proper App battery usage string on App info page" into udc-dev am: bc67d885ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22753622

Change-Id: Ifa36325db77fe06b13ec95310b07b2df03d4ce29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 20:12:17 +00:00
ykhung
89573cd826 Update battery tip main icon into materiel theme design am: ff65a02ff8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22746582

Change-Id: I29e3e2aeff9595443fbb83be7ef7a2f95a4aa475
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 20:12:08 +00:00
Chaohui Wang
7d063294d8 Merge "Fix button label missing in the SIM card pop ups" into udc-dev am: ac2dc8dd01
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22731782

Change-Id: Ib03b3040068455718a580b59d288390e0ef4d37a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 20:11:52 +00:00
TreeHugger Robot
0b2f7c967a Merge "Fix RTL display problem in Open by default" into udc-dev am: fb52240afe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22700244

Change-Id: I27756cc3637a0e3a841e9a07303685e774b3f350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 20:11:33 +00:00
Treehugger Robot
533e6d80e9 Merge "Change battery usage dropdown list item texts from "Breakdown by ..." to "By ..."" into udc-dev am: 8609ef2291
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22753624

Change-Id: I731c73fdc88460f1523ff77f507b42ef5322c3ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 20:10:56 +00:00
Treehugger Robot
d5f6278e49 Merge "Update the proper App battery usage string on App info page" into udc-dev am: bc67d885ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22753622

Change-Id: I42bf2bfc4918f9a9388495b87e37137fc9324adb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 20:10:42 +00:00
ykhung
a756df402f Update battery tip main icon into materiel theme design am: ff65a02ff8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22746582

Change-Id: I994b044a35bf08864cf944698809881a3c0468d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 20:10:30 +00:00
Chaohui Wang
95cb923575 Merge "Fix button label missing in the SIM card pop ups" into udc-dev am: ac2dc8dd01
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22731782

Change-Id: I9dad3f09aa72baa927e6825f263f86cd35098a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 20:10:07 +00:00
TreeHugger Robot
168534ecb4 Merge "Fix RTL display problem in Open by default" into udc-dev am: fb52240afe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22700244

Change-Id: I18094e0de30ce9b605c0c2c0f8a36b28ddef4fa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 20:09:40 +00:00
Julia Tuttle
e81af0ad4e Merge "Clarify full screen intent permission text" into udc-dev am: 8af4cf48ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22680610

Change-Id: Ib434b5e4190dd486f7bf55378bc14950c6132dbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 19:57:38 +00:00
Julia Tuttle
57b70c2c01 Merge "Clarify full screen intent permission text" into udc-dev am: 8af4cf48ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22680610

Change-Id: I11dc017536371d527f618eddeea8731722574ae4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 19:45:53 +00:00
Treehugger Robot
8609ef2291 Merge "Change battery usage dropdown list item texts from "Breakdown by ..." to "By ..."" into udc-dev 2023-04-20 11:29:47 +00:00
Zoey Chen
4d0d06fcfe [Settings] Dialog does not show full msg and title in landscape mode
Add scroll bar and fix the text's style

Bug: 278831022
Test: manual local test
Change-Id: Ic0ad0c097099181f92535dba247d0c646904b7c7
2023-04-20 11:04:06 +00:00
Treehugger Robot
bc67d885ec Merge "Update the proper App battery usage string on App info page" into udc-dev 2023-04-20 10:50:46 +00:00
Zaiyue Xue
0aee0e6aa0 Change battery usage dropdown list item texts from "Breakdown by ..." to "By ..."
mock: https://screenshot.googleplex.com/C8ZbSL6UfJ9jRJx.png
screenshot: https://screenshot.googleplex.com/4nqRv3UA2iGoQuK.png

Bug: 278986376
Fix: 278986376
Test: manual
Change-Id: Iccb67c3695b21b62d5d26a96a791ca46a1ba7e0a
2023-04-20 17:49:49 +08:00
ykhung
ff65a02ff8 Update battery tip main icon into materiel theme design
Update all battery tip icon into materiel theme design based on the UX
feedback and clean up legacy icons

Bug: 246960554
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Change-Id: I82f5b140700a36b29844c0c3330b2eeeda8e5a55
2023-04-20 09:19:36 +00:00
Chaohui Wang
ac2dc8dd01 Merge "Fix button label missing in the SIM card pop ups" into udc-dev 2023-04-20 03:39:23 +00:00