PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,801 Commits 1 Branch 0 Tags
4c4e06bf4e1df6bff895d3b13643152429e8a80c
Commit Graph

104801 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
0e3e447e11 Merge "Read CarrierConfig to get operator name" into tm-dev am: b1bdc42d52 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17800680

Change-Id: Ib92b74a86651a2f5df36b5584ad06305197f99b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 02:15:43 +00:00
Hugh Chen
fb156692b3 Merge "Fix default usb settings will set wrong function when onPause()" into tm-dev am: abad3c4a88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799707

Change-Id: Ib816f76a9cdea03f6180dea856da3516eac72cf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 02:15:30 +00:00
TreeHugger Robot
b1bdc42d52 Merge "Read CarrierConfig to get operator name" into tm-dev 2022-04-19 02:08:35 +00:00
Hugh Chen
abad3c4a88 Merge "Fix default usb settings will set wrong function when onPause()" into tm-dev 2022-04-19 01:56:59 +00:00
Bill Yi
0ab0177281 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b9dd1a3a2d -s ours am: 738e92a0fb -s ours am: a7f4640b77 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8c7978efbac9e754855a587c7ca4828f1d4cc87b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 01:41:04 +00:00
Bill Yi
7476d31318 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: afa4a259d3 -s ours am: 9d63f65466 -s ours am: 716d464f27 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6616c70f9f41b2e588c460d1d31e334ef8850759
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 01:41:00 +00:00
TreeHugger Robot
2dcc82fcc8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: db7228fd26 -s ours am: d5f23afcc8 -s ours am: 71673e37ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6008430e1aaf6fb1366651a82dda0e8e6646fadd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 01:38:20 +00:00
Bill Yi
57408862cd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 713df54284 -s ours am: 6c8a55e3a7 -s ours am: ea76b1d618 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie822d3e724b304c21f77a7d8dcaafd23eeb3fa6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 01:38:19 +00:00
Bill Yi
b90098d213 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b9dd1a3a2d -s ours am: 60f4209ad8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I243257e8d58e2e234e05daf274c80485076cd37e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 01:07:49 +00:00
Bill Yi
14ac2a874b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: afa4a259d3 -s ours am: c8257fe175 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie775d5decb1293273851776e2695ebbb3b7dd32d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 01:07:48 +00:00
Bill Yi
a7f4640b77 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b9dd1a3a2d -s ours am: 738e92a0fb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I590c89f619e6df17101bb18a34e303baa7d450b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 01:06:20 +00:00
Bill Yi
716d464f27 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: afa4a259d3 -s ours am: 9d63f65466 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I644e89fee2c3eee5d72394f29e328f2a178e4010
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 01:06:19 +00:00
TreeHugger Robot
71673e37ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: db7228fd26 -s ours am: d5f23afcc8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0c01c1073f670b8380541aa894559b17f48b43ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 01:05:57 +00:00
Bill Yi
ea76b1d618 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 713df54284 -s ours am: 6c8a55e3a7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2ae89045eea8902e0b14925ce35dec40888de8ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 01:05:56 +00:00
TreeHugger Robot
0c96f0b1ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: db7228fd26 -s ours am: 9464118bd1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic670219292b545d6a1bd1752181a9eb1da1be91b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 01:05:21 +00:00
Bill Yi
49861e43a5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 713df54284 -s ours am: 8a4fbdf998 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I83aa971bd79a3160c7f0c971d1d6cea031886781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 01:05:19 +00:00
Bill Yi
3eb7acc0c5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 445dd2bd45 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I10f308d01fb42b1b7c8d7bf8b4f31b276d8258f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 00:51:11 +00:00
Bill Yi
d5ecf50de0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a213caba0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8b666a2c66f78182088299d3e61dca7dfe7879f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 00:51:06 +00:00
Bill Yi
696ecc8c37 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 168e7677f7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I31ede2a691747e8a2eee534af12cdef7243b38ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 00:48:17 +00:00
Bill Yi
01fba6ace0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15d7ac7c5b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib6834ad8e314b2912d48ae7c7e86be11c187cded
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 00:48:16 +00:00
Bill Yi
c88b882013 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 052970997d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I647d7ed44ee15b1c55ae97993b5c15ab16157438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 00:46:10 +00:00
Bill Yi
5e99e584f5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 442f62eb55 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie8c3416a031f791d4e4603c39aea24932c835360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 00:46:08 +00:00
Bill Yi
9d597ae5b0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64a0937f54 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9f6767d2a7e0cadb67eb58cb0464880acfbcc6e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 00:45:44 +00:00
Bill Yi
738e92a0fb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b9dd1a3a2d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I43a1bfc8f493004e16420725d037178f592851f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 00:40:48 +00:00
Bill Yi
9d63f65466 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: afa4a259d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2979722889c7a3664c3730fc1f2343957c2df4d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 00:40:43 +00:00
Bill Yi
60f4209ad8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b9dd1a3a2d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibb4ad4dca96f0e7bd1edf5bec12ebd40ea806f69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 00:40:04 +00:00
Bill Yi
c8257fe175 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: afa4a259d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I675c8781e005a859c7eddeac2b47c1d7c3697210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 00:40:01 +00:00
TreeHugger Robot
d5f23afcc8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: db7228fd26 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I03063bc040ff8432f92639d7abd9d9c5436831e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 00:39:11 +00:00
Bill Yi
6c8a55e3a7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 713df54284 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1cf43b27d3698aad7231934b41a5e631e72e5a95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 00:39:10 +00:00
TreeHugger Robot
9464118bd1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: db7228fd26 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I47d43505d8efa6864b844451b283cdd56c241a97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 00:37:31 +00:00
Bill Yi
8a4fbdf998 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 713df54284 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I78d71958f5db6d902d26d6b6c543fcfb59fbc0f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 00:37:28 +00:00
Bill Yi
1feb4cf122 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-04-19 00:31:46 +00:00
TreeHugger Robot
5e88e4f1b9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7a33306079 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If4e154a2995b83b452628d6797f0c8ba30c18782
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 00:27:57 +00:00
Bill Yi
052970997d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-19 00:27:54 +00:00
Bill Yi
e0d214cabd Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-04-19 00:26:14 +00:00
Bill Yi
445dd2bd45 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-04-19 00:25:12 +00:00
Bill Yi
b9dd1a3a2d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-19 00:22:17 +00:00
Bill Yi
168e7677f7 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-04-19 00:20:30 +00:00
TreeHugger Robot
db7228fd26 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-19 00:17:15 +00:00
menghanli
7ae0b641dd Fix transparency seekbar is enabled while fade feature is disabled. 
Root cause: Show default status until setting key changed. It does not
show latest status when created.
Solution: Update the status when created.

Bug: 229566130
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FloatingMenuTransparencyPreferenceControllerTest
Change-Id: Ia25fe5cec0444c1771e8ce31aae2a4cb3b0405a1
 2022-04-19 08:15:28 +08:00
TreeHugger Robot
7a33306079 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-04-19 00:10:13 +00:00
TreeHugger Robot
213b0aa1f3 Merge changes from topic "presubmit-am-33fbb7edc9924936979cd0f60e0e4c8b" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8156cb9555
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-19 00:10:13 +00:00
Xin Li
024fe4b39a [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 99d834b0b8 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history

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

Change-Id: Ia9158c51f249227851e314b45566de1f7bfec848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 00:08:18 +00:00
TreeHugger Robot
647f7e081f Merge "Update dream settings strings with sensible char limits." into tm-qpr-dev am: 455bf0c881 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17802107

Change-Id: Iefd89ab4ac8f439915d6caf5ce87cae63571a671
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 22:06:54 +00:00
TreeHugger Robot
455bf0c881 Merge "Update dream settings strings with sensible char limits." into tm-qpr-dev 2022-04-18 21:50:38 +00:00
Niklas Lindgren
8bc83ef615 Read CarrierConfig to get operator name 
Config if operator name should be in status bar is now read
from carrier config. For dual sim devices we use data sim.

Bug: 116847905
Test: Add item for carrier in vendor.xml and swap sim cards
between ones that have the item enabled and disabled. We have
also tested to swap data sim cards on dual sim device.
Test: m RunSettingsRoboTests ROBOTEST_FILTER="ShowOperatorNamePreferenceControllerTest"

Change-Id: I03311b96ee660aed80ec867b05aa0a34cfc15f54
 2022-04-18 21:34:57 +00:00
Xin Li
99d834b0b8 Merge sc-v2-dev-plus-aosp-without-vendor@8433047 
Bug: 226662282
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
Change-Id: I71459583120f712298f47b4dbd2c791d8ef4e022
 2022-04-18 21:01:08 +00:00
TreeHugger Robot
de3a095e2c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5e411c38cb -s ours am: 467b85d088 -s ours am: 5734853d61 -s ours am: 7562644667 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3ce8b87654cd817a6578e67a61d876be80ebfc93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 20:04:31 +00:00
TreeHugger Robot
7562644667 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5e411c38cb -s ours am: 467b85d088 -s ours am: 5734853d61 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I34f38474a562ff2a619da70bf00ecf387043eefc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 19:49:47 +00:00
TreeHugger Robot
8bf9454c95 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5e411c38cb -s ours am: 467b85d088 -s ours am: 2902d67c16 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icc97df20000468212c749a05b96d0b2ee84c2b06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 19:49:25 +00:00