PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
134,108 Commits 1 Branch 0 Tags
b6a9a92dff1674d0bd15db56a42c3d2a3f02a36c
Commit Graph

134108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
2f1b0008b3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I95203341833c132f88e3afaf497185884e104fd3
 2023-07-26 11:36:54 -07:00
Bill Yi
6ff8c62f42 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I682234378a1a063d61e4134e7890af05a440aae2
 2023-07-26 11:28:37 -07:00
Bill Yi
557cad061e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id4cc7323fcee7b8c016f8f16b8ea1eb0ced2bb1a
 2023-07-26 11:26:38 -07:00
Bill Yi
35f9f86922 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ieda8cff22a5dc58279f8f8dbd4e95c7837d0b792
 2023-07-26 11:23:13 -07:00
Bill Yi
9bba3d174b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idc79a1e92877c9f89dbdda19875e89f58d27b1ab
 2023-07-26 11:19:10 -07:00
Bill Yi
ebacced122 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I36f94a0f13d77785fb721698202c9a96d56421ad
 2023-07-26 11:17:17 -07:00
Tetiana Meronyk
414c82a2f2 Merge "Fix keyboard showing after dialog dismissed" into udc-qpr-dev am: 98df5bcde2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24174129

Change-Id: I111635a0c02a4a37e4a2f1bfe0ecaf0067a1703f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 18:11:04 +00:00
Avinash Vadlamudi
5567bdbfb3 Remove redundant code of setting the DeviceConfig overrides 
- The auto pin confirm feature is now always available: (ag/23288037)

Bug: 291146670
Test: atest ChooseLockPasswordTest
Test: atest AutoPinConfirmPreferenceControllerTest
Change-Id: I6b9337dfee5d84ffdd3391f7b424377d640d451c
 2023-07-26 17:51:13 +00:00
Tetiana Meronyk
98df5bcde2 Merge "Fix keyboard showing after dialog dismissed" into udc-qpr-dev 2023-07-26 16:47:18 +00:00
Treehugger Robot
35d8c4fcdf Merge "Disable FontWeightAdjustmentPreferenceControllerTest" into main 2023-07-26 13:18:28 +00:00
Adrian Roos
af4e91db85 Disable FontWeightAdjustmentPreferenceControllerTest 
The test modifies the system-global font weight adjustment setting,
but doesn't reset it, leaving the system in a bad state for subsequent
tests.

Bug: 293250385
Change-Id: I9f7b8fc100b71181d17e5e72cc8c6d871c41de7d
Test: n/a

Bug: 293250385
Change-Id: I9f7b8fc100b71181d17e5e72cc8c6d871c41de7d
Test: n/a
 2023-07-26 12:32:11 +00:00
lbill
021a546a9d Fix RestrictedPreference icons do not align view state 
Add android:tint="?android:attr/colorControlNormal" in vector drawable

Bug: 193514112
Test: Manual, set RestrictedPreference to disabled state and check
   if icons of preference grey out
Change-Id: Icf2821317da731d862d5eebe968b5704ef78271c
 2023-07-26 12:21:50 +00:00
SongFerngWang
7cbfe4a10e Fix testcase failed 
Bug: 292979979
Test: [Pass]make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDeviceDetailsFragmentTest
Change-Id: If09f4d8ad9c974c2a7f72932d544490655b92cf7
 2023-07-26 17:54:20 +08:00
Treehugger Robot
6bcb048b13 Merge "Match APN types with ignoring the case" into main am: 720fd136ed am: 9a44907d9e am: 3d47657593 am: ff78df4b72 am: 4405824d2c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056

Change-Id: I0fc8f2564d064eb4af752d0414ca5437e28ad1fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 08:28:01 +00:00
Treehugger Robot
4405824d2c Merge "Match APN types with ignoring the case" into main am: 720fd136ed am: 9a44907d9e am: 3d47657593 am: ff78df4b72 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056

Change-Id: Ibd736933f8d0aa649930a1d432611b958d09f292
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 07:19:20 +00:00
Treehugger Robot
ff78df4b72 Merge "Match APN types with ignoring the case" into main am: 720fd136ed am: 9a44907d9e am: 3d47657593 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056

Change-Id: Ie247ffcc6ec787912e50474ec1d51744e6dfc5ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 06:38:47 +00:00
Treehugger Robot
3d47657593 Merge "Match APN types with ignoring the case" into main am: 720fd136ed am: 9a44907d9e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056

Change-Id: If5c4c47dd5d1b05635e8d5102e52a58f5442a9da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 05:31:45 +00:00
Weng Su
c8fdce0a1d [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 6bf9d64ba4 -s ours am: 65fc0b1f90 -s ours am: e2946957da -s ours am: faff4d6bea -s ours am: 63b73e5a29 -s ours am: 56b9900a19 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I57c871c627f95922330267e91f9d4bfe1942b6ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 05:15:10 +00:00
Weng Su
1402833cd2 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 682d6a2e9a -s ours am: 0cb88ae1f0 -s ours am: 0a6a483204 -s ours am: 79cf9bd19e -s ours am: 8a98c204aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I945fbdb053e2cb204119dc63eb7955379fcb5368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 05:15:00 +00:00
Wenhui Yang
42e193a6c0 Merge "Revert "Fix rotate device at face unlock detailed page, device will display"" into udc-d1-dev am: 5239911c6b am: 16dc3ed748 am: 6f61f7dfa5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24199674

Change-Id: I37aceb0690b1e76ec91a99aa072cbf8feb3249a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 05:14:49 +00:00
Weng Su
8da316f3d7 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 6bf9d64ba4 -s ours am: 65fc0b1f90 -s ours am: e2946957da -s ours am: 8e9e1946ba -s ours am: 47aa5a25ca -s ours am: 51d0f32f9d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib99c06db6f03042c342b01954c1407da982ca6b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 05:14:39 +00:00
Weng Su
358c19d93a [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 682d6a2e9a -s ours am: 0cb88ae1f0 -s ours am: 03f55c0ab2 -s ours am: 6349278319 -s ours am: 4770a25e7f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I293b6e4cbb0d135890579d0570f62be2c6cb5be9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 05:14:29 +00:00
Wenhui Yang
d1f2c04069 Merge "Revert "Fix rotate device at face unlock detailed page, device will display"" into udc-d1-dev am: 5239911c6b am: b1feaf710d am: c7240489b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24199674

Change-Id: I04ec7f26fe4ce68d2083b6ce480735af4a22d6b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 05:14:18 +00:00
Weng Su
5197dde191 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 6bf9d64ba4 -s ours am: 65fc0b1f90 -s ours am: e2946957da -s ours am: 8e9e1946ba -s ours am: 88e30593f5 -s ours am: 9312668efd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I09482280ba892a0b4059488fc442a6bb5dd04cb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 05:13:34 +00:00
Weng Su
f4ced34fbe [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 682d6a2e9a -s ours am: 0cb88ae1f0 -s ours am: 03f55c0ab2 -s ours am: e687bedbd9 -s ours am: 537b7abe31 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic8957b1004c25c0beb9cfb26ba9513ae2a50cafd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 05:08:14 +00:00
Treehugger Robot
9a44907d9e Merge "Match APN types with ignoring the case" into main am: 720fd136ed 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056

Change-Id: I502a8c1c156c26bb68f73afc4a2c5d438aef5dd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 04:47:15 +00:00
Weng Su
56b9900a19 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 6bf9d64ba4 -s ours am: 65fc0b1f90 -s ours am: e2946957da -s ours am: faff4d6bea -s ours am: 63b73e5a29 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic32bdebcd639989bd6b748c56d3b78a8dfaf8c30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 04:29:15 +00:00
Weng Su
8a98c204aa [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 682d6a2e9a -s ours am: 0cb88ae1f0 -s ours am: 0a6a483204 -s ours am: 79cf9bd19e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If992873a592879e3ae82b3289c303261a7c88cc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 04:29:06 +00:00
Wenhui Yang
6f61f7dfa5 Merge "Revert "Fix rotate device at face unlock detailed page, device will display"" into udc-d1-dev am: 5239911c6b am: 16dc3ed748 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24199674

Change-Id: I3ddba623f23a2fdb2f280ed7573c169c7db7d8ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 04:28:34 +00:00
Weng Su
51d0f32f9d [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 6bf9d64ba4 -s ours am: 65fc0b1f90 -s ours am: e2946957da -s ours am: 8e9e1946ba -s ours am: 47aa5a25ca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6f1a0f363f952f6de25d1012e34b8d1346dbc260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 04:28:03 +00:00
Weng Su
4770a25e7f [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 682d6a2e9a -s ours am: 0cb88ae1f0 -s ours am: 03f55c0ab2 -s ours am: 6349278319 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic1cbb57e0dbf262b2fcdb297829e1644dbd3e6a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 04:26:51 +00:00
Wenhui Yang
c7240489b0 Merge "Revert "Fix rotate device at face unlock detailed page, device will display"" into udc-d1-dev am: 5239911c6b am: b1feaf710d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24199674

Change-Id: I015c68ff6531bb497e50ac2e21a4c11ba37394b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 04:24:43 +00:00
Weng Su
9312668efd [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 6bf9d64ba4 -s ours am: 65fc0b1f90 -s ours am: e2946957da -s ours am: 8e9e1946ba -s ours am: 88e30593f5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3e74adb0a6ccc1a4b7d4a2362b4104a33a48c2d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 04:24:34 +00:00
Weng Su
537b7abe31 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 682d6a2e9a -s ours am: 0cb88ae1f0 -s ours am: 03f55c0ab2 -s ours am: e687bedbd9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I78963af6be14c136d46f4636b8bb9129bab8ab3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 04:23:39 +00:00
Treehugger Robot
720fd136ed Merge "Match APN types with ignoring the case" into main 2023-07-26 04:03:19 +00:00
Weng Su
63b73e5a29 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 6bf9d64ba4 -s ours am: 65fc0b1f90 -s ours am: e2946957da -s ours am: faff4d6bea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I046b7480f15685ffc27e959934f295c09598b57f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 03:19:47 +00:00
Treehugger Robot
291e265f01 Merge "Correct used size of Storage Settings." into udc-d1-dev am: d86ec6652a am: 4f21f99c6d am: 78520ce32f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23898724

Change-Id: I1cb3ffad5acf41f6db6a3a7cbe7d11b88ff4ec86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 03:19:00 +00:00
Weng Su
c9c0bf4810 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626 -s ours am: 2aa573fbd1 -s ours am: 80de015a39 -s ours am: 29c6c35f9c -s ours am: 513e07f285 -s ours am: 78de3a6d03 -s ours am: ee33044097 -s ours am: 4a62d49360 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4c9dd10e4943010bf4cebc06811979bf23d88dbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 03:18:50 +00:00
Weng Su
79cf9bd19e [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 682d6a2e9a -s ours am: 0cb88ae1f0 -s ours am: 0a6a483204 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I854411dfdeb5a8a416fd062418025bdc45a79112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 03:18:44 +00:00
Weng Su
1ba621aa4c [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626 -s ours am: 2aa573fbd1 -s ours am: 80de015a39 -s ours am: 29c6c35f9c -s ours am: 513e07f285 -s ours am: 5ccdb20f3e -s ours am: 872a1984b0 -s ours am: 59dd6d00f0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7eb14fa346c442af1f33cf27fe0b637f994c8e1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 03:18:42 +00:00
Automerger Merge Worker
7d98738dfe Merge "[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626 -s ours am: 2aa573fbd1 -s ours am: d091c49a5b -s ours am: d7d57a81dd -s ours am: fecc2f5b05 -s ours" into udc-d1-dev-plus-aosp am: e39e53f322 am: 7b3bdc1058 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24018267

Change-Id: Idcc4c497a7ab9e5cc5b6baab8e84b526a6c2f758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 03:18:31 +00:00
Weng Su
92e6990e6c [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626 -s ours am: 2aa573fbd1 -s ours am: d091c49a5b -s ours am: d7d57a81dd -s ours am: fecc2f5b05 -s ours am: 8df1a99f36 -s ours am: 5ad76a4dad -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I686fc2b759209de825dce41245c544b700f04e11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 03:18:29 +00:00
Automerger Merge Worker
2735db612a Merge "[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626 -s ours am: 2aa573fbd1 -s ours am: d091c49a5b -s ours am: d7d57a81dd -s ours am: d961d09b53 -s ours am: 997bbbf424 -s ours" into udc-qpr-dev-plus-aosp am: ccd46faf5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24018267

Change-Id: Ibe348f0fdab0d881b84aaed148079c5e3d13a3b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 03:18:15 +00:00
Weng Su
86354e0aa3 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626 -s ours am: 2aa573fbd1 -s ours am: d091c49a5b -s ours am: d7d57a81dd -s ours am: d961d09b53 -s ours am: 997bbbf424 -s ours am: 583a17ada8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ida0d82b4108fa50123671bb5e536d2e83b7d4509
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 03:18:12 +00:00
Treehugger Robot
77d6cbbe93 Merge "Correct used size of Storage Settings." into udc-d1-dev am: d86ec6652a am: bbe8cc999e am: 0e89c36d43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23898724

Change-Id: Ifb51727975d3057011d7da146d2d8778ab71f6ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 03:17:59 +00:00
Weng Su
751248e9f3 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626 -s ours am: 2aa573fbd1 -s ours am: 80de015a39 -s ours am: 29c6c35f9c -s ours am: 513e07f285 -s ours am: 78de3a6d03 -s ours am: d97258b82d -s ours am: 4ccb3b8546 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I042299398e2c922ce29afc0d826491d0d996a6a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 03:17:48 +00:00
Wenhui Yang
b1feaf710d Merge "Revert "Fix rotate device at face unlock detailed page, device will display"" into udc-d1-dev am: 5239911c6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24199674

Change-Id: I1ed93893d170141ac974b2ad64fd2ddb6fe98bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 03:17:46 +00:00
Weng Su
f479593b83 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 6bf9d64ba4 -s ours am: 65fc0b1f90 -s ours am: e2946957da -s ours am: 14638c1de3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idd312d16ced11943a1e90a4b2038536722414725
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 03:17:24 +00:00
Weng Su
88e30593f5 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 6bf9d64ba4 -s ours am: 65fc0b1f90 -s ours am: e2946957da -s ours am: 8e9e1946ba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibfc8da6e32177a1fec60eae6e69f1fc0378d642b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 03:17:19 +00:00
Weng Su
e687bedbd9 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296 am: cb3ebcb4e3 -s ours am: a1f182efb9 -s ours am: 79c41b1104 -s ours am: 682d6a2e9a -s ours am: 0cb88ae1f0 -s ours am: 03f55c0ab2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie8b4897c855d05129b66d7d4aba6ff234afe18c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 03:17:10 +00:00