PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,492 Commits 1 Branch 0 Tags
24e11ef80c96b57af3e13eeb52aa57c53c70c944
Commit Graph

102492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Coastguard Worker
24e11ef80c Snap for 8470411 from d89c64f189 to tm-qpr1-release 
Change-Id: I5307bb00d8ba2298f50b15ddbfc8a7a7c9a730cc
 2022-04-19 03:12:25 +00:00
TreeHugger Robot
d89c64f189 Merge "Read CarrierConfig to get operator name" into tm-dev am: b1bdc42d52 am: eb60f31139 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17800680

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

Change-Id: Id2da67f15bf9de911cb0cb30af410f931bf280ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 02:39:25 +00:00
TreeHugger Robot
eb60f31139 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: I3c9f9f8ae4c33d13add17ed282ed93bfb7af534b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 02:16:40 +00:00
Hugh Chen
f3cdbb79eb 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: Ic7f091fe2f612edf3f6b3f0bad8f46b35158f849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-19 02:16:33 +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
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
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
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
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
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
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
5734853d61 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5e411c38cb -s ours am: 467b85d088 -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: I61575bf7aeb0e1bf99e275a3ece78d3f3db325d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 19:26:13 +00:00
TreeHugger Robot
467b85d088 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5e411c38cb -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: I4435f6f1918ce336ee104c933f7d040a165f2153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:51:14 +00:00
TreeHugger Robot
2972c8c462 Merge changes from topic "presubmit-am-a6d51d83e79d4efb88a3610f5edefa60" into tm-dev am: aa1f86f18d am: 5bf683e8f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801765

Change-Id: Ib848e8a84d113f56002f3a9d810da8eb0f32f99f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:45:29 +00:00
Bill Yi
fc6437b4fb [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d5de2ec5ae am: fb20f3183b -s ours am: 2631a9a4f1 -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: I144dbdf1dda930056d54e64a69b3383166bd9a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:45:28 +00:00
TreeHugger Robot
4c32ec0371 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: e6a5247285 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I77e12637a86224404abbc0b7b51e4f616e77b234
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:45:21 +00:00
Bill Yi
8fda064295 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f48173940 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5064b78c2ac8b2bfa8b05524d47324cf67673b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:45:20 +00:00
TreeHugger Robot
74a36a7659 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8e461aef7b -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I892b308850183401f240d915e6dd41f509bff424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:44:57 +00:00
Bill Yi
c71203f16d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc86f72e65 -s ours am: 6c46c20518 -s ours am: fa0b661076 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie1afc461ae8f3561b19c88807d093bb7911ff557
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:44:51 +00:00
Peiyong Lin
fa6ecc7857 Merge "Clean up extra app info." into tm-dev am: bd26c3c747 am: fceaaa80a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17757962

Change-Id: Id490733f3fed747546e80d96031bc71508f32748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:44:47 +00:00
TreeHugger Robot
5bf683e8f5 Merge changes from topic "presubmit-am-a6d51d83e79d4efb88a3610f5edefa60" into tm-dev am: aa1f86f18d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801765

Change-Id: I19124fd659f0faa1e212e1dd35aa2133552880f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:44:24 +00:00
Bill Yi
2631a9a4f1 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d5de2ec5ae am: fb20f3183b -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: I07f502dac11a5c652c4a248dd90c127949678afc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:44:23 +00:00
TreeHugger Robot
aa1f86f18d Merge changes from topic "presubmit-am-a6d51d83e79d4efb88a3610f5edefa60" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d5de2ec5ae
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-18 18:14:25 +00:00
TreeHugger Robot
5e411c38cb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-18 18:14:25 +00:00
TreeHugger Robot
e6a5247285 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-18 18:11:44 +00:00
TreeHugger Robot
8e461aef7b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-18 18:11:41 +00:00
Bill Yi
fa0b661076 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc86f72e65 -s ours am: 6c46c20518 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic7bc9652b1eb3b9a7ebe16cb21a1f548c280f815
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:01:32 +00:00
Peiyong Lin
fceaaa80a0 Merge "Clean up extra app info." into tm-dev am: bd26c3c747 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17757962

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

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

Change-Id: I5fbaef29db47314d259051001fc284f01b627229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:00:04 +00:00
Yuri Lin
d6dc2708c7 Merge "Special handling for intent coming from "welcome" notification." into tm-dev am: a73c850aa5 am: d21ef57315 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17722955

Change-Id: I67ea5071f8d033af594467c0903f442916cc79e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 17:52:45 +00:00
Peiyong Lin
bd26c3c747 Merge "Clean up extra app info." into tm-dev 2022-04-18 17:37:41 +00:00
Yuri Lin
d21ef57315 Merge "Special handling for intent coming from "welcome" notification." into tm-dev am: a73c850aa5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17722955

Change-Id: I4e88828a7d398b014be9313bf59819a3edf9322f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 17:24:04 +00:00
Yuri Lin
a73c850aa5 Merge "Special handling for intent coming from "welcome" notification." into tm-dev 2022-04-18 17:09:02 +00:00
Lucas Silva
28b4fe2363 Update dream settings strings with sensible char limits. 
Also removes some unused strings

Bug: 228790933
Test: n/a
Change-Id: I42fd1954242dc12370982bfbc0e18389e9a7c3dc
 2022-04-18 17:00:50 +00:00
Hugh Chen
aadc44ae26 Fix default usb settings will set wrong function when onPause() 
Bug: 229200265
Test: make -j64 RunSettingsRoboTests
Change-Id: Ibee2d39af8b341d03117d96029446ddcd45921fe
 2022-04-18 12:16:57 +00:00
Bill Yi
c9be756fd4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I75dfdb75599cc9562f58c1ee8e38c5f528865e99
 2022-04-18 10:53:47 +00:00
Bill Yi
6a213caba0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie017d40261040bacdef409075dfb26bc91d9229a
 2022-04-18 10:49:51 +00:00
Bill Yi
1f48173940 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie1d8ab7bb37e96ef5c233a16a2b1f225810279d0
 2022-04-18 10:41:37 +00:00