PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,975 Commits 1 Branch 0 Tags
5992daa3504a9fe416ded4bcd22a7255ab3d5adc
Commit Graph

85975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yanting Yang
b0ce558a3e Rephrase dialog message of clear storage dialog for security concern am: 6024ea553a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101567

Change-Id: Ia563798d9e45ec18a445b3515a6cd5f41957cf1d
 2021-11-03 19:48:20 +00:00
TreeHugger Robot
0fd394db07 Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-dev am: 3e23903ff8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101565

Change-Id: Id7b8ba483f8b323c0e658d66a62c4c58f6dc17a0
 2021-11-03 19:47:39 +00:00
TreeHugger Robot
3e23903ff8 Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-dev 2021-11-03 19:29:35 +00:00
Bill Yi
1b281028c2 [automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 9d0eba50aa -s ours am: eda6485a4b -s ours am: 56abf6d05d -s ours 
am skip reason: Merged-In I62be3678022753eaba32209c33f95edf220294f1 with SHA-1 a4197a7aa1 is already in history

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

Change-Id: Ifeae8b849e50c7a6874032bd5255e56c2f566e0b
 2021-11-03 18:46:14 +00:00
Bill Yi
56abf6d05d [automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 9d0eba50aa -s ours am: eda6485a4b -s ours 
am skip reason: Merged-In I62be3678022753eaba32209c33f95edf220294f1 with SHA-1 a4197a7aa1 is already in history

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

Change-Id: Icc33406e496cfc45f87c8fc7fbc739d08b0f4ca0
 2021-11-03 18:25:45 +00:00
Bill Yi
eda6485a4b [automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 9d0eba50aa -s ours 
am skip reason: Merged-In I62be3678022753eaba32209c33f95edf220294f1 with SHA-1 a4197a7aa1 is already in history

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

Change-Id: I095493a9f49902c2bfe20a0f5464f86ae50ed536
 2021-11-03 18:08:25 +00:00
Bill Yi
9d0eba50aa Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" 2021-11-03 17:50:39 +00:00
Bill Yi
5e67298476 Merge SP1A.211105.004 to aosp-master - DO NOT MERGE 
Merged-In: I62be3678022753eaba32209c33f95edf220294f1
Merged-In: I1d17526b87d442bc3513a1e7f526fcf5ff11e881
Change-Id: I63bda2d4f97e2c35d317675624c69d45e6dfbcaa
 2021-11-02 21:07:55 -07:00
The Android Open Source Project
27067e7dd8 [automerger skipped] Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE am: e5d3401aa1 -s ours am: 51c0a2cb6e -s ours 
am skip reason: Merged-In I1d17526b87d442bc3513a1e7f526fcf5ff11e881 with SHA-1 e6ebfee220 is already in history

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

Change-Id: If522424ffa85db50121cc40410ed12394a5b8af0
 2021-11-03 00:12:29 +00:00
The Android Open Source Project
51c0a2cb6e [automerger skipped] Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE am: e5d3401aa1 -s ours 
am skip reason: Merged-In I1d17526b87d442bc3513a1e7f526fcf5ff11e881 with SHA-1 e6ebfee220 is already in history

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

Change-Id: Iced88b946a227a369a465b018226d38b9fb69c43
 2021-11-02 23:55:40 +00:00
The Android Open Source Project
e5d3401aa1 Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE 
Merged-In: I1d17526b87d442bc3513a1e7f526fcf5ff11e881
Change-Id: Ib2e431d8d28a3b0da86ec65cad345d8adda041ec
 2021-11-02 14:11:57 -07:00
tim peng
63ec94e217 Merge "Phone fails to switch channel mode from stereo to mono" am: 41cfaa9f29 am: a4197a7aa1 am: e6ebfee220 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1873736

Change-Id: Ie0838ac36286b679f0ed5158ce97e0669f1fe2db
 2021-11-01 07:01:31 +00:00
tim peng
e6ebfee220 Merge "Phone fails to switch channel mode from stereo to mono" am: 41cfaa9f29 am: a4197a7aa1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1873736

Change-Id: I1d17526b87d442bc3513a1e7f526fcf5ff11e881
 2021-11-01 06:36:53 +00:00
tim peng
a4197a7aa1 Merge "Phone fails to switch channel mode from stereo to mono" am: 41cfaa9f29 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1873736

Change-Id: I62be3678022753eaba32209c33f95edf220294f1
 2021-11-01 06:22:15 +00:00
TreeHugger Robot
17d3f20ebf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33b0ddcb9f -s ours am: 803a4a84a8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4f9cc37ab3adf455c08c3b017fc1fc23e3d8c669
 2021-11-01 06:17:05 +00:00
TreeHugger Robot
c95398214f [automerger skipped] Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d" into sc-qpr1-dev am: 15e9a44b45 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib281d8c897b86bb6874dd775b046d10276f97983
 2021-11-01 06:16:36 +00:00
TreeHugger Robot
348a01d9fe Merge changes from topic "presubmit-am-11a27b06803045468001e263b4b441f0" into sc-qpr1-dev am: 49400133f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720

Change-Id: Ieba625798ef14be588e5dff5ca3c30ea8af50974
 2021-11-01 06:16:34 +00:00
Bill Yi
c6a1634ddd [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d am: 88711716d8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9ca17f255ee6931ff4fc58037f7d1e9938c29b35
 2021-11-01 06:16:33 +00:00
TreeHugger Robot
ba70207c32 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 07709bfd9e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I69192d5e771481b661a57df56af96ee381266152
 2021-11-01 06:15:52 +00:00
TreeHugger Robot
89064bf1a0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b41f6a01a3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id5baf58d797f4636670fed2e29f23240cc4ad6e6
 2021-11-01 06:10:16 +00:00
TreeHugger Robot
0bf0236ef5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33b0ddcb9f -s ours am: 3ef8ed0bac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibe25649cc892e6767cdbd40fba4a9ab16c26cb90
 2021-11-01 06:08:54 +00:00
Automerger Merge Worker
ebb11f1e6e Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eb45210f6a am: c0eaec8037 -s ours" into sc-qpr1-dev-plus-aosp 2021-11-01 06:08:44 +00:00
TreeHugger Robot
803a4a84a8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33b0ddcb9f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic300b54ea954c625fcd08a35b286ecf9d043aa50
 2021-11-01 06:08:42 +00:00
Bill Yi
433960b45e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eb45210f6a am: c0eaec8037 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I736645f705abdc03f0605ff32d79c83f9a600366
 2021-11-01 06:08:42 +00:00
Bill Yi
4080a4ffd4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eb45210f6a -s ours am: d497dee907 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9b5a544ae99432f715513b7f027b224390706e47
 2021-11-01 06:08:41 +00:00
TreeHugger Robot
671b1b64a7 [automerger skipped] Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d" into sc-dev-plus-aosp am: dfb6af177f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If4b3001c37cd7cf10fe0e93e3d470c93f818fca0
 2021-11-01 06:07:51 +00:00
Bill Yi
94b058a0c1 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d am: 4f200606a9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibeeacf435f58eb6f036b97f7534c544bdf76bf1d
 2021-11-01 06:07:51 +00:00
TreeHugger Robot
3ef8ed0bac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33b0ddcb9f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie05f2dd5247c2582f411909a3158feb48e38868e
 2021-11-01 06:07:03 +00:00
Bill Yi
d497dee907 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eb45210f6a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I49b58ceae1ee8e4fafb5cd304f589a4a300347db
 2021-11-01 06:06:48 +00:00
tim peng
41cfaa9f29 Merge "Phone fails to switch channel mode from stereo to mono" 2021-11-01 06:02:26 +00:00
TreeHugger Robot
33b0ddcb9f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-11-01 05:46:15 +00:00
TreeHugger Robot
15e9a44b45 Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d" into sc-qpr1-dev 2021-11-01 05:46:15 +00:00
TreeHugger Robot
49400133f1 Merge changes from topic "presubmit-am-11a27b06803045468001e263b4b441f0" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d
  Import translations. DO NOT MERGE ANYWHERE
 2021-11-01 05:46:15 +00:00
TreeHugger Robot
dfb6af177f Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d" into sc-dev-plus-aosp 2021-11-01 05:46:15 +00:00
TreeHugger Robot
07709bfd9e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-11-01 05:45:59 +00:00
TreeHugger Robot
b41f6a01a3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-11-01 05:45:56 +00:00
Bill Yi
2225c633ba Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2cf4ffb1e23f9c01b186dd8c65988da06d008c5b
 2021-10-31 02:31:38 +00:00
Bill Yi
c0eaec8037 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eb45210f6a 
Blank merge reason: commit message contains skip directive

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

Change-Id: I424e234e0577d940e6da8a625b4797a292a759c6
 2021-10-31 02:28:09 +00:00
Bill Yi
eb45210f6a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I78c311e7d058b10e7b00112ceda5e3ed03381370
 2021-10-31 02:28:03 +00:00
Bill Yi
3931bcc9cb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I698355eed5bae2d3d247b65f0b41caefbd821d3a
 2021-10-31 02:18:46 +00:00
Bill Yi
afcfca4582 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d 
Blank merge reason: commit message contains skip directive

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

Change-Id: Iaf86f2c81249458d953ebae715c53b83f8570dbe
 2021-10-31 02:17:25 +00:00
Bill Yi
7e2d3bd5ff [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d 
Blank merge reason: commit message contains skip directive

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

Change-Id: I78ebb7336ae52609b9372f4659b6a8cf4483e942
 2021-10-31 02:17:25 +00:00
Bill Yi
88711716d8 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d 
Blank merge reason: commit message contains skip directive

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

Change-Id: Id2247aaee46863a606dad86c2cc62ca2bd4c6592
 2021-10-31 02:17:24 +00:00
Bill Yi
4f200606a9 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d 
Blank merge reason: commit message contains skip directive

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

Change-Id: I15b4087acf755a12fda81f4de18caf0f532165fa
 2021-10-31 02:17:24 +00:00
Bill Yi
6ac425087d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7cf4620b089df8bac86ad67c4efffe0ae3f5ad95
 2021-10-31 02:17:16 +00:00
Tim Peng
07b3675717 Phone fails to switch channel mode from stereo to mono 
-Set codec to SBC when HD audio is off

Bug: 194349060
Test: make -j50 RunSettingsRoboTests

Change-Id: Iae4aa3f1d77350f5b4d91e7a687e048091c1daea
 2021-10-29 03:28:14 +00:00
TreeHugger Robot
c26248da5b Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev am: 649135c11c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16093937

Change-Id: I60a0411bb2b21ff8dc9fac37692ddf482ce2e6ab
 2021-10-27 18:52:28 +00:00
TreeHugger Robot
649135c11c Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev 2021-10-27 18:24:26 +00:00
TreeHugger Robot
0d439097e7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97 -s ours am: 48b79c4f7d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0056b7b04e308d6bdeb2533c97fad53d21697f31
 2021-10-27 02:11:16 +00:00
TreeHugger Robot
2f0041e4d6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 778ae33620 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I47a21aefaf98b243da8b0e5e582b446e06cf1d38
 2021-10-27 02:11:11 +00:00