PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,959 Commits 1 Branch 0 Tags
c678022a134b5d594ec945399f6e45ee32a74aca
Commit Graph

59959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
c678022a13 Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68 am: 0cb70101c7 
Change-Id: Id210117c4d064bcd05adbc749a181271b5bd8413
 2020-03-11 21:23:05 +00:00
Automerger Merge Worker
0cb70101c7 Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68 
Change-Id: I3dc14a3085153ff5bdfd9b94c80750f9c6595b64
 2020-03-11 20:59:46 +00:00
Automerger Merge Worker
ee78d6a0d5 Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 706c05eaf4 
Change-Id: I23cabacc7df3ef3e0a1238f24c10987a70f97fd1
 2020-03-11 20:59:21 +00:00
Automerger Merge Worker
f0034eb4ed Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 279d4d9983 
Change-Id: I5b4d9c0ab3d2e087b0717728d6896209980986e1
 2020-03-11 20:59:10 +00:00
Kevin Chyn
8ee5045d68 Merge "Partial revert of ag/10482633" into rvc-dev 2020-03-11 20:56:42 +00:00
Automerger Merge Worker
279d4d9983 Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df 
Change-Id: I0f8e5ce1eb3dd6358222c81eefeb622cc5bb3ca4
 2020-03-11 20:47:43 +00:00
Automerger Merge Worker
706c05eaf4 Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df 
Change-Id: I366b32e4d47fb10f0ff9b00cfa99d7cc53779ebe
 2020-03-11 20:47:37 +00:00
TreeHugger Robot
79336396df Merge "Update empty state for apps bypassing dnd" into rvc-dev 2020-03-11 20:33:15 +00:00
Automerger Merge Worker
89f85ccbf6 Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 7152f018fa 
Change-Id: Id9ac2f6a2b074e8a07a31c401051b135b9b8b34d
 2020-03-11 20:24:00 +00:00
Automerger Merge Worker
bfa63c5fbd Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 07fb084ce7 
Change-Id: Id7db52b4409d8d12d5207f7298b58b7e20f745b5
 2020-03-11 20:23:25 +00:00
Automerger Merge Worker
7152f018fa Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab 
Change-Id: I54762e5a403b6879fb3aaf4f93ac8621a1d6dfed
 2020-03-11 20:10:36 +00:00
Automerger Merge Worker
07fb084ce7 Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab 
Change-Id: I457fe332b417e991fe7e2625fef8f8f3c176daac
 2020-03-11 20:09:21 +00:00
Julia Reynolds
44b5b7c575 Update empty state for apps bypassing dnd 
Test: atest
Fixes: 150346679
Change-Id: Iccc5f1fb3dd7ee2c114f8757a020833b3b41e91d
 2020-03-11 18:09:47 +00:00
Jason Hsu
91e5ece7ab Merge "Align help resource usage in caption preferences." into rvc-dev 2020-03-11 17:47:16 +00:00
Automerger Merge Worker
aa826d85b1 Merge "Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584" into rvc-dev-plus-aosp am: 164dce85e4 
Change-Id: I7601df3bd65c82ae0728d5cfb1858cc786f634be
 2020-03-11 13:48:23 +00:00
Automerger Merge Worker
9aa950e0d9 Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" am: 23c382aa45 am: ec71e52496 am: dcc0fa5f6e 
Change-Id: I0798c47d6a331ecfb5da24dc36638c9f90d1b14c
 2020-03-11 13:48:17 +00:00
Automerger Merge Worker
c02b876009 Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584 am: 539815566f 
Change-Id: I7cffc5bf1f1e31da43aff446d1f7cc554d8130dc
 2020-03-11 13:48:04 +00:00
Automerger Merge Worker
164dce85e4 Merge "Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584" into rvc-dev-plus-aosp 2020-03-11 13:29:35 +00:00
Automerger Merge Worker
539815566f Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584 
Change-Id: Ibb8f5b1b1e72d75a77c023d2a6bb957954d3b8b9
 2020-03-11 13:29:31 +00:00
Automerger Merge Worker
d6c0f379c5 Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584 
Change-Id: I8d0ebe9a4b6c2acb19b8e1fc9003d85cf4818faf
 2020-03-11 13:29:29 +00:00
Automerger Merge Worker
dcc0fa5f6e Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" am: 23c382aa45 am: ec71e52496 
Change-Id: I6f2b643c9c8a1aa799c6006943ed63ea68aeaf6a
 2020-03-11 13:29:27 +00:00
Automerger Merge Worker
ed4856ed64 Merge "Tweak strings for assist app" into rvc-dev am: 16a7ba81f4 am: fd3293d1db 
Change-Id: Ia308fd30fcbcbb845b9901634031e384a427833a
 2020-03-11 13:19:56 +00:00
Automerger Merge Worker
3b61fd3975 Merge "Tweak strings for assist app" into rvc-dev am: 16a7ba81f4 am: aeb13d1dd9 
Change-Id: I50a8dd13d25900c11fc28160a8abe2ca40e682c3
 2020-03-11 13:19:38 +00:00
TreeHugger Robot
11dbe14584 Merge "Fix TetherSettingsTest" into rvc-dev 2020-03-11 13:12:56 +00:00
Automerger Merge Worker
ec71e52496 Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" am: 23c382aa45 
Change-Id: I3f9d4e48bce108de162bb11daa91338951a71b46
 2020-03-11 13:09:00 +00:00
Automerger Merge Worker
fd3293d1db Merge "Tweak strings for assist app" into rvc-dev am: 16a7ba81f4 
Change-Id: I2193e15b508b9c2c5186afb2afa186d8d3f690fd
 2020-03-11 12:57:15 +00:00
Automerger Merge Worker
aeb13d1dd9 Merge "Tweak strings for assist app" into rvc-dev am: 16a7ba81f4 
Change-Id: I2fbe22e43e922b97f23ebd08f7927730e035c1fa
 2020-03-11 12:57:05 +00:00
Zoey Chen
23c382aa45 Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" 2020-03-11 12:54:05 +00:00
TreeHugger Robot
16a7ba81f4 Merge "Tweak strings for assist app" into rvc-dev 2020-03-11 12:38:44 +00:00
Automerger Merge Worker
132f9f38d8 Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 am: 01a0945e36 
Change-Id: Ib58a689a6d7dfbee62663729ddefa29eb9423f9e
 2020-03-11 11:51:31 +00:00
Automerger Merge Worker
90b0b7d10f Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: a3b983560b 
Change-Id: I65cf2ba52e0e2a1ac3aac10b3abb0c34976d8867
 2020-03-11 11:51:26 +00:00
Automerger Merge Worker
25325e9e20 Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 am: f3aa88ccf2 
Change-Id: I1e6b3b26aa19fffc081123ff6eb000a3475866c7
 2020-03-11 11:50:59 +00:00
Automerger Merge Worker
998ab43fc2 Merge "Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: 2df7ee7f0e" into rvc-d1-dev-plus-aosp 2020-03-11 11:50:58 +00:00
Automerger Merge Worker
c14719b4cb Merge "Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: 818e26464d" into rvc-d1-dev-plus-aosp 2020-03-11 11:50:57 +00:00
Automerger Merge Worker
95e42d21b1 Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: 2df7ee7f0e 
Change-Id: I26ee114ba8ee4491e555bb0edbadac78e0b07466
 2020-03-11 11:50:55 +00:00
Automerger Merge Worker
dc192bf8ed Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: ebe7dcaff8 
Change-Id: Ib261729db09b768a4f32502ee5dd405b36eee893
 2020-03-11 11:50:51 +00:00
Automerger Merge Worker
84e4f2d2f2 Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: 818e26464d 
Change-Id: Id28ebe3d9a403632607687afdfa75239c00cc609
 2020-03-11 11:50:50 +00:00
Automerger Merge Worker
01a0945e36 Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 
Change-Id: I93e4bb5a6504c40bd708da9a461f0b8414838971
 2020-03-11 11:41:00 +00:00
Automerger Merge Worker
f3aa88ccf2 Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 
Change-Id: I5cf0e713e0016b1463ba7e7e39628adc3cc407c2
 2020-03-11 11:40:51 +00:00
TreeHugger Robot
21338186d5 Merge "Fix NPE when coming back to settings homepage." into rvc-dev 2020-03-11 11:40:02 +00:00
Automerger Merge Worker
a3b983560b Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f 
Change-Id: I3fd8ec7621579ec4530cb0e37b9f8cfae72b737e
 2020-03-11 11:34:48 +00:00
Automerger Merge Worker
2df7ee7f0e Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f 
Change-Id: I7191ca8a3c7c1afcd4472649c11eb19eb0df919d
 2020-03-11 11:34:37 +00:00
TreeHugger Robot
f9570ad33f Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev 2020-03-11 11:32:12 +00:00
Automerger Merge Worker
818e26464d Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 
Change-Id: Ia773a05c5375a17f8745dd2edf41f7ecf6f20151
 2020-03-11 11:29:17 +00:00
Automerger Merge Worker
ebe7dcaff8 Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 
Change-Id: I8507db93e0193beb937e6684c18d4fbbdef08c99
 2020-03-11 11:29:06 +00:00
zoey chen
3bfbb818c7 Fix Card 2's pin shows ON when only turn on card 1's pin 
Bug: 150258187
Test: manual
Change-Id: Ifc54090da6737d31a2eb71eeabe6846592ff32fc
 2020-03-11 11:10:39 +00:00
TreeHugger Robot
a38859b2b7 Merge "Update the OWNER files" into rvc-dev 2020-03-11 11:08:21 +00:00
Tsung-Mao Fang
a5da81db36 Tweak strings for assist app 
Follow up the new Assist app string updates.

Bug: 151193605
Test: build and see this page.
Change-Id: Ibbc51cd282c6ae0f9ef1722c33688f21e0c78da7
 2020-03-11 10:22:09 +00:00
Yi-Ling Chuang
542f76a51e Fix TetherSettingsTest 
Fixes: 151204777
Test: run TetherSettingsTest
Change-Id: Ic510aac7fc7f9af095e78473bc191a4e903dcaba
 2020-03-11 18:18:36 +08:00
Yi-Ling Chuang
a591d7a082 Fix NPE when coming back to settings homepage. 
When users navigate back to the homepage, if there is a slice being
displayed, slice callback will be triggered. It will then check if this
slice has any error hint, where NPE would occur if the slice turns out
to be null. Hence, add a null check before checking slice hint.

Fixes: 148158780
Test: rebuild and navigate back to the homepage.
Change-Id: I2b04dc0d64a223cc85f6af55b2ae2dbc5f3e1f40
 2020-03-11 16:52:44 +08:00