PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,183 Commits 1 Branch 0 Tags
4f200606a9760820ba216e3d802dbaf48024fa2c
Commit Graph

85183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
TreeHugger Robot
06cca879db [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97 -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: I414e913bdd299cbff9893077cfbf52e2811cde5f
 2021-10-27 02:03:25 +00:00
TreeHugger Robot
9bd68e3a97 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-10-27 01:50:49 +00:00
Bill Yi
49389665fa Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6a2e84d9174edd3eaff854cd7197147fa7888baa
 2021-10-26 18:03:56 +00:00
Bill Yi
8e49756934 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ib88fd011aa4e79ac0fbf689dd5c91e249865a767
 2021-10-26 17:52:35 +00:00
Bill Yi
a6de7ad6b8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ied645d81839a1c5b98efcdd508a69aeb291a8feb
 2021-10-26 17:52:29 +00:00
Bill Yi
4bb4205b98 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 247075dcd5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic29a34b7823931a043d7b419a11dd69118e2f750
 2021-10-22 01:17:57 +00:00
Weng Su
8cf3250517 Merge "Keep compatibility for old WiFi shortcut" am: ab7640dcd9 am: 400e5b0fba 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853101

Change-Id: Idb08b9650e7c5efce4ab40eb949ccab0e5949333
 2021-10-21 13:10:56 +00:00
Weng Su
400e5b0fba Merge "Keep compatibility for old WiFi shortcut" am: ab7640dcd9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853101

Change-Id: I44f373cab6a829af3e08ab95d62d53a42516d41a
 2021-10-21 12:56:02 +00:00
Weng Su
ab7640dcd9 Merge "Keep compatibility for old WiFi shortcut" 2021-10-21 12:38:12 +00:00
Bill Yi
247075dcd5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia2cd9e21b6ad60ef3f4ebabdc7fbe77c752c34f0
 2021-10-21 08:12:37 +00:00
Bill Yi
b4a75e746e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fd72130e9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I97c510fd3f22aa49b0f17150ef705cb469a0bd86
 2021-10-15 14:39:56 +00:00
Bill Yi
0fd72130e9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ieb86bcc7d7e064bcb07a11534b76be5be8eb9cca
 2021-10-15 04:43:13 +00:00
Roopa Sattiraju
ebc8a9fd1c Merge "Phone fails to switch channel mode from stereo to mono" into stage-aosp-master am: f2295126b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15942380

Change-Id: I3eb45e51e9e4cb2a5940d4fd2c928b509f49dc5d
 2021-10-14 18:32:20 +00:00
Roopa Sattiraju
f2295126b6 Merge "Phone fails to switch channel mode from stereo to mono" into stage-aosp-master 2021-10-14 18:17:20 +00:00
Steven Moreland
0fbe8bd395 Merge "getBlobAshmemSize -> getOpenAshmemSize" am: 5d30c2de37 am: 90181319da 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1856673

Change-Id: I270b25f7408e3557fdce3b87cf9b478bb01c46cd
 2021-10-14 18:02:39 +00:00
Steven Moreland
90181319da Merge "getBlobAshmemSize -> getOpenAshmemSize" am: 5d30c2de37 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1856673

Change-Id: I1ecba7ee53fead58d83d159f2849e3798e7198fd
 2021-10-14 17:48:04 +00:00
Steven Moreland
5d30c2de37 Merge "getBlobAshmemSize -> getOpenAshmemSize" 2021-10-14 17:43:16 +00:00
Steven Moreland
519546ce3e getBlobAshmemSize -> getOpenAshmemSize 
This API returns the total size of all ashmem memory that is in FDs that
is owned by a Parcel object. It was renamed a while ago, but the name
was never updated in Java.

Bug: 202029388
Test: N/A
Change-Id: Icc428063083110952cf3951721d69cbb919429b1
 2021-10-13 11:01:10 -07:00
Bonian Chen
640fc7d172 Merge "Revert "[Settings] Code refactor DataSaverSummary"" am: b0a2857ec5 am: dcd13abd65 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853597

Change-Id: I6eb3eac6886ba2011c65df9237474ecbef0e3b32
 2021-10-12 07:05:41 +00:00
Bonian Chen
dcd13abd65 Merge "Revert "[Settings] Code refactor DataSaverSummary"" am: b0a2857ec5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853597

Change-Id: Ibdca526adba3a2fb79cec39101832d53d87b46b7
 2021-10-12 06:50:56 +00:00
Bonian Chen
b0a2857ec5 Merge "Revert "[Settings] Code refactor DataSaverSummary"" 2021-10-12 06:36:35 +00:00
Treehugger Robot
a300d2ecaa Merge "[Settings] Code refactor DataSaverSummary" am: e7b211b35e am: ef03b3a361 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853594

Change-Id: Iaabb7552c607fe883f4bffa9debf75f06eff1d0e
 2021-10-12 06:19:35 +00:00
Bonian Chen
16b298ef92 Revert "[Settings] Code refactor DataSaverSummary" 
This reverts commit 0ea486d1e5.

Reason for revert: build breakage

Change-Id: Id4c7689ae6f82ab05987365551a06debc1676aa5
 2021-10-12 06:14:17 +00:00
Treehugger Robot
ef03b3a361 Merge "[Settings] Code refactor DataSaverSummary" am: e7b211b35e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853594

Change-Id: I8e4f9e3429948ba709dfa40eb56f7c428813590c
 2021-10-12 06:09:37 +00:00
Treehugger Robot
e7b211b35e Merge "[Settings] Code refactor DataSaverSummary" 2021-10-12 05:56:21 +00:00
Bonian Chen
0ea486d1e5 [Settings] Code refactor DataSaverSummary 
Remove unused Callbacks.

Bug: 202792574
Test: local and presubmit
Change-Id: I185c083fd1621b0256e55339e9688d6b190dee32
 2021-10-12 11:53:32 +08:00
David Magno
6031a6ef69 Keep compatibility for old WiFi shortcut 
WifiSettings2Activity has been replaced by WifiSettingsActivity

Test: Create a shortcut to WifiSettings in Android 11, update to Android 12 and test it
Bug: 202534606
Change-Id: I042eb3ae0bc0af6c42221c876cc4ea7b0a6de0b7
 2021-10-11 18:26:09 +02:00
Bill Yi
fcdcf5a0a1 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4e278709 
Blank merge reason: commit message contains skip directive

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

Change-Id: Iba6c62591668b487a0d31665e28d1ea37956fb44
 2021-10-08 20:03:37 +00:00
Bill Yi
2c4e278709 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icbd3c3d47b1f4d87866e79697db179d113e14d32
 2021-10-08 20:03:23 +00:00
Xin Li
b2fadd3b8a [automerger skipped] Merge "Merge Android 12" am: 433825250d -s ours am: 7062f8326d -s ours 
am skip reason: Merged-In Ib853137811901796f73e4d720accb3249a7db963 with SHA-1 8aa74d1ad4 is already in history

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

Change-Id: I6aa40f4ae668620b39543f7a147c49b4689dc9f2
 2021-10-08 01:39:33 +00:00
Xin Li
7062f8326d [automerger skipped] Merge "Merge Android 12" am: 433825250d -s ours 
am skip reason: Merged-In Ib853137811901796f73e4d720accb3249a7db963 with SHA-1 8aa74d1ad4 is already in history

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

Change-Id: I173e87e7a921aea51b68edc5056925bb21e7dbba
 2021-10-08 01:21:41 +00:00
Xin Li
433825250d Merge "Merge Android 12" 2021-10-07 23:50:04 +00:00
TreeHugger Robot
824f21616b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6228bd3469 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8182f906e121937261ad6ee30c22569d3ef142f1
 2021-10-07 08:50:25 +00:00
TreeHugger Robot
6228bd3469 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-10-07 08:40:50 +00:00
Bill Yi
e57cfc0865 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iaaafbbba20f60a2937e5947b4a90e13fb8a6d3ad
 2021-10-07 02:33:44 +00:00
TreeHugger Robot
445ea21c1e Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 am: 07fe34aa57 am: f5e2d0dcb3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: I67bb72dac3971103b4bf91cee8c63ef0ce3674df
 2021-10-07 01:16:42 +00:00
TreeHugger Robot
b13e76c167 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 am: f40e2700d3 am: 6e2eefe2c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: If2f46fa7b3d684c5a3751b41471ba80f7dbe7f6d
 2021-10-07 01:16:33 +00:00
TreeHugger Robot
f5e2d0dcb3 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 am: 07fe34aa57 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: Ic13a97f4c56063faccadc41f0a668c5a936547b6
 2021-10-07 01:01:54 +00:00
TreeHugger Robot
6e2eefe2c5 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 am: f40e2700d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: Id3557d671fd5cf5f4151cad2dabf8761a771c7fb
 2021-10-07 00:57:09 +00:00
TreeHugger Robot
07fe34aa57 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: Ic07988e901c9f8f4784c38470a9454c60dc826bf
 2021-10-07 00:44:18 +00:00
TreeHugger Robot
f40e2700d3 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 am: 94768f3b18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: I991b5ba56c85c943009cf15952ed2d02241ba96a
 2021-10-07 00:44:18 +00:00
TreeHugger Robot
94768f3b18 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e am: 81a3e690c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: Id17befe12f90736d477de4f52d3bd101228a68f0
 2021-10-07 00:29:41 +00:00
TreeHugger Robot
81a3e690c1 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev am: 2642a3c73e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15994985

Change-Id: I5a5227a53faaadc78e1bebf725671f04adb0f2c9
 2021-10-07 00:17:38 +00:00
TreeHugger Robot
4f63f0c9e1 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-dev am: df95750605 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15987304

Change-Id: I07e1c26b0635aad836cc2b54cefb9ca7428823b3
 2021-10-07 00:07:37 +00:00
TreeHugger Robot
2642a3c73e Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into qt-dev 2021-10-07 00:03:46 +00:00
TreeHugger Robot
df95750605 Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-dev 2021-10-06 23:54:52 +00:00
Xin Li
47a40615ea Merge Android 12 
Bug: 202323961
Merged-In: Ib853137811901796f73e4d720accb3249a7db963
Change-Id: I2febbf79bb9858cd6c7a5e1c47bcecbac83398fd
 2021-10-06 22:53:58 +00:00
Chen Chen
d67647327d Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into rvc-qpr-dev am: 7efc9b451c am: 3449eccd85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995587

Change-Id: I2f629f97fe2284a5bb916782b9064f4bfb3f0e28
 2021-10-06 22:42:27 +00:00