PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,708 Commits 1 Branch 0 Tags
47c78f4f7201d88a19b6d992b3b7f30cc64600cf
Commit Graph

60708 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
47c78f4f72 Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b am: 7f0a093f5c 
Change-Id: Ia60fb17751ca5520b4b733c30312cb992696f02e
 2020-03-23 03:03:57 +00:00
TreeHugger Robot
7f0a093f5c Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b 
Change-Id: Icc3236048ae0cd07f4bb623bc59830332813584b
 2020-03-23 02:41:45 +00:00
tim peng
a58a21ff01 Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 am: f51bd0decb 
Change-Id: I4935e45a9193949275f5300ee33e9cf421bc8079
 2020-03-23 02:14:15 +00:00
tim peng
7b1b527b13 Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 am: 30bc781200 
Change-Id: I81fae7c73c5bd96aabcae7156e0fef98a49ed633
 2020-03-23 02:13:40 +00:00
TreeHugger Robot
dea87bd85b Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev 2020-03-23 02:07:56 +00:00
tim peng
f51bd0decb Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 
Change-Id: I2406caf1ecdb217658c310f4db948c627adcf790
 2020-03-23 01:59:00 +00:00
tim peng
30bc781200 Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 
Change-Id: I07b28fccc7cc1285506c18b5579350fbdcca23e2
 2020-03-23 01:58:34 +00:00
tim peng
f8f1b271b1 Merge "Update header information in output switcher" into rvc-dev 2020-03-23 01:47:25 +00:00
Stanley Wang
ef2bc18b14 Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875 am: 78e9bdf9b7 
Change-Id: I22cb0a9367e8ecf02b73e5507e735d90aeff61fc
 2020-03-21 06:05:47 +00:00
Stanley Wang
ba8e20218e [automerger skipped] Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c am: 6c6837424d -s ours 
am skip reason: Change-Id Id2d89287fe36240d71de2092daac44a5da9be282 with SHA-1 58f9ae3096 is in history

Change-Id: I2622a960387c4556e82b90ad0155b0b18b372625
 2020-03-21 06:05:13 +00:00
Stanley Wang
b9289ea2ef Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875 am: 76c2ec77e3 
Change-Id: I1dfbb0dd95d894ff970b11f858a6ca69cf621405
 2020-03-21 06:04:00 +00:00
Stanley Wang
ca95aaae17 Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c am: a8d78418c0 
Change-Id: Ie23a43915338769acbaebc4e3547397afd95a4b6
 2020-03-21 06:03:47 +00:00
Stanley Wang
78e9bdf9b7 Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875 
Change-Id: Iaeda191d1877ae40f0b3911cea911a876da97f0b
 2020-03-21 05:49:32 +00:00
Stanley Wang
6c6837424d Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c 
Change-Id: If6f30aa662c0fd4696722df8e7f31b49b7929157
 2020-03-21 05:49:25 +00:00
Stanley Wang
76c2ec77e3 Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875 
Change-Id: I35d894cd31031fa8019ca7b6f1552dcd0b1c1412
 2020-03-21 05:49:13 +00:00
Stanley Wang
a8d78418c0 Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c 
Change-Id: I87df8f40a569b89d2275d5ce38e379eb3f9f96b9
 2020-03-21 05:48:43 +00:00
Stanley Wang
fb39c70875 Merge "Update Settings subtexts for R." into rvc-dev 2020-03-21 05:30:25 +00:00
Stanley Wang
61e7d2c24c Merge "Update Settings strings for R." into rvc-dev 2020-03-21 05:30:00 +00:00
TreeHugger Robot
0677fed3e5 Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b am: 981d9e37cb 
Change-Id: Ie18bb3d1d1cb3a9e376ff7fb8ab88b1cffd4adfa
 2020-03-21 03:38:38 +00:00
TreeHugger Robot
3e87cf919d Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b am: 17c6211285 
Change-Id: I7b84db149a1410e1fb495b493690c7ae98d73dbb
 2020-03-21 03:38:12 +00:00
TreeHugger Robot
17c6211285 Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b 
Change-Id: I5b2b39c33b525407b1b6da300dc853704f727061
 2020-03-21 03:14:30 +00:00
TreeHugger Robot
981d9e37cb Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b 
Change-Id: Idd8c529261fd853b5aba28f88139008ea489aa40
 2020-03-21 03:14:28 +00:00
TreeHugger Robot
a4e3d5ef8b Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev 2020-03-21 02:58:15 +00:00
TreeHugger Robot
4fc06ea996 Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd am: a37f3bc902 
Change-Id: Ia1347ce6ba421352fd64622b90f6165eba79ebe5
 2020-03-21 02:14:31 +00:00
TreeHugger Robot
08f2027965 Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd am: cdca282167 
Change-Id: I6f60c394bafde75d50797a8cfae6799386ecf8b9
 2020-03-21 02:13:44 +00:00
TreeHugger Robot
a37f3bc902 Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd 
Change-Id: I3e34e330287c1c3cee02e9c3985ac0e41c66969e
 2020-03-21 01:57:05 +00:00
TreeHugger Robot
cdca282167 Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev am: 785e3f26bd 
Change-Id: I52415cc41bf4e613a63459394579265e27c87c76
 2020-03-21 01:56:41 +00:00
TreeHugger Robot
785e3f26bd Merge "Add text showing in Settings footer that 5G may not be capable in DSDS." into rvc-dev 2020-03-21 01:39:29 +00:00
Malcolm Chen
b56fea748f Add text showing in Settings footer that 5G may not be capable in DSDS. 
Bug: 151657272
Test: build
Change-Id: Ieeb0787f76fcf41cc55e85ef8bf375dd77c9d6b5
 2020-03-20 16:14:14 -07:00
Stanley Wang
58f9ae3096 Update Settings strings for R. 
Bug:143267842
Test: Rebuilt rom and saw different screens.
Change-Id: Id2d89287fe36240d71de2092daac44a5da9be282
(cherry picked from commit 8694c34e09)
Merged-In: Id2d89287fe36240d71de2092daac44a5da9be282
 2020-03-20 22:31:44 +00:00
Joshua Duong
975956b33b Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958 am: 2a3d93f2cc 
Change-Id: Ief352c39bbb008db936122ce790cce57f60defce
 2020-03-20 19:29:52 +00:00
Joshua Duong
dfe5331cd2 Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782 am: 33659c99dc 
Change-Id: I8ec55cedf8a6e0f1e9a6924aa5ff72b2fef8dc99
 2020-03-20 19:29:51 +00:00
Joshua Duong
2a3d93f2cc Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958 
Change-Id: Iaa687cccc1c6c7667350e8de751d7010cd872cf5
 2020-03-20 19:16:42 +00:00
Joshua Duong
33659c99dc Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782 
Change-Id: I502e79749c5df0b77a9024383545a1d273a5e10d
 2020-03-20 19:16:40 +00:00
Joshua Duong
74f5edce8c Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958 am: 6fcb6b356a 
Change-Id: I67a48698ac2aeca3c31027d6f9d6b8658298e9c1
 2020-03-20 19:15:42 +00:00
Joshua Duong
244ac12928 Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782 am: 6efa33e306 
Change-Id: If65e56f5a3fda563b742ac0ad15b3f962eca22c2
 2020-03-20 19:15:41 +00:00
Joshua Duong
6fcb6b356a Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958 
Change-Id: I90616c087e665c1d6980b9b6ac76f5f3d37be506
 2020-03-20 19:04:50 +00:00
Joshua Duong
6efa33e306 Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev am: 2f7a77b782 
Change-Id: I3d3ab0f1b54cef538b8bbc75c48c187a631f9742
 2020-03-20 19:04:48 +00:00
Joshua Duong
f5ff928958 Merge "Add visibility control to ADB QR code preference." into rvc-dev 2020-03-20 19:02:49 +00:00
Joshua Duong
2f7a77b782 Merge "Add toast error message for no WiFi on wireless debugging." into rvc-dev 2020-03-20 19:02:49 +00:00
TreeHugger Robot
509af6cb81 [automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master am: c6e000ff18 -s ours am: 21058df4b3 
Change-Id: I5221e3cdea75869dab3afbcb6f8ca8780c678adc
 2020-03-20 18:45:21 +00:00
TreeHugger Robot
21058df4b3 [automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master am: c6e000ff18 -s ours 
am skip reason: subject contains skip directive

Change-Id: I6078067348010390012aa1ca5789ada3ab833b81
 2020-03-20 18:31:56 +00:00
TreeHugger Robot
c6e000ff18 Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master 2020-03-20 18:15:00 +00:00
TreeHugger Robot
8b96070457 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours am: f261041e88 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ia9d63da6c1d774e15de443e7d1bdf76d626a2aae
 2020-03-20 18:12:43 +00:00
TreeHugger Robot
053d2baff2 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours am: feaa91837a -s ours 
am skip reason: subject contains skip directive

Change-Id: Iabc0a63cc8c59c6f0883b5f8e6c4e1ef0384cdfb
 2020-03-20 18:12:04 +00:00
TreeHugger Robot
feaa91837a [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours 
am skip reason: subject contains skip directive

Change-Id: I56114e77ffad0fe5b9ab7683624332406138bdf5
 2020-03-20 17:45:32 +00:00
TreeHugger Robot
f261041e88 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 65fb5c31c2 -s ours 
am skip reason: subject contains skip directive

Change-Id: Id431f37dea177c4b4ad6a65744d7582f460b67a5
 2020-03-20 17:45:16 +00:00
TreeHugger Robot
65fb5c31c2 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-03-20 17:24:57 +00:00
TreeHugger Robot
bf2eccc2d4 [automerger skipped] Merge "[Wi-Fi] Fix Wi-Fi broken tests" into rvc-dev am: 534bb50ec6 am: d83b13f1c8 -s ours 
am skip reason: Change-Id Ie9b9384610857e2999fe4642a93c2d31ce3315f3 with SHA-1 31f04d1585 is in history

Change-Id: If84c07cf361a394984a15d4594e0cfa0a16bb978
 2020-03-20 16:50:44 +00:00
TreeHugger Robot
be2d41ffc6 Merge "[Wi-Fi] Fix Wi-Fi broken tests" into rvc-dev am: 534bb50ec6 am: 8e0807a069 
Change-Id: I211b9944b0230131400551aa14b31c3a066db43c
 2020-03-20 16:50:34 +00:00