Bill Yi
0b8fb9bf01
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71aaccb248
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979892
Change-Id: Ibe4fc099db631e426de1434e21a64d699c9b3677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:11:45 +00:00
Bill Yi
6c8252e6fa
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b73f33a9e8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979106
Change-Id: Ifc0ee1cf6df0f789bb642e600cf907282b801a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:11:29 +00:00
Bill Yi
1e702e6f83
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968
Change-Id: I5c69f07f7543d7ddae95397cf382e520282cdb23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:01:52 +00:00
Bill Yi
eb51dfd4e9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968
Change-Id: Ib51cd595a7b5286b9dc1643ee606baeec5d6a0fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:01:37 +00:00
Bill Yi
84ed68cd4d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979105
Change-Id: I6595f8966ef1394544032078b8af6c1b981c1cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:01:25 +00:00
Bill Yi
fea268d325
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-10-09 23:13:53 +00:00
Bill Yi
acf52df7a6
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-10-09 23:12:56 +00:00
Graciela Wissen Putri
fcba73e30e
Add aspect ratio settings to advanced category children
...
Fix: 303823822
Test: Manual && atest AppDashboardFragmentTest
Change-Id: I5778efa6a1a790d76d9d35d1597d82fdc3707b3b
2023-10-09 17:35:07 +00:00
Valentin Iftime
1876c44991
Validate ringtone URIs before setting
...
Add checks URIs for content from other users.
Fail for users that are not profiles of the current user.
Test: atest DefaultRingtonePreferenceTest
Bug: 299614635
Change-Id: Ib266b285a3a1c6c5265ae2321159e61e08e349f6
Merged-In: Ib266b285a3a1c6c5265ae2321159e61e08e349f6
2023-10-09 12:59:16 +00:00
Valentin Iftime
7ba175eaeb
Validate ringtone URIs before setting
...
Add checks URIs for content from other users.
Fail for users that are not profiles of the current user.
Test: atest DefaultRingtonePreferenceTest
Bug: 299614635
Change-Id: Ib266b285a3a1c6c5265ae2321159e61e08e349f6
Merged-In: Ib266b285a3a1c6c5265ae2321159e61e08e349f6
2023-10-09 12:55:39 +00:00
Bill Yi
72eabac183
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If9da2309b45158c64d96649e6cf2ddf7e8e069bb
2023-10-06 19:49:10 -07:00
Bill Yi
71aaccb248
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic29f41f5c8c45d6ff631021a554fd3dbdf1d3be1
2023-10-06 19:47:40 -07:00
Bill Yi
b3e4d7886f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I785620415ba0ffad64f59ab8c32d37cc4e1957dc
2023-10-06 19:46:10 -07:00
Bill Yi
b73f33a9e8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic63ce3d473e11921e249b4e28fcdfe6c31b5561a
2023-10-06 19:43:59 -07:00
Bill Yi
1033a2abc6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifbf87c30492d9cf0e06afc59c7d5d97078fd336a
2023-10-06 19:43:08 -07:00
Bill Yi
7ed1b0ce85
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7b243481813f39dda575345466ec96b700047c81
2023-10-05 12:11:54 -07: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
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
Bill Yi
96e0207271
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-10-04 18:44:46 +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
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
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
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
b1c087f6ea
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-10-03 17:27:10 +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
Bill Yi
f060312e5b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I59f4f7a408f09877933e2f1e10ed17b0bb6c14f6
2023-10-02 22:02:18 -07:00
Bill Yi
bef7ad1471
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1
-s ours am: a42171c28d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24918570
Change-Id: I11004b020e71716c742f3fd5e402afe0c48e8f85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 04:36:48 +00:00
Bill Yi
ccdb8bd50e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4
-s ours am: cd61c38784
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24918570
Change-Id: I9905a2e5b581a864ab1c9bcf19680ed291211b8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 04:36:36 +00:00
Bill Yi
72d054d599
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744
-s ours am: 6db59420a9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24918568
Change-Id: I8a849456c65a90a886af2e42522d7e4d94959d1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 04:36:23 +00:00
Bill Yi
a42171c28d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24918570
Change-Id: I554524b0172d26550b6ad1af83a2e697df152a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 03:50:58 +00:00
Bill Yi
cd61c38784
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24918570
Change-Id: Iecfb42a1621989212a935e1c954feb3d36f3e15f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 03:50:49 +00:00
Bill Yi
6db59420a9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24918568
Change-Id: Id768812173c30a24ab6d5f94a5775ebf2180f711
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 03:50:32 +00:00
Bill Yi
7b38ca4ff1
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-10-03 03:09:01 +00:00
Bill Yi
a46afe3b67
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 16eacc3097
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24917917
Change-Id: Ib1ec58f407f5944ced7195c326c5723360a2c105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 21:28:21 +00:00
Bill Yi
aab00637cc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 217974d1f4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24917917
Change-Id: I9c5520137b09186da19a7c125a99fc4271ae3114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 21:28:13 +00:00
Bill Yi
f0a398ba6b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 91787589e3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24917915
Change-Id: I725f3b25cd3d541787998e5dd0cb42392e1da116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-02 21:27:55 +00:00
Bill Yi
16eacc3097
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-10-02 20:38:39 +00:00
Bill Yi
217974d1f4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2d0eaf947accd684a1b8d5eed229e46ba3e3bac7
2023-10-02 00:09:28 -07:00
Bill Yi
7b563cc2d4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If497526471c4d717ea029e839456fee636fb5398
2023-10-02 00:08:36 -07:00
Bill Yi
f336e73db9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I98c3767b717948c0458985d76344f96bd55f6703
2023-10-02 00:05:50 -07:00
Bill Yi
91787589e3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6831d85a6b7a6e4b6aa44b4fa79a01b4633917c7
2023-10-02 00:04:15 -07:00
Bill Yi
e211461744
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3d1ca601e38b4559f4e9cc88ae6fbea27aaf35fc
2023-10-02 00:02:41 -07:00
Bill Yi
b80f7ea863
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-09-29 22:49:01 +00:00
Bill Yi
582d855820
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ieac96bbd522889663356dd647c7724e2c7466fe3
2023-09-29 07:56:46 -07:00
Eghosa Ewansiha-Vlachavas
136bd906da
Fix testGetUserMinAspectRatioEntry for both tablets and foldables
...
Tabelts and foldables now have different aspect ratio values in their
config, so we need to test the devices separately as we shouldnt test for
values that are not in the config of the device the test is run on.
Fixes: 302155585
Test: atest SettingsUnitTests:UserAspectRatioManagerTest
Change-Id: I78fa3020501a4be992bb90fea16a6fec4f37594b
2023-09-28 13:23:11 +00:00
Eghosa Ewansiha-Vlachavas
a3108d5b14
Merge "[1/n] Aspect ratio settings app list refinement" into udc-qpr-dev
2023-09-28 10:39:35 +00:00
Bill Yi
c9c1c444f5
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-09-28 02:21:30 +00:00
Bill Yi
5d14c079bc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I19e3dc6aac243a714d70f2f13c8fe2f3d92ec507
2023-09-27 13:38:02 -07:00