Commit Graph

124123 Commits

Author SHA1 Message Date
TreeHugger Robot
eb88153b97 Merge "Update string for touch sounds" into udc-dev am: fd9ca0eae7 am: e64a1b4992 am: 76acd0b166
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157337

Change-Id: I3072619482c55e3f684d09519a9e53d206b609c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 14:02:52 +00:00
Treehugger Robot
ec04fff5e7 Merge "Update battery settings remaining time format" into udc-dev am: e99f757f60 am: a823380436 am: 13d2882385
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199829

Change-Id: Id37226ead7ad60d4caf2eccee5ee7fb71feb4140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:26:44 +00:00
Charles Chen
13055f01bd Merge "Improve Settings launch performance for normal phones" into udc-dev am: 75e591e413 am: 0e46e04fb5 am: 0341754c8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123008

Change-Id: I537944f9dec3568df35f00c0dcdbb05d1d44324b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:26:37 +00:00
TreeHugger Robot
0dcc826898 Merge "Update string for touch sounds" into udc-dev am: fd9ca0eae7 am: e64a1b4992 am: 3181169bdb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157337

Change-Id: Ia9ecb4e5ee3e4f76704bd93f75197e7794261a25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:26:22 +00:00
Treehugger Robot
13d2882385 Merge "Update battery settings remaining time format" into udc-dev am: e99f757f60 am: a823380436
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199829

Change-Id: I3226b3667702f3f012d7fded5989ec0591e16aab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:25:48 +00:00
Charles Chen
0341754c8d Merge "Improve Settings launch performance for normal phones" into udc-dev am: 75e591e413 am: 0e46e04fb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123008

Change-Id: Ie1e68f359c6fc129759c367db4f393aa30897114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:25:42 +00:00
TreeHugger Robot
3181169bdb Merge "Update string for touch sounds" into udc-dev am: fd9ca0eae7 am: e64a1b4992
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157337

Change-Id: I1f8b3127c7c15c108ffe183d71d740e0473be636
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:25:30 +00:00
Peter Zhang
9c0de639a4 Merge "Render an additional icon to the tappable tiles with pending intents" into udc-d1-dev am: 5b81bbfd02 am: 08e762c056
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23085598

Change-Id: I4138f46806d79aa21b290ab8493dd3c6a2bf5d3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:23:18 +00:00
Peter Zhang
0822711ecf Merge "Expand SettingsLib ProviderTile to support non-switch type of Preferences" into udc-d1-dev am: 15a11c4123 am: bc462205ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23050050

Change-Id: I0f859fd273480c7e3dd708ca40feddc69ff2f1f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:22:57 +00:00
TreeHugger Robot
76acd0b166 Merge "Update string for touch sounds" into udc-dev am: fd9ca0eae7 am: e64a1b4992
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157337

Change-Id: I880419eeec294f49011f25126ec015a7fe6853f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:21:23 +00:00
Oli Thompson
6a689bb60f Merge "Update Work profile settings" into udc-dev am: 787a054c93 am: c5d6f00d7c am: b3fbb562de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252125

Change-Id: I77550a9528b626a8c2a82e9fe9231aa67b9be0db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:06:34 +00:00
Oli Thompson
6061d83298 Merge "Update Work profile settings" into udc-dev am: 787a054c93 am: ef25255311 am: e622e97642
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252125

Change-Id: I44cd14b935e255554d2800cb39189a3ef3c53378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:03:46 +00:00
Peter Zhang
782ba7d863 Merge "Render an additional icon to the tappable tiles with pending intents" into udc-d1-dev am: 5b81bbfd02 am: 884e3b3ef8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23085598

Change-Id: Id9040768f9aae92265b08c1979077ad9d9366e78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:03:25 +00:00
Peter Zhang
3ace2947f2 Merge "Expand SettingsLib ProviderTile to support non-switch type of Preferences" into udc-d1-dev am: 15a11c4123 am: 4b387512f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23050050

Change-Id: Ife2fd98e8251de3ed52bca4512dd093be1af569d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:02:53 +00:00
Oli Thompson
3c3d447d46 Merge "Update Work profile settings" into udc-dev am: 787a054c93 am: c5d6f00d7c am: 82129a404a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252125

Change-Id: I4cd1a499765d3459d3efdb18aa3362c5e1d4de25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:00:09 +00:00
Treehugger Robot
a823380436 Merge "Update battery settings remaining time format" into udc-dev am: e99f757f60
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199829

Change-Id: I78e897de5a2198f21de61422b88adbc4cf7aa34b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 12:43:30 +00:00
Charles Chen
0e46e04fb5 Merge "Improve Settings launch performance for normal phones" into udc-dev am: 75e591e413
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123008

Change-Id: I18719743b87034ac5fdbdea213f5d70b7a9c1946
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 12:43:15 +00:00
TreeHugger Robot
e64a1b4992 Merge "Update string for touch sounds" into udc-dev am: fd9ca0eae7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157337

Change-Id: I12e3afcddba6810e81a2e93d27a540b03358ec72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 12:43:06 +00:00
Treehugger Robot
e99f757f60 Merge "Update battery settings remaining time format" into udc-dev 2023-05-12 12:29:14 +00:00
Peter Zhang
08e762c056 Merge "Render an additional icon to the tappable tiles with pending intents" into udc-d1-dev am: 5b81bbfd02
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23085598

Change-Id: Idd783b4f20b0b4ae5d6053f0713fd98cc4af789c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 12:23:01 +00:00
Peter Zhang
bc462205ed Merge "Expand SettingsLib ProviderTile to support non-switch type of Preferences" into udc-d1-dev am: 15a11c4123
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23050050

Change-Id: I5144e7a7eb1d3c5be55aa880334d3a11f2fc74a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 12:22:50 +00:00
Oli Thompson
e622e97642 Merge "Update Work profile settings" into udc-dev am: 787a054c93 am: ef25255311
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252125

Change-Id: I226e42083035ffc506c8ef0a72249aefd6e99749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 12:22:30 +00:00
Oli Thompson
b3fbb562de Merge "Update Work profile settings" into udc-dev am: 787a054c93 am: c5d6f00d7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252125

Change-Id: I594b2a7ae97a6bb00c3b83b56bc8115bcb03c34f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 12:21:49 +00:00
Charles Chen
75e591e413 Merge "Improve Settings launch performance for normal phones" into udc-dev 2023-05-12 12:21:00 +00:00
Charles Chen
8524048094 Improve Settings launch performance for normal phones
1. Initialize ActivitEmbedding component only if necessary
2. Early return to avoid executing long execution time operations
  ex: initialize ActivityEmbedding component, feature flag operations

Test: manual - launch settings and profile
Test: run
v2/android-crystalball-eng/health/microbench/startup/firstparty/open-settings
on affacted devices
Test: atest SettingsHomepageActivityTest TopLevelWallpaperPreferenceControllerTest DashboardFeatureProviderImplTest TopLevelSettingsTest TopLevelWallpaperPreferenceControllerTest SearchResultTrampolineTest
Test: atest CtsSettingsTestCases
Fixes: 281505190

Change-Id: I0c1a1dc50f26c4ded02de82190dd7aad59c20c01
2023-05-12 12:20:40 +00:00
Peter Zhang
884e3b3ef8 Merge "Render an additional icon to the tappable tiles with pending intents" into udc-d1-dev am: 5b81bbfd02
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23085598

Change-Id: I63d4c2c08447a78ee162a79d26b50ccb074d566f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 12:19:15 +00:00
Peter Zhang
4b387512f7 Merge "Expand SettingsLib ProviderTile to support non-switch type of Preferences" into udc-d1-dev am: 15a11c4123
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23050050

Change-Id: Ic5635e277a0e0b537f3d5c380926cc5a96467394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 12:18:55 +00:00
Oli Thompson
82129a404a Merge "Update Work profile settings" into udc-dev am: 787a054c93 am: c5d6f00d7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252125

Change-Id: I96bebdd1607adc0b1955dbef80001bd1488d1d06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 12:17:43 +00:00
Peter Zhang
5b81bbfd02 Merge "Render an additional icon to the tappable tiles with pending intents" into udc-d1-dev 2023-05-12 12:12:21 +00:00
TreeHugger Robot
fd9ca0eae7 Merge "Update string for touch sounds" into udc-dev 2023-05-12 12:08:32 +00:00
Peter Zhang
15a11c4123 Merge "Expand SettingsLib ProviderTile to support non-switch type of Preferences" into udc-d1-dev 2023-05-12 12:08:00 +00:00
Oli Thompson
c5d6f00d7c Merge "Update Work profile settings" into udc-dev am: 787a054c93
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252125

Change-Id: I7fb263356e2430ec4aaddf3222c45e1fc9885167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 11:40:19 +00:00
Oli Thompson
ef25255311 Merge "Update Work profile settings" into udc-dev am: 787a054c93
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252125

Change-Id: Ida56d040d8ea5361f3aa57dd8fecd62124a438d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 11:36:03 +00:00
Oli Thompson
787a054c93 Merge "Update Work profile settings" into udc-dev 2023-05-12 11:05:57 +00:00
Wesley Wang
77deb463a0 Update battery settings remaining time format
- Update the remaining time format to align with status bar
 - Remove unused test case since no more less than 7 or 15 remaining time
   case for battery settings
 screenshots:
   https://screenshot.googleplex.com/8jPYPj7yznGFU4b.png
   https://screenshot.googleplex.com/5GYXA2tusSUVmVQ.png
   https://screenshot.googleplex.com/3EnB3ejAxAzP28q.png
   https://screenshot.googleplex.com/5jeUxwBEyHotf9d.png

Bug: 281685505
Test: make SettingsLibRoboTests
Change-Id: If33e1828582845f78d8ef666c2b74ab5bba22357
2023-05-12 11:05:05 +00:00
Tom Hsu
77c9823925 Merge "[Settings] Avoid to unregister wrong observer" into udc-dev am: 0af8c60342 am: 77e126db56 am: d263a5921f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162866

Change-Id: Id45994bfc25567a8dafca5b1282370e7c6ac8c89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 07:29:16 +00:00
Tom Hsu
8c65620634 Merge "[Settings] Avoid to unregister wrong observer" into udc-dev am: 0af8c60342 am: db6119e840 am: 112101f8b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162866

Change-Id: I37db35a8dee50f3543bce6d245deb0974b0a1749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 07:24:06 +00:00
Tom Hsu
962281ed71 Merge "[Settings] Avoid to unregister wrong observer" into udc-dev am: 0af8c60342 am: 77e126db56 am: 09169f4b1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162866

Change-Id: I037551db51f7812b43933482e09b314dd2c08b2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 07:23:40 +00:00
Tom Hsu
d263a5921f Merge "[Settings] Avoid to unregister wrong observer" into udc-dev am: 0af8c60342 am: 77e126db56
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162866

Change-Id: Ia012c94bca619f1d2165a89908341b2c9aed98d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 06:48:00 +00:00
Tom Hsu
112101f8b6 Merge "[Settings] Avoid to unregister wrong observer" into udc-dev am: 0af8c60342 am: db6119e840
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162866

Change-Id: Iafba4887605950791b6a3c1073ddb1957d1c8b6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 06:47:05 +00:00
Tom Hsu
09169f4b1b Merge "[Settings] Avoid to unregister wrong observer" into udc-dev am: 0af8c60342 am: 77e126db56
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162866

Change-Id: Ic32dc15740c5295a939c76f67dde7ee77444063d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 06:44:01 +00:00
Tom Hsu
77e126db56 Merge "[Settings] Avoid to unregister wrong observer" into udc-dev am: 0af8c60342
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162866

Change-Id: I4c31c0f22b392025b8430d8e9fcc75b0eb2e54d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 06:04:41 +00:00
Tom Hsu
db6119e840 Merge "[Settings] Avoid to unregister wrong observer" into udc-dev am: 0af8c60342
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162866

Change-Id: I968669dafda341eb56e4f8d43fd4c51854595b7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 06:00:22 +00:00
Zoey Chen
d1612d15ab Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev am: 4d917d990f am: 7b4f5c8a50 am: eb5eb22acc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074017

Change-Id: I291150d24fe8f379ca7cf9153d3f82d87bf0ac45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 05:22:06 +00:00
Yanting Yang
8d3a7b50da Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f am: f2c5b7f2e7 am: 64c085bd19
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084

Change-Id: I76de86e986a6f36a681d0b9c8b736a86e232b09f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 05:21:55 +00:00
Zoey Chen
869ee49aa6 Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev am: 4d917d990f am: 6d57de3418 am: b1b90fa6f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074017

Change-Id: I0736117961fea644e9f03a0a040ebba756def342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 05:18:02 +00:00
Yanting Yang
5687cc2ce1 Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f am: eb028da005 am: c5362c1c60
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084

Change-Id: I106150778012cab3ed0ddf7135cb6a1832ea106b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 05:17:55 +00:00
Zoey Chen
b366deb16c Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev am: 4d917d990f am: 7b4f5c8a50 am: dea9562e08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074017

Change-Id: I0a0faadbc6b375139b1b1610a3501f974680b3cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 05:17:40 +00:00
Yanting Yang
cc3502c992 Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f am: f2c5b7f2e7 am: 915d32a8a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084

Change-Id: I7eb4192f76e354bda7b24308ffbeec90449b881f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 05:17:02 +00:00
Tom Hsu
0af8c60342 Merge "[Settings] Avoid to unregister wrong observer" into udc-dev 2023-05-12 05:16:28 +00:00