Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,084 Commits 1 Branch 0 Tags
ff1898d97094f62305d2a6fd7df0b40ca3ffafbc
Commit Graph

122084 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
ff1898d970 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fa5e1c57f8 am: fb7650e88f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795018

Change-Id: Iedd7cd020c217132bd4c2f18169c6de2394f03e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 18:15:54 +00:00
Treehugger Robot
0e084ba633 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766 -s ours am: 6a0935a34f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019

Change-Id: I603bf91d4995829fae5ef18c512f0672eaa1f240
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:29:00 +00:00
Bill Yi
b9e6bd201f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca18853bab -s ours am: ffe604c85c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019

Change-Id: Ib0fd25bf66e535f59b20ba717ba5e28ea39b0416
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:28:08 +00:00
Treehugger Robot
6a0935a34f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019

Change-Id: I11af2e25300a6dc5f106b694ffb2fc5a558c52c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:06:44 +00:00
Bill Yi
ffe604c85c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca18853bab -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019

Change-Id: Ice851b6bd9aed5f50ea95b4ab778793eff02b3fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:05:38 +00:00
Treehugger Robot
33837c6766 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-04-25 16:17:03 +00:00
Treehugger Robot
525000b2ab Merge "[UI][Modifier key remapping] Use new color token." into udc-dev am: 59461ffd6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22834862

Change-Id: I5446a849786124fec429c50c1cc7b6b373400a7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 15:43:59 +00:00
YK Hung
8c1bae8a06 Merge "Fix Settings app crash cause by BadParcelableException" into udc-dev am: 6853b5d733 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22848117

Change-Id: Ic85524a805665044aa826656a88bc52e9a5e79b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 15:43:12 +00:00
Treehugger Robot
59461ffd6f Merge "[UI][Modifier key remapping] Use new color token." into udc-dev 2023-04-25 15:21:36 +00:00
YK Hung
6853b5d733 Merge "Fix Settings app crash cause by BadParcelableException" into udc-dev 2023-04-25 15:01:51 +00:00
Matías Hernández
8a98f248c1 Merge "Tweak refresh of notification channel group preferences" into udc-dev am: c49cb1014c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761580

Change-Id: I81999f1723a8b3fee260334c39fddd5a1689f34b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 14:41:11 +00:00
Matías Hernández
c49cb1014c Merge "Tweak refresh of notification channel group preferences" into udc-dev 2023-04-25 14:00:14 +00:00
danielwbhuang
077293b72d [UI][Modifier key remapping] Use new color token. 
Chnage materialColorPrimaryContainer to materialColorPrimary
Change materialColorSurfaceContainerHigh to
materialColorSurfaceContainerHighest

Bug: 277712746
Test: manual
Change-Id: I7b23850a24718d28020f6a7b13119c69f50861b1
 2023-04-25 09:58:21 +00:00
Wesley Wang
a4bafafb21 Fix Settings app crash cause by BadParcelableException 
Bug: 279391146
Test: make SettingsLibRoboTests
Change-Id: I32dd0aa87c405786fe28b15721e4edbcb4d73a98
 2023-04-25 17:49:12 +08:00
SongFerngWang
04f9745471 Replace the SlicePreference with Preference am: 794fc58235 am: c054498357 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956

Change-Id: Iba37ecd28590de9ca276c4cce3cec73324650e25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 07:11:05 +00:00
SongFerngWang
c054498357 Replace the SlicePreference with Preference am: 794fc58235 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956

Change-Id: I5e9032624347b27acb02eafd28002744d92b5f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 06:23:25 +00:00
Treehugger Robot
9b25f5ac88 Merge "Fix b/279120121: Unplug 100% Pixel phone won't reset the battery usage data when the phone is just started." into udc-dev am: ea3a970826 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779519

Change-Id: Ia19da83e61ec2bfbfbbb61110c605c401dd0295e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 04:12:11 +00:00
Treehugger Robot
ea3a970826 Merge "Fix b/279120121: Unplug 100% Pixel phone won't reset the battery usage data when the phone is just started." into udc-dev 2023-04-25 03:59:03 +00:00
Zaiyue Xue
796c2ef5ca Merge "Replace Screen system component time with device screen on time" into udc-dev am: f3a3634aa5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22809776

Change-Id: I6a72fe235b10dccd92cc56be7cf4e5f5e7a170f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 03:49:44 +00:00
Zaiyue Xue
8892fd48ca Merge "Combine screen on time map into battery usage map" into udc-dev am: cfa374f997 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802758

Change-Id: Ic49b7f1c2382914ac42bd213629150f7dfc35dda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 03:49:13 +00:00
Zaiyue Xue
f3a3634aa5 Merge "Replace Screen system component time with device screen on time" into udc-dev 2023-04-25 03:32:02 +00:00
Zaiyue Xue
cfa374f997 Merge "Combine screen on time map into battery usage map" into udc-dev 2023-04-25 03:31:39 +00:00
Zoey Chen
c28a5c3431 Merge " [Settings] UI part: Add metrics for numbers preferences" into udc-dev am: c31cf3d3b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802959

Change-Id: I08689116c085fd322166bf2ef817a961b42a4cb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 03:28:02 +00:00
Zoey Chen
609b91c715 Merge changes from topic "regional_preference_metrics" into udc-dev am: 1d74998647 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762358

Change-Id: I82ededa655a73151d1b5a837426bd02c11cbdcd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 03:27:38 +00:00
Zoey Chen
c31cf3d3b4 Merge " [Settings] UI part: Add metrics for numbers preferences" into udc-dev 2023-04-25 03:00:20 +00:00
Zoey Chen
1d74998647 Merge changes from topic "regional_preference_metrics" into udc-dev 
* changes:
  [Regional Pref] Remove Calendar controller and related Fragement
  [Regional Pref] 1. Add metrics for user changes the First day of week 2. Refactor to Settings design
  [Regional Pref] 1. Add metrics for user changes the Temperature unit 2. Refactor to Settings design
 2023-04-25 02:59:27 +00:00
Treehugger Robot
ed9f22b78a Merge changes from topic "tc_change_23042206_47" into udc-dev am: ef196f7f3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22794712

Change-Id: I968e42bdcd64a2325105458eedf106e389bde932
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 02:21:06 +00:00
Bill Yi
0a2936d879 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c am: c4649b3ede -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22794712

Change-Id: I46369b2d98f829b295f9164f8a7069a7ce71a799
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 02:20:45 +00:00
Treehugger Robot
ef196f7f3e Merge changes from topic "tc_change_23042206_47" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c
  Import translations. DO NOT MERGE ANYWHERE
 2023-04-25 01:26:27 +00:00
Treehugger Robot
646e95241d Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-25 01:09:25 +00:00
Treehugger Robot
103dfefdad Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-25 01:09:25 +00:00
Treehugger Robot
29ba678514 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-25 01:09:25 +00:00
Chaohui Wang
7823686740 Merge "Fix EID dialog related issues" into udc-dev am: 56f2c894d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789357

Change-Id: Iefc5bc85dc359433dcb6957cfee81eda843ee6d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 00:31:24 +00:00
Chaohui Wang
56f2c894d8 Merge "Fix EID dialog related issues" into udc-dev 2023-04-24 23:46:42 +00:00
Bill Yi
ae326b5f83 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eb6de672dc -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22798066

Change-Id: Ib5a8ee9b80ccb8f0c273639bb89ea0292bdcca12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-24 22:21:15 +00:00
Bill Yi
fc348ab76d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51a04e12bf -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22798066

Change-Id: I033f9c93563a42de2f66b95755d3a2065afde756
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-24 22:21:06 +00:00
Bill Yi
733d6f5579 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ae1b6f1e35 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22797863

Change-Id: Ia1f0dca00066d1b4f70e6ab25376e062febe7b1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-24 22:21:04 +00:00
Bill Yi
f477d02f91 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71c7b5f54c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22797863

Change-Id: If64d573e1afe581c8c74e53132b457e139e5b7d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-24 22:20:49 +00:00
Bill Yi
e676a561d8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ef269038ef -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22796618

Change-Id: Ieff87595cbaef00ddd362c382f184b7cbbb12b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-24 22:20:32 +00:00
Bill Yi
f537b87b7a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c646d4394 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22796618

Change-Id: Ic0761413dfee3b88b40f563eb0a9e5182bc2a7ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-24 22:20:13 +00:00
Bill Yi
eb6de672dc Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-24 21:58:45 +00:00
Bill Yi
ae1b6f1e35 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-24 21:58:45 +00:00
Bill Yi
ef269038ef Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-24 21:58:45 +00:00
Randy Pfohl
23015041a4 Merge "Ensure we launch gesture tutorial as new task" into udc-dev am: a4e868af0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788321

Change-Id: I41ca0ae8964074306cff9e537842980dbb2ea00b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-24 18:28:47 +00:00
Randy Pfohl
a4e868af0d Merge "Ensure we launch gesture tutorial as new task" into udc-dev 2023-04-24 18:16:08 +00:00
Treehugger Robot
9a35d47d68 Merge "[Regional Preference] Do not get child fragment if the fragment is not added" into udc-dev am: d6fb2c45dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789043

Change-Id: I8c187cfc4301af169454bcc4fe15877134c6035c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-24 17:21:58 +00:00
Treehugger Robot
d6fb2c45dc Merge "[Regional Preference] Do not get child fragment if the fragment is not added" into udc-dev 2023-04-24 15:54:35 +00:00
Treehugger Robot
5019020268 Merge "Avoid unnecessary re-creating of Wi-Fi password dialog" into udc-dev am: 5ae083b952 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802958

Change-Id: I9f9b26ab62dc1f4b72bc52d712ce3335000ca0fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-24 14:40:19 +00:00
Treehugger Robot
5ae083b952 Merge "Avoid unnecessary re-creating of Wi-Fi password dialog" into udc-dev 2023-04-24 14:07:52 +00:00
Zoey Chen
cec01e38ef [Regional Preference] Do not get child fragment if the fragment is not 
added

Bug: 279376395
Test: local test
Change-Id: I352597dedf2ba7770936d44d09aa111762f94502
 2023-04-24 12:38:43 +00:00