PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117,787 Commits 1 Branch 0 Tags
28ce6b90573f12ba3f730ddc3923d0f9aedc5fb0
Commit Graph

117787 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SongFerngWang
28ce6b9057 Move the auto data switch preference into DDS sim 
Bug: 253698164
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AutoDataSwitchPreferenceControllerTest
Change-Id: I0aee5454e3a57a373b9eea2108c39335e4277f7b
 2022-11-28 15:36:18 +08:00
Bonian Chen
845426e9e5 Merge "[Settings] Code refactor" am: b60b759dac am: 61ed679576 am: e9e7cdf914 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2311309

Change-Id: I05dcb1af5e6d6e515ebaa81641df57883a88c36e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-24 05:16:23 +00:00
Bonian Chen
e9e7cdf914 Merge "[Settings] Code refactor" am: b60b759dac am: 61ed679576 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2311309

Change-Id: I138c4c8108dee8c1c492e6909881c689dc66be63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-24 04:40:53 +00:00
Bonian Chen
61ed679576 Merge "[Settings] Code refactor" am: b60b759dac 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2311309

Change-Id: I8e0331d1f3fccc71a33a81fbb7d98956bce1be27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-24 04:10:59 +00:00
Bonian Chen
b60b759dac Merge "[Settings] Code refactor" 2022-11-24 03:44:13 +00:00
Bill Yi
db1885ce15 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 49caa49dfc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If93361cf491145ee5ca63345fd417fa5a468e6dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-24 02:04:13 +00:00
Bill Yi
2e99220f61 Merge changes from topic "tc_change_22112223_16" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c84754ed13
  Import translations. DO NOT MERGE ANYWHERE
 2022-11-24 01:38:09 +00:00
Bill Yi
49caa49dfc Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-11-24 01:38:09 +00:00
Bill Yi
dd1679a059 Merge changes from topic "tc_change_22112223_16" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 831453a97c
  Import translations. DO NOT MERGE ANYWHERE
 2022-11-24 01:38:09 +00:00
TreeHugger Robot
1afc1eb345 [automerger skipped] Merge "Keep "Resetting your internet" when screen rotates" into tm-qpr-dev am: dc4b54c168 am: 1793a5a322 -s ours 
am skip reason: Merged-In Iae9585ff8366b8b71b4c39dc0ec7e87a0320fa5a with SHA-1 728a59199b is already in history

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

Change-Id: Ia124bd7b28355274ae89afd14b6aa668a3d34bdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-24 01:07:18 +00:00
TreeHugger Robot
1793a5a322 Merge "Keep "Resetting your internet" when screen rotates" into tm-qpr-dev am: dc4b54c168 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20519152

Change-Id: I979fff8af4a4da75a0fd0d173a6561032a78895e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-24 00:30:00 +00:00
TreeHugger Robot
21923a767f Merge "[MTE] Use separate SettingsEnum value for dialog." 2022-11-24 00:18:44 +00:00
TreeHugger Robot
dc4b54c168 Merge "Keep "Resetting your internet" when screen rotates" into tm-qpr-dev 2022-11-24 00:01:22 +00:00
TreeHugger Robot
8d4a48e1d1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 691196e900 -s ours am: 00e2fe73cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I65b38008e474a830a37be502bcdd06f45fa210a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 20:36:41 +00:00
Bill Yi
72d9179383 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c9a4f35a74 -s ours am: ebb7230ac0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If5f3deceadfb66fde38e0c204d68bf688e91bfd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 20:36:33 +00:00
TreeHugger Robot
9e110eb6b9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 43e8a4480b -s ours am: 8dab2de988 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f644a2e0801e5ab9278f242b7607e92f0c38824
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 20:36:18 +00:00
Bill Yi
6489f5e4f2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ebc354ab68 -s ours am: 573755927f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4084613fb60ad90de32e606a56ea132e7af147fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 20:35:56 +00:00
TreeHugger Robot
00e2fe73cf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 691196e900 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I36084e6cb3425afdf774b5e2e2dc0cca945c0c06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 20:14:47 +00:00
Bill Yi
ebb7230ac0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c9a4f35a74 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iff72643cc11108efead021f3de564dc3a4121f4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 20:14:30 +00:00
TreeHugger Robot
8dab2de988 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 43e8a4480b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I74a45513f5c9392c3faf45e1c474e74c6b7f6767
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 20:14:14 +00:00
Bill Yi
573755927f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ebc354ab68 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I10c725ab05a8ae996cfc11d24b241e5dc8ae99aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 20:13:55 +00:00
TreeHugger Robot
691196e900 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-11-23 19:38:40 +00:00
TreeHugger Robot
43e8a4480b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-11-23 19:38:40 +00:00
TreeHugger Robot
a41a0ef6fd Merge "Add page id enum for storage settings" 2022-11-23 18:41:16 +00:00
TreeHugger Robot
d6eed34259 Merge "Add page id enum of dialog under Open by default page" 2022-11-23 18:41:10 +00:00
Bonian Chen
7fabcb2a37 Merge "[Settings] Add some log" am: 190b9ae3fa am: cd59cb983e am: 724dfbda22 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2313405

Change-Id: Icb61624f11f45e25dfb07c2d19e5386ce4c468bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 18:39:21 +00:00
Bonian Chen
724dfbda22 Merge "[Settings] Add some log" am: 190b9ae3fa am: cd59cb983e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2313405

Change-Id: Ieb35b981079c558937f73ec3779018a1deaa56b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 16:27:42 +00:00
Bonian Chen
cd59cb983e Merge "[Settings] Add some log" am: 190b9ae3fa 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2313405

Change-Id: I79999bda10e0be0df44fc73d8023e7f35d9f2730
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 15:59:17 +00:00
Bonian Chen
190b9ae3fa Merge "[Settings] Add some log" 2022-11-23 15:15:47 +00:00
TreeHugger Robot
2de94ad9e7 Merge "Fix FingerprintEnrollIntroFragment buttons" 2022-11-23 14:31:09 +00:00
Bonian Chen
e76bcc5388 [Settings] Code refactor 
Wrap reset options into an Object, for better supporting

Bug: 260034791
Test: auto testing
Change-Id: I98cc12440414077b600bba0b5598c887608419cc
 2022-11-23 12:52:55 +00:00
Bonian Chen
c2776e0e67 [Settings] Add some log 
Add log to support debugging.

Bug: 259611847
Test: auto test
Change-Id: Ic7ea410604794e3b9caa8ab955e1406578a25425
 2022-11-23 12:36:17 +00:00
Milton Wu
505be79cc5 Fix FingerprintEnrollIntroFragment buttons 
1. Fix FingerprintEnrollIntroFragment button status not sync after
   rotation.
2. Finetune code orders in FingerprintEnrollmentActivity.onCreate(),
3. Refine some API names and java doc

Bug: 260205364
Test: atest AutoCredentialViewModelTest
            FingerprintEnrollIntroViewModelTest
Test: Manually test rotation with different display size
Change-Id: Ib992e10a1c90e3bbac6cf73114df4e96b5ab0a03
 2022-11-23 20:15:04 +08:00
TreeHugger Robot
8aa8d6314f Merge "Remove isSticky true for SplitPlaceholderRule" into tm-qpr-dev am: fa6f92aa74 am: 2d6e3bb5a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20549489

Change-Id: I0b3af1b467866320226a02ff37f51d0616d69837
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 10:34:44 +00:00
TreeHugger Robot
2d6e3bb5a7 Merge "Remove isSticky true for SplitPlaceholderRule" into tm-qpr-dev am: fa6f92aa74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20549489

Change-Id: I8cc3a1d353b86fbf84e40f1d4932955c9a72aa42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 09:58:15 +00:00
TreeHugger Robot
fa6f92aa74 Merge "Remove isSticky true for SplitPlaceholderRule" into tm-qpr-dev 2022-11-23 09:19:27 +00:00
Bonian Chen
0f629e4e81 [automerger skipped] Merge "[Settings] Additional route for dismiss activity dialog" am: ea537afa54 -s ours am: d38d75bc0c -s ours am: 743baac904 -s ours 
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b is already in history

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

Change-Id: I7a0fc88825c1acd17d5e4c014e6365204bf6ea8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 08:34:04 +00:00
Bonian Chen
9318a84c39 [automerger skipped] [Settings] Additional route for dismiss activity dialog am: 68c294df24 -s ours am: 32884e3e97 -s ours am: 4218f2defd -s ours 
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b is already in history

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

Change-Id: Ic5c35262baeb399c80deb0b70f33823cb42d220e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 08:33:57 +00:00
TreeHugger Robot
926df61437 Merge "Keep "Resetting your internet" when screen rotates" 2022-11-23 08:18:03 +00:00
Bonian Chen
743baac904 [automerger skipped] Merge "[Settings] Additional route for dismiss activity dialog" am: ea537afa54 -s ours am: d38d75bc0c -s ours 
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b is already in history

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

Change-Id: I27cc4bb4ae1175a400e7943759411793c2584b4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 07:57:33 +00:00
Bonian Chen
4218f2defd [automerger skipped] [Settings] Additional route for dismiss activity dialog am: 68c294df24 -s ours am: 32884e3e97 -s ours 
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b is already in history

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

Change-Id: I329962649039fed9936a353b52f24eed0bd6d538
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 07:57:31 +00:00
TreeHugger Robot
0f0c45c479 Merge "Align same wording style with Settings main switch" 2022-11-23 07:50:04 +00:00
Kuan Wang
5e79362920 Merge "Clean up unused files for Battery Usage in SettingsGoogle, which have been moved into Settings." 2022-11-23 07:36:42 +00:00
Bonian Chen
d38d75bc0c [automerger skipped] Merge "[Settings] Additional route for dismiss activity dialog" am: ea537afa54 -s ours 
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b is already in history

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

Change-Id: I9b43b0167ce54a8d41dc34850535708eaa60f859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 07:29:09 +00:00
Bonian Chen
32884e3e97 [automerger skipped] [Settings] Additional route for dismiss activity dialog am: 68c294df24 -s ours 
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b is already in history

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

Change-Id: I2286c88e39b0111bf804fb64d658ba6ea064224a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 07:29:07 +00:00
SongFerng Wang
d6189fab1c Merge "Remove "Backup Calling" button from Settings UI" 2022-11-23 07:22:08 +00:00
Bill Yi
402fd0e56f [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c84754ed13 
Blank merge reason: commit message contains skip directive

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

Change-Id: I69118606ffe9fb3dd01b4b27d331b6cd39de516f
 2022-11-23 07:08:28 +00:00
Bill Yi
28a33ffdc5 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 831453a97c 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ie2c5f6154bdd13bde4fc34c5031e0fce577ac5e2
 2022-11-23 07:08:11 +00:00
Bonian Chen
ea537afa54 Merge "[Settings] Additional route for dismiss activity dialog" 2022-11-23 07:02:20 +00:00
Arc Wang
f6d712c7b7 Remove isSticky true for SplitPlaceholderRule 
SplitPlaceholderRule#isSticky determines whether the placeholder
will show on top in a smaller window size after it first appeared
in a split with sufficient minimum width.

This change will show Settings homepage while users rotate
device to portrait mode and show Settings 1-pane UI.

Bug: 256115335
Test: manual visual
      1. Set font size and display size to large.
      2. Launch Setting app in landscape and rotate to portrait.
Change-Id: Ie955f8b8db3bbe42dba6300608774582ef150590
 2022-11-23 14:44:53 +08:00