Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,211 Commits 1 Branch 0 Tags
c70af376d431783457ef33db9718aa3fa111d1a0
Commit Graph

85211 Commits

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

Change-Id: I8ff1d7b11d4a0bb33644b8e45e1b4a455dc2c641
 2021-11-03 19:52:30 +00:00
Yanting Yang
5c0dc5688f Rephrase dialog message of clear storage dialog for security concern am: 881d7ec5ab am: 0549b8c4e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101566

Change-Id: I1677fb03ae5ca4c4bd59473f967c567274457b84
 2021-11-03 19:52:25 +00:00
Yanting Yang
551083020b Rephrase dialog message of clear storage dialog for security concern am: 6024ea553a am: b0ce558a3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101567

Change-Id: Ia9cfe663f267c7d8f852ca94358384df227f08b5
 2021-11-03 19:48:35 +00:00
Yanting Yang
0549b8c4e3 Rephrase dialog message of clear storage dialog for security concern am: 881d7ec5ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101566

Change-Id: I51c5b0ee5aa92de5e86c721fcaea665272c549bf
 2021-11-03 19:48:30 +00:00
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
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
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
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
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
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
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
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
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
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
Yanting Yang
6024ea553a Rephrase dialog message of clear storage dialog for security concern 
Bug: 193890833
Test: visual
Change-Id: I8f0b066de710169ee8b922c44b6519ca21b9c7ef
(cherry picked from commit 0c359da620)
 2021-10-25 05:53:10 +00:00
Yanting Yang
881d7ec5ab Rephrase dialog message of clear storage dialog for security concern 
Bug: 193890833
Test: visual
Change-Id: I8f0b066de710169ee8b922c44b6519ca21b9c7ef
(cherry picked from commit 0c359da620)
 2021-10-25 05:52:35 +00:00
Yanting Yang
9a0c28d911 Rephrase dialog message of clear storage dialog for security concern 
Bug: 193890833
Test: visual
Change-Id: I8f0b066de710169ee8b922c44b6519ca21b9c7ef
(cherry picked from commit 0c359da620)
 2021-10-25 05:52:02 +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