PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
67,618 Commits 1 Branch 0 Tags
43a459cb1bc920d0c5a62d97771e55199625530c
Commit Graph

67618 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Tinker
01b3da1dbd [automerger skipped] Merge "Revert "[Settings] Remove mobile network v1"" am: 9e974afd4c am: a5f7479f5a -s ours 
am skip reason: skipped by user jtinker

Change-Id: I41cccce692c4cd294c74054cb072e0ada6f41941
 2020-05-20 20:14:25 +00:00
Jeff Tinker
a5f7479f5a Merge "Revert "[Settings] Remove mobile network v1"" am: 9e974afd4c 
Change-Id: I980e0dba1556a28d683ffb3e5a40da52974c062e
 2020-05-20 19:50:57 +00:00
Jeff Tinker
9e974afd4c Merge "Revert "[Settings] Remove mobile network v1"" 2020-05-20 19:37:56 +00:00
Jeff Tinker
9c657c34f4 Revert "[Settings] Remove mobile network v1" 
This reverts commit daf6c9e85b.

Reason for revert: Broken build 6513883 on aosp-master on errorprone

Change-Id: I5e473863c2669a3c89014e12cc952c5c72a12cb7
bug:157138919
 2020-05-20 19:14:57 +00:00
Julia Reynolds
04d50c9709 Switch from shortlabel to label 
Test: atest
Bug: 157140669
Change-Id: Iebcb2f076fef33b6f3ce16326af4e4c5c6770459
 2020-05-20 14:23:43 -04:00
TreeHugger Robot
d384741938 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 42a6154347 -s ours am: 8ebbe4db5c -s ours 
am skip reason: subject contains skip directive

Change-Id: I726fa5c772a31d7b45b93554d0499b819629e686
 2020-05-20 16:35:01 +00:00
TreeHugger Robot
5446562899 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 42a6154347 -s ours am: ac648d6916 -s ours 
am skip reason: subject contains skip directive

Change-Id: I313496899c2833bb4238d6c2c024c0bce89b067b
 2020-05-20 16:34:22 +00:00
Julia Reynolds
39ceee9e00 Only show work profile notifs if enabled 
Test: manual, turn off profile
Fixes: 157137055
Change-Id: Ic042300297c09d132e793d13fec18b23d24f2cc8
 2020-05-20 12:29:39 -04:00
TreeHugger Robot
ac648d6916 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 42a6154347 -s ours 
am skip reason: subject contains skip directive

Change-Id: I1a6119bcc82c95a996d762eb9a28e6a2878f1ca1
 2020-05-20 16:22:06 +00:00
TreeHugger Robot
8ebbe4db5c [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 42a6154347 -s ours 
am skip reason: subject contains skip directive

Change-Id: If1a628dce575776369bb61847735e7a6951fbe6e
 2020-05-20 16:22:02 +00:00
TreeHugger Robot
42a6154347 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-05-20 16:00:46 +00:00
TreeHugger Robot
f6d7ce24b0 Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: 3ba40628fc am: ba98f11c56 
Change-Id: I05a82bbf4ef6f294ee887d2497dd62dad6ab8811
 2020-05-20 15:03:04 +00:00
Automerger Merge Worker
f2e45400fc Merge "Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: d06d373674" into rvc-d1-dev-plus-aosp am: a06ef7b194 
Change-Id: I15801851140bacc91006a5f2f9791eebc2534e2c
 2020-05-20 15:02:58 +00:00
TreeHugger Robot
cf1486003e Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: 3ba40628fc am: 742dd6f60c 
Change-Id: Ia5e40b1a8df8f8d59881e0ec5d11e71178db6004
 2020-05-20 15:02:49 +00:00
Automerger Merge Worker
a06ef7b194 Merge "Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: d06d373674" into rvc-d1-dev-plus-aosp 2020-05-20 14:42:44 +00:00
TreeHugger Robot
1518db1927 Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: d06d373674 
Change-Id: Ica90e78597092bc44aabd28c5357fbe17ecffafe
 2020-05-20 14:42:40 +00:00
TreeHugger Robot
ba98f11c56 Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: 3ba40628fc 
Change-Id: Ia5cccbd846203fb0acbc6207d37091d1a3e908b3
 2020-05-20 14:42:33 +00:00
TreeHugger Robot
742dd6f60c Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: 3ba40628fc 
Change-Id: I764291b14b76fa7dd24644fe3ae739f324f4f5e9
 2020-05-20 14:42:31 +00:00
TreeHugger Robot
d06d373674 Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda 
Change-Id: I1867ea8309ed5ec9e8bda40f68cd6e56c69b1755
 2020-05-20 14:32:11 +00:00
TreeHugger Robot
3ba40628fc Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda 
Change-Id: Ibc06bd838df06258f98e87fcb3a9da43c47be504
 2020-05-20 14:31:50 +00:00
TreeHugger Robot
946e3adeda Merge "Show subtext for previously connected devices on BT card" into rvc-dev 2020-05-20 14:10:31 +00:00
Bonian Chen
47b98dd082 [automerger skipped] Merge "[Settings] Remove mobile network v1" am: 10799d12fd am: 075a17c995 -s ours am: 3d46b0e5ec -s ours am: e7495a57dc -s ours 
am skip reason: Change-Id Ib365ba712af62729ca35abbc370aef087ce52a90 with SHA-1 1eccd55a70 is in history

Change-Id: I2a9c3eaea606c66cba71fd5e23230aa924ec2dd7
 2020-05-20 13:32:24 +00:00
Bonian Chen
e7495a57dc [automerger skipped] Merge "[Settings] Remove mobile network v1" am: 10799d12fd am: 075a17c995 -s ours am: 3d46b0e5ec -s ours 
am skip reason: Change-Id Ib365ba712af62729ca35abbc370aef087ce52a90 with SHA-1 1eccd55a70 is in history

Change-Id: I0694e2236c4f7ecfb38583f3bb736f416991e434
 2020-05-20 13:19:34 +00:00
Bonian Chen
3d46b0e5ec [automerger skipped] Merge "[Settings] Remove mobile network v1" am: 10799d12fd am: 075a17c995 -s ours 
am skip reason: Change-Id Ib365ba712af62729ca35abbc370aef087ce52a90 with SHA-1 1eccd55a70 is in history

Change-Id: Ide8eb53eff3252d31505cc975ea094d76c70bf31
 2020-05-20 13:03:03 +00:00
Bonian Chen
075a17c995 Merge "[Settings] Remove mobile network v1" am: 10799d12fd 
Change-Id: Id17878bd85d8e86f1cb42bc52a78fc5469278376
 2020-05-20 12:45:32 +00:00
Bonian Chen
10799d12fd Merge "[Settings] Remove mobile network v1" 2020-05-20 12:28:20 +00:00
Jason Chiu
07767907d5 Show subtext for previously connected devices on BT card 
Fixes: 157089483
Test: visual, robotest
Change-Id: If4f2dec9df802a80a686827de7e61115e85d54a7
 2020-05-20 17:02:43 +08:00
Automerger Merge Worker
b4150802d9 Merge "Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: cf0ef7ae38" into rvc-d1-dev-plus-aosp am: 64616b4168 
Change-Id: Id19e0b9ce7d4ba376de92ff64a53812fc8b8beae
 2020-05-20 08:59:32 +00:00
Automerger Merge Worker
fffb0764c9 Merge "Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: f18ab3712b" into rvc-d1-dev-plus-aosp am: e828ebf069 
Change-Id: Ib90a1528a9af18c3430479e6dd926f07e606afa4
 2020-05-20 08:58:44 +00:00
Amy Hsu
5e8ba70140 Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: f18ab3712b am: e67e058f26 
Change-Id: I7fc511dba6f739653494c68753e191c8091f33b9
 2020-05-20 08:58:34 +00:00
TreeHugger Robot
7d40624fe1 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours am: cb56953dca -s ours am: 5c655b06a2 -s ours 
am skip reason: subject contains skip directive

Change-Id: I3023f21efe715894fa139bcf44976c38386eb459
 2020-05-20 08:58:20 +00:00
Automerger Merge Worker
64616b4168 Merge "Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: cf0ef7ae38" into rvc-d1-dev-plus-aosp 2020-05-20 08:58:17 +00:00
TreeHugger Robot
bd9020b7fb [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours am: 4af7cebe18 -s ours am: 8233c0573f -s ours 
am skip reason: subject contains skip directive

Change-Id: I420b4a3412d41c8005f1484cecc3fc60569145d4
 2020-05-20 08:58:10 +00:00
Automerger Merge Worker
e828ebf069 Merge "Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: f18ab3712b" into rvc-d1-dev-plus-aosp 2020-05-20 08:58:08 +00:00
Amy Hsu
d1670efe92 Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: cf0ef7ae38 
Change-Id: Id8eef41275fc48fe5e84531fd87277189b265f81
 2020-05-20 08:58:08 +00:00
TreeHugger Robot
8eeabd86cf [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3041c88e65 -s ours am: ede8bf5f96 -s ours 
am skip reason: subject contains skip directive

Change-Id: If9af7ffd99b45dc98c3e8588a420ad0b44ae1510
 2020-05-20 08:58:02 +00:00
Amy Hsu
ce64e46603 Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: f18ab3712b 
Change-Id: I8487aa59cacee8a261849dd50d2baafc0cbd5020
 2020-05-20 08:57:59 +00:00
TreeHugger Robot
8233c0573f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours am: 4af7cebe18 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ia78ce324f66fa421d4eed56ea201ae731d56f618
 2020-05-20 08:57:57 +00:00
TreeHugger Robot
7420219600 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours am: cb56953dca -s ours am: ef8dff39c9 -s ours 
am skip reason: subject contains skip directive

Change-Id: I2539a96dea3d1af2474d5ad1a2381548239af4f6
 2020-05-20 08:57:57 +00:00
Amy Hsu
e67e058f26 Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: f18ab3712b 
Change-Id: I19d32b304c6988ece475d30ce9c9165120d84a6c
 2020-05-20 08:57:55 +00:00
TreeHugger Robot
ef8dff39c9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours am: cb56953dca -s ours 
am skip reason: subject contains skip directive

Change-Id: Iacb71f66379d50a479671559c830a56a67dce531
 2020-05-20 08:57:47 +00:00
TreeHugger Robot
78ca90d7f4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3041c88e65 -s ours am: 28621803f4 -s ours 
am skip reason: subject contains skip directive

Change-Id: Iaebc96dc935e2bbdbf006e0a53bb0322e36672ca
 2020-05-20 08:57:41 +00:00
TreeHugger Robot
5c655b06a2 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours am: cb56953dca -s ours 
am skip reason: subject contains skip directive

Change-Id: I5ffcea95d88a2ba67edd6cc420bec607e2765eb0
 2020-05-20 08:57:37 +00:00
Amy Hsu
cf0ef7ae38 Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f 
Change-Id: Ife2360ddac1e760471c0ab22f588f344e0d6723d
 2020-05-20 08:51:01 +00:00
Amy Hsu
f18ab3712b Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f 
Change-Id: I71ba7d138d710e02a7b486940cced02c8dde9e57
 2020-05-20 08:50:48 +00:00
Amy Hsu
a75dddbf9f Merge "Move PeakRefreshRateController to Settings app" into rvc-dev 2020-05-20 08:48:56 +00:00
TreeHugger Robot
4af7cebe18 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours 
am skip reason: subject contains skip directive

Change-Id: I54dc9b432f4b13258c3ff07c789ab4fcc57de45e
 2020-05-20 08:43:38 +00:00
TreeHugger Robot
cb56953dca [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours 
am skip reason: subject contains skip directive

Change-Id: I59a7f6597789f6bea36a28cc05e0fdd879cb1ab2
 2020-05-20 08:43:28 +00:00
TreeHugger Robot
28621803f4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3041c88e65 -s ours 
am skip reason: subject contains skip directive

Change-Id: I765701491e6cebbe89a71942d79cb959fc40d659
 2020-05-20 08:32:21 +00:00
TreeHugger Robot
ede8bf5f96 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3041c88e65 -s ours 
am skip reason: subject contains skip directive

Change-Id: I3cf7fe65b1ad1366aa48661e1fb15e71c6ee0764
 2020-05-20 08:32:16 +00:00