Commit Graph

115824 Commits

Author SHA1 Message Date
Stanley Wang
cbf765d03a Merge "Fix the problem that sim2 can not copy imei" 2022-09-14 02:38:06 +00:00
Zekan Qian
d488206364 Merge "Add debug page in Settings" 2022-09-14 01:55:02 +00:00
YK Hung
e9ca70362c Merge "Add fade in / out animation for battery usage hourly chart." into tm-qpr-dev am: 2a33c12028 am: 63dd5861a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19897905

Change-Id: Ieb54a462cc5cc5bc1f7135b92a010953cf365134
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 17:40:03 +00:00
YK Hung
63dd5861a9 Merge "Add fade in / out animation for battery usage hourly chart." into tm-qpr-dev am: 2a33c12028
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19897905

Change-Id: I78fd0896d72ab78b8a7ad676ae6c1beab3c260fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 17:10:17 +00:00
TreeHugger Robot
de45148d16 Merge changes from topic "tc_change_22091207_22"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 35b51c6a87
  Import translations. DO NOT MERGE ANYWHERE
2022-09-13 16:53:33 +00:00
YK Hung
2a33c12028 Merge "Add fade in / out animation for battery usage hourly chart." into tm-qpr-dev 2022-09-13 16:44:17 +00:00
Stanley Wang
9a325cee1f Fix the problem that sim2 can not copy imei
Set the CopyingEnabled value to true.

Fix: 239327568
Test: manually test and review UI
Change-Id: Id0025588aa4a93ec06f976c2569404627883c25a
2022-09-13 18:55:07 +08:00
Zekan Qian
eaa0ca22e7 Add debug page in Settings
Bug: 244122804
Test: manually build SettingsGoogle
Change-Id: I4853e17028dfe0eed4342b4691962b508bc87357
2022-09-13 10:19:37 +00:00
Chaohui Wang
186eb66c4f Add 4 app op permission App List
- All files access
- Display over other apps
- Media management apps
- Modify system settings

Bug: 235727273
Test: Manual with Settings App
Change-Id: I60abb44558f535d5e26d498164d5429ede4033f8
2022-09-13 17:24:48 +08:00
Chaohui Wang
7f82ea1854 Merge "Clean up some UnusedResources detected by lint 3" 2022-09-13 07:55:18 +00:00
TreeHugger Robot
7598750620 Merge "Fix incorrect choose screen lock during unicorn" into tm-qpr-dev am: 094d7badba am: 9386416103
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19880532

Change-Id: I88e7db1f442c18aada11305ed54f0b5e66636d7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 07:17:39 +00:00
TreeHugger Robot
9386416103 Merge "Fix incorrect choose screen lock during unicorn" into tm-qpr-dev am: 094d7badba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19880532

Change-Id: I7ef1ebee9bc4ba6e165f2dfab8fbef70fdc0d2c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 06:45:45 +00:00
TreeHugger Robot
094d7badba Merge "Fix incorrect choose screen lock during unicorn" into tm-qpr-dev 2022-09-13 06:23:40 +00:00
TreeHugger Robot
c6ffb2c3ec Merge "Hide roaming option when carriers force all networks as HOME networks" 2022-09-13 05:56:59 +00:00
Chaohui Wang
6ae88c417f Clean up some UnusedResources detected by lint 3
Bug: 234570979
Test: Manual with Settings App
Change-Id: I73d18397b01a9967fd7acb94b133e7d5497a0854
2022-09-13 13:56:26 +08:00
Kuan Wang
3759adfda6 Add fade in / out animation for battery usage hourly chart.
After:
https://drive.google.com/file/d/1-1z2EM16X76qltTz_fL_DvgI7m65TtAN/view?usp=sharing

Before:
https://drive.google.com/file/d/1pG2rQ3V4rphjx7RLhSjb1r2HgXiFCYQZ/view?usp=sharing

Bug: 245655904
Test: manually
Change-Id: I72533a28445bea83aea604a937864052bd65c898
2022-09-13 12:19:59 +08:00
Chaohui Wang
526eedbeb0 Merge "Clean up some UnusedResources detected by lint 2" 2022-09-13 02:54:17 +00:00
TreeHugger Robot
78a7639567 Merge "Allow summary string support both mobile and tablet devices" into tm-qpr-dev am: 97985b6219 am: 41e6695253
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19926604

Change-Id: I15b121ec17862bff4e7dd66c3ae3785a5e6dc550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 02:02:31 +00:00
SongFerngWang
bf363adbc6 Add more logs for analysis am: 4a5680ac09 am: b5dbbceecd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19888371

Change-Id: Iad8f68879d0195bc6e223772cdf8bc58c53e41bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 02:01:51 +00:00
TreeHugger Robot
41e6695253 Merge "Allow summary string support both mobile and tablet devices" into tm-qpr-dev am: 97985b6219
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19926604

Change-Id: Idcda95ee3ea366c6a827b09cdfc91d565dabf73d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 01:32:42 +00:00
SongFerngWang
b5dbbceecd Add more logs for analysis am: 4a5680ac09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19888371

Change-Id: I9a8d01347fec136bac16cb85ccbfb1e5860edda7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 01:31:59 +00:00
TreeHugger Robot
97985b6219 Merge "Allow summary string support both mobile and tablet devices" into tm-qpr-dev 2022-09-13 01:23:37 +00:00
SongFerngWang
4a5680ac09 Add more logs for analysis
Bug: 245657079
Test: NA. It is the log only.
Change-Id: I9909acc27ccbef48f653cfcd0cc84942c4353eac
2022-09-13 01:11:17 +00:00
TreeHugger Robot
b3e5faa8a3 Merge "Refine checkMaxEnrolled() for fingerprint" into tm-qpr-dev am: 311d818b10 am: 9e155208bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19880528

Change-Id: I5b45bfa90774b254bf7c13cf27a72fbcac7b46a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 01:05:22 +00:00
TreeHugger Robot
9e155208bf Merge "Refine checkMaxEnrolled() for fingerprint" into tm-qpr-dev am: 311d818b10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19880528

Change-Id: I7641e7dddb2865e402d02b7e6dac7c7437825f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 00:32:43 +00:00
TreeHugger Robot
311d818b10 Merge "Refine checkMaxEnrolled() for fingerprint" into tm-qpr-dev 2022-09-12 23:57:04 +00:00
Bill Yi
cdbf53761d [automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 677cd61616 -s ours am: 3464e33135 -s ours am: 9c26bb64b8 -s ours am: 65b45b6ecb -s ours am: 8a67244d48 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I816fa51b767c09e3c7a9c38504beedc4e6f294ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 21:31:03 +00:00
Bill Yi
0f25dba7e3 [automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 042554a0e4 -s ours am: 49efcf7816 -s ours am: 517f250e13 -s ours am: aab60c8d68 -s ours am: e798f997d7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I871edb225acfe8f5c08d38d5fbf6c39bcefccbc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 21:30:58 +00:00
Bill Yi
8a67244d48 [automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 677cd61616 -s ours am: 3464e33135 -s ours am: 9c26bb64b8 -s ours am: 65b45b6ecb -s ours
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: I67c6da9fa91608e893c79cf8b9bc0b030efd630c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 21:16:12 +00:00
Bill Yi
e798f997d7 [automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 042554a0e4 -s ours am: 49efcf7816 -s ours am: 517f250e13 -s ours am: aab60c8d68 -s ours
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: I1ed3a6b4e538b22f8833a602a29cd0df08890c91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 21:15:56 +00:00
Bill Yi
65b45b6ecb [automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 677cd61616 -s ours am: 3464e33135 -s ours am: 9c26bb64b8 -s ours
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: Ie01abae883d751824703018a75ef7a41de38cc8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 20:29:27 +00:00
Bill Yi
aab60c8d68 [automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 042554a0e4 -s ours am: 49efcf7816 -s ours am: 517f250e13 -s ours
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: I17f23d231f04f41092a3be5ce59a732faad85b53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 20:29:16 +00:00
Bill Yi
9c26bb64b8 [automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 677cd61616 -s ours am: 3464e33135 -s ours
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: Id4b69cddf31a9a3d0bb781d7fecd0f21d369c0c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 19:57:13 +00:00
Bill Yi
517f250e13 [automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 042554a0e4 -s ours am: 49efcf7816 -s ours
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: I9474f8a455c20b5335f584ba8261fd5b29435995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 19:57:01 +00:00
TreeHugger Robot
3ff7cee25c Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-09-12 19:33:04 +00:00
TreeHugger Robot
53756f0544 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-09-12 19:33:04 +00:00
Bill Yi
3464e33135 [automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 677cd61616 -s ours
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: I20ddfee04e6de1e681b647a97296fcf29d97ce66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 18:56:26 +00:00
Bill Yi
49efcf7816 [automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 042554a0e4 -s ours
am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f5a is already in history

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

Change-Id: I3e2c668af16aec333680c1ac7fad768b1db94c6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 18:56:14 +00:00
TreeHugger Robot
20af31517c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: e6fd2a5da8 -s ours am: 390769f44e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifea34ab541e2fa223483305332b06b982ed65229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 18:05:17 +00:00
Bill Yi
65a59bc77a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1bfdaf22a -s ours am: ad0109af91 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I18d1d4f59dd1af9b2ead768b9ca448d63fa30f5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 18:05:12 +00:00
Bill Yi
c26b3cc96e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 61d351e93d -s ours am: 422fa4379d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2e804cfcb7a74b1b542c19aaf7d9fedd058f0c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 18:05:02 +00:00
TreeHugger Robot
390769f44e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: e6fd2a5da8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib7897ec8a96aeac36b438b33c0895591f50e4274
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 18:00:18 +00:00
Bill Yi
ad0109af91 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1bfdaf22a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia5941874f63385b0840dd9b6930344932eb7a34d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 18:00:03 +00:00
Bill Yi
422fa4379d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 61d351e93d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I651889f8eca679d1aa27eae894d6b6dfc85fc363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 17:59:55 +00:00
Bill Yi
677cd61616 Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" 2022-09-12 17:59:03 +00:00
TreeHugger Robot
e6fd2a5da8 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-09-12 17:41:49 +00:00
Bill Yi
db93faa147 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 35b51c6a87
Blank merge reason: commit message contains skip directive

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

Change-Id: Ieda49b8d5f8612b89ea3d96be7315b38d7938522
2022-09-12 14:27:37 +00:00
Abel Tesfaye
88ea8b3bec Merge "Cleanup listener reference in SmartAutoRotate" 2022-09-12 11:11:12 +00:00
Sunny Shao
3e24aaf091 Allow summary string support both mobile and tablet devices
-Update the string to support mobile and tablet devices.

Bug: 244137320
Test: manual test
Change-Id: I74d8d6db76001a68a648030e0c94f769d220d762
2022-09-12 15:54:05 +08:00
Bill Yi
e1bfdaf22a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I24e95f7af07133bd771ec2b0383a9a17c798d932
2022-09-11 16:30:55 -07:00