PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,401 Commits 1 Branch 0 Tags
73becab67217341775ee123d89e2a348d1276d0c
Commit Graph

112401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
aaa28fb0e7 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ca18853bab 
Blank merge reason: commit message contains skip directive

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

Change-Id: I7923220a59923528c5ca01061d950381fb79a823
 2023-04-22 14:16:37 +00:00
Bill Yi
efc9e1994c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iebd01ca77113b13be8c469a3105249fe6b241843
 2023-04-21 23:46:19 -07:00
Bill Yi
c416adc1df Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I50740b630f3d8ad4d10d3ba3774007bef0282672
 2023-04-21 23:43:10 -07:00
Bill Yi
a05355cc0a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9526dff7032a7247775459386d64669e27068665
 2023-04-21 23:39:13 -07:00
Bill Yi
ca18853bab Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If34cd71ef08b67f4463d83cd1afd5361bae4b873
 2023-04-21 17:17:53 -07:00
Xin Li
57c5a99b9f [automerger skipped] Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master am: f64573ee7c -s ours 
am skip reason: Merged-In I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76 with SHA-1 a568dc677b is already in history

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

Change-Id: Ica592b8926aca252eb1384319bd886b633ac185f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 18:18:31 +00:00
Xin Li
b27298c4fe [automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 752715c5ca -s ours 
am skip reason: Merged-In I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76 with SHA-1 a568dc677b is already in history

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

Change-Id: I384b965aecd6723b49042933cd1116365da09f57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 18:15:13 +00:00
Xin Li
f64573ee7c Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master 2023-04-21 17:40:03 +00:00
Presubmit Automerger Backend
56c8b39d51 [automerge] Replace the SlicePreference with Preference 2p: 794fc58235 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956

Bug: 270544054
Change-Id: I88bb34649b2a1da21e6a3a36d90bd32c17ffb5ae
 2023-04-21 15:08:44 +00:00
SongFerngWang
794fc58235 Replace the SlicePreference with Preference 
The Settings' 2 panel did not support SlicePreference, since it
always open activity with NEW_TASK and it casues the settings can't
set new page at right side.

Bug: 270544054
Test: build pass. local test: the phone pair the buds with fastpair, and
then check the slice preferences.
atest BlockingPrefWithSliceControllerTest (pass)

Change-Id: I0e8abfd284492f04ab322a5bed13741fc6b25b34
 2023-04-21 23:08:06 +08:00
Zoey Chen
2fca3dfff0 [Settings] Update code owner 
Bug: NA
Test: build pass
Change-Id: I6885b8655b8b65511beb3d20732335239f7e3a0f
 2023-04-21 03:26:00 +00:00
Bill Yi
3e8d5a6747 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 367bedb886 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I54ba4dacd8d625dde04b8fcf72ac7131b6d498f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 18:44:39 +00:00
Bill Yi
7d7a461c85 Merge changes from topic "tc_change_23041807_35" into tm-qpr-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4ff10a38f4
  Import translations. DO NOT MERGE ANYWHERE
 2023-04-19 17:59:19 +00:00
Bill Yi
367bedb886 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-04-19 17:59:16 +00:00
Diya Bera
8a31106496 Merge "Adding owners" am: b1aabec0db am: 49ea4e5d22 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2546170

Change-Id: Ibfc5a6684f98c842f95f5cb125310d89a0035644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 17:39:42 +00:00
Diya Bera
49ea4e5d22 Merge "Adding owners" am: b1aabec0db 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2546170

Change-Id: Ib03f9e473201e6a826cb7810e32b00ad1e3da965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 17:11:26 +00:00
Diya Bera
b1aabec0db Merge "Adding owners" 2023-04-19 16:30:18 +00:00
Xin Li
752715c5ca Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 
Bug: 275386652
Merged-In: I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76
Change-Id: If148c3db02f9c6a8845c9ddc02eb466329dddd08
 2023-04-18 16:34:29 -07:00
Diya Bera
33fab7e415 Adding owners 
Test: N/A
Bug: 278741020
Change-Id: Ife62f56fd0e3c83427347365a1eebfad3ec3ed6d
 2023-04-18 22:56:31 +00:00
Bill Yi
411d527b94 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 26ca87ddff 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ie14298c9668f64979607171a25d97bae63266787
 2023-04-18 14:31:18 +00:00
Bill Yi
7fc6abdfb9 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4ff10a38f4 
Blank merge reason: commit message contains skip directive

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

Change-Id: Id8ec8521ee5f526a2e3e88c310371115cee8011c
 2023-04-18 14:29:59 +00:00
Bill Yi
4ff10a38f4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1c1512d129c76bdf99c95f921b05177f361736a7
 2023-04-17 21:33:14 -07:00
Bill Yi
26ca87ddff Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie1f7a198b79b22f7e52cda13589a55549189524a
 2023-04-17 21:20:25 -07:00
Zaiyue Xue
205d8249a7 String change to highlight calculation stopped at last even hour 
Bug: 278022447
Fix: 278022447
Test: manual
Change-Id: Ia04ae7c7cb4c7ebdd40f4aa3df05b34d2ce66628
Merged-In: Ia08dea791bb72113719fd1316e8e9587a96eaef1
 2023-04-17 14:58:48 +08:00
Treehugger Robot
0369c601c0 Merge "Only admin users may change private DNS settings" into tm-qpr-dev am: a5a31037cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22414528

Change-Id: Ieb88410bf1e820a660f7d650194cd426a6f3eaaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 15:30:04 +00:00
Treehugger Robot
a5a31037cc Merge "Only admin users may change private DNS settings" into tm-qpr-dev 2023-04-14 14:53:48 +00:00
Bill Yi
938a981ff6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c7550f62e7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08a06bda42f5180f702b93e5285c374d03606cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 18:33:28 +00:00
Chiachang Wang
cd33a0fa88 Merge "Populate ipsecSecret field in VpnProfile" am: 4c5334809d am: 4770d017dc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530499

Change-Id: I7fb125aacace306aec461e64ae7d448dcec10949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 09:54:49 +00:00
Chiachang Wang
4770d017dc Merge "Populate ipsecSecret field in VpnProfile" am: 4c5334809d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530499

Change-Id: I0094a812955100bf9fae19dfae028ae33167caa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 09:25:49 +00:00
Chiachang Wang
4c5334809d Merge "Populate ipsecSecret field in VpnProfile" 2023-04-13 08:53:57 +00:00
chiachangwang
02156d600d Populate ipsecSecret field in VpnProfile 
This commit fixes IKEv2 RSA VPN could not be an always-on VPN
issue to populate ipsecSecret field from "IPsec user certificate".

Fields ipsecUserCert and ipsecSecret are required for a valid
VpnProfile. The ipsecSecret field in VpnProfile should be
populated from "IPsec user certificate" field. It's the matching
private key.

Bug: 263610164
Bug: 230727391
Test: Verify if IKEv2 RSA VPN can setup successfully and set as
      as always on VPN
Change-Id: I605b35fff9e399ee7b82d8441137984992ab2907
 2023-04-13 07:47:53 +00:00
Treehugger Robot
2f0557495d [automerger skipped] Merge "Merge TQ2A.230405.003" am: fd8670a4c1 am: 5d93cea1c7 -s ours 
am skip reason: skipped by user delphij

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

Change-Id: Iff5558b9267a6282536f16601d67959e58c347d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 20:23:01 +00:00
Treehugger Robot
5d93cea1c7 Merge "Merge TQ2A.230405.003" am: fd8670a4c1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528258

Change-Id: I2ebe468438118d275db0ee38a0c0c624207bd771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 19:00:58 +00:00
Treehugger Robot
fd8670a4c1 Merge "Merge TQ2A.230405.003" 2023-04-12 17:22:25 +00:00
Treehugger Robot
525b567db3 Merge "Align Settings and SystemUI packageName references" am: 1452f7dd3a am: ff6def3c7c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530819

Change-Id: I4dfc995e7185c5cb7a599156d71a198bd434cb74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 10:18:17 +00:00
Treehugger Robot
ff6def3c7c Merge "Align Settings and SystemUI packageName references" am: 1452f7dd3a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530819

Change-Id: If249a6b219c344edbddade320f06c9f512bffd18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 09:48:24 +00:00
Treehugger Robot
1452f7dd3a Merge "Align Settings and SystemUI packageName references" 2023-04-12 08:53:22 +00:00
David Liu
a6cd016e9a Merge "Update Settings owners list" am: 1a811a130a am: ae70edc7f5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2531959

Change-Id: Ife0d2b27db2c12e2129bc0d39fc521e41d59df59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 04:44:30 +00:00
David Liu
ae70edc7f5 Merge "Update Settings owners list" am: 1a811a130a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2531959

Change-Id: I921670dd1f5c3b39615d42027de10ff3ee8eb3d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 04:15:38 +00:00
David Liu
1a811a130a Merge "Update Settings owners list" 2023-04-12 03:50:16 +00:00
David Liu
0b9bfd3c1f Update Settings owners list 
Change-Id: Idb59b4ebf8d252d31877a6ed2203e7f66fc6e6ff
 2023-04-12 01:48:48 +00:00
Shen Lin
57b03b309d Align Settings and SystemUI packageName references 
This CL migrated both Settings and SystemUI packageName into Utils.java
to align references.

Bug: 277651621
Test: m Settings -j128
Change-Id: I3d6808de76120a2ddbbed4980b8a65cec81502c9
 2023-04-11 10:27:04 +00:00
Bill Yi
c7550f62e7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5cbdfde1f4c34ad1d233e79f9b1464679d12bf3d
 2023-04-10 23:59:36 -07:00
Xin Li
e11304fe3d Merge TQ2A.230405.003 
Bug: 271343657
Merged-In: I945490ef1e62af479a732c9a260ed94bdd8bc313
Change-Id: Ib47a648d9e431f09196d292083abd570d33dcd50
 2023-04-10 23:57:24 -07:00
Chris Antol
626dff2398 Merge "Update Settings owners list" am: 8bf186bcf8 am: 4e2050a17d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528132

Change-Id: I67b9db14578c047f5a73e8c5fd975e0e8e955eb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-11 01:21:15 +00:00
Chris Antol
4e2050a17d Merge "Update Settings owners list" am: 8bf186bcf8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2528132

Change-Id: Ia2be910bc9aa3bf6d693f6012eeae94a51e27d64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-11 00:50:30 +00:00
Chris Antol
8bf186bcf8 Merge "Update Settings owners list" 2023-04-11 00:03:40 +00:00
Chris Antol
b5237e60d8 Update Settings owners list 
Change-Id: If950f63c65ecc6313f7096c94c3a5a9bb48be529
 2023-04-10 22:57:24 +00:00
Bill Yi
efc9c4ab6b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a568dc677b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2039a343cfc2c7ba6ee6409e2649bf0d7aed6f7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 15:21:01 +00:00
Bill Yi
a568dc677b Import translations. DO NOT MERGE ANYWHERE 
BUG:271250248

Auto-generated-cl: translation import
Change-Id: I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76
 2023-04-06 20:54:16 -07:00