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

60825 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
eed48b359e Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 am: 01a0945e36 am: 132f9f38d8 am: 4489bb6334 
Change-Id: I12fd0f815a6b0343b240c23bd0c0ca9bbc5274cc
 2020-03-11 12:16:06 +00:00
Automerger Merge Worker
cf89c72400 Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: a3b983560b am: 90b0b7d10f am: 76051d2c6d 
Change-Id: I454d1ad715d6a9f24b12e8ae3cdd02bf408eca45
 2020-03-11 12:15:59 +00:00
Automerger Merge Worker
c48e9b5e8e Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 am: f3aa88ccf2 am: 25325e9e20 am: e8d01bfdac 
Change-Id: I59f9155d553d19c6186123c4d2fa3a8e73b2c2fe
 2020-03-11 12:15:52 +00:00
Automerger Merge Worker
db7f6605bd Merge "Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: 2df7ee7f0e" into rvc-d1-dev-plus-aosp am: 998ab43fc2 am: 2328c28f80 
Change-Id: Ia49c382eaee55bb1ae709d1c0fa5061ba8fafaa6
 2020-03-11 12:15:46 +00:00
Automerger Merge Worker
9e6543fe00 Merge "Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: 818e26464d" into rvc-d1-dev-plus-aosp am: c14719b4cb am: d40d267867 
Change-Id: I50be55cd044586aae024442419ebc5b1e3b3bf62
 2020-03-11 12:15:25 +00:00
Automerger Merge Worker
18627953fe Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: ebe7dcaff8 am: dc192bf8ed am: 4ca5489d70 
Change-Id: Ic6213fe45e9169dd9c71cb7f0eff243b12f4b76d
 2020-03-11 12:15:02 +00:00
Automerger Merge Worker
4489bb6334 Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 am: 01a0945e36 am: 132f9f38d8 
Change-Id: I9abf6e005e89764414cf9ff2c1bf91c86e8a5c28
 2020-03-11 12:01:57 +00:00
Automerger Merge Worker
76051d2c6d Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: a3b983560b am: 90b0b7d10f 
Change-Id: Iad1760b7c2981bc4612b985a4a2fc032243f7183
 2020-03-11 12:01:52 +00:00
Automerger Merge Worker
e8d01bfdac Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 am: f3aa88ccf2 am: 25325e9e20 
Change-Id: Ifadfe25da56db629873b2b49e38d0723f6919632
 2020-03-11 12:01:46 +00:00
Automerger Merge Worker
2328c28f80 Merge "Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: 2df7ee7f0e" into rvc-d1-dev-plus-aosp am: 998ab43fc2 
Change-Id: I8cab6044283d05cf84443cc2c780c3184c89cefb
 2020-03-11 12:01:41 +00:00
Automerger Merge Worker
d40d267867 Merge "Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: 818e26464d" into rvc-d1-dev-plus-aosp am: c14719b4cb 
Change-Id: I76ff226ebdbbf49c484c96048ed8d5971538a06f
 2020-03-11 12:01:26 +00:00
Automerger Merge Worker
4ca5489d70 Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: ebe7dcaff8 am: dc192bf8ed 
Change-Id: I07b636295295bc7696bc2517cf3810b4308371e7
 2020-03-11 12:00:56 +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
TreeHugger Robot
a38859b2b7 Merge "Update the OWNER files" into rvc-dev 2020-03-11 11:08:21 +00: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
Sunny Shao
3d3757683c Update the OWNER files 
Bug: 151179432
Test: manual review
Change-Id: I2bfd917c2bea2d71303ed9aecf29d850f12eec3d
 2020-03-11 16:45:14 +08:00
Arc Wang
0a45c4099d [Wi-Fi] Fix 2 Wi-Fi shortcuts bug 
Check feature flag to show the shortcut of
WifiSettingsActivity or WifiSettings2Activity.

Bug: 151133236
Test: manual
      Home context menu -> Widgets -> Settings shortcut
      Should only show 1 Wi-Fi shortcut option.
Change-Id: Ie980b69ce1f23614475070b5c74d9a6d5cdab7ae
 2020-03-11 15:41:13 +08:00
Automerger Merge Worker
6d83276f97 [automerger skipped] Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" am: 7ef5614ee2 am: 382ac6e42e -s ours am: 020efc050a -s ours am: ae2fc32aba -s ours am: 3a1a5f4b6f -s ours 
am skip reason: Change-Id I9404e2c3c816311c7ef3875622fe5cd5a315ec58 with SHA-1 721467c679 is in history

Change-Id: I6a7356600eda260f40d9b00ec8d59da80fe21b5a
 2020-03-11 06:54:39 +00:00
Automerger Merge Worker
3a1a5f4b6f [automerger skipped] Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" am: 7ef5614ee2 am: 382ac6e42e -s ours am: 020efc050a -s ours am: ae2fc32aba -s ours 
am skip reason: Change-Id I9404e2c3c816311c7ef3875622fe5cd5a315ec58 with SHA-1 721467c679 is in history

Change-Id: Iaab72c195d5555d3124b52a15f23348361860f68
 2020-03-11 06:36:21 +00:00
Automerger Merge Worker
ae2fc32aba [automerger skipped] Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" am: 7ef5614ee2 am: 382ac6e42e -s ours am: 020efc050a -s ours 
am skip reason: Change-Id I9404e2c3c816311c7ef3875622fe5cd5a315ec58 with SHA-1 721467c679 is in history

Change-Id: I2769a1e4215440a5f501ef02f4c79df68bd234b4
 2020-03-11 06:19:48 +00:00
Automerger Merge Worker
020efc050a [automerger skipped] Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" am: 7ef5614ee2 am: 382ac6e42e -s ours 
am skip reason: Change-Id I9404e2c3c816311c7ef3875622fe5cd5a315ec58 with SHA-1 721467c679 is in history

Change-Id: I62f64918ee1bf00cad66f117b400c4404f7e7996
 2020-03-11 06:04:38 +00:00
Automerger Merge Worker
382ac6e42e Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" am: 7ef5614ee2 
Change-Id: I2881def2e37235b8d9ef4d9d82ad0abc6e7ecab4
 2020-03-11 05:51:49 +00:00
Treehugger Robot
7ef5614ee2 Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" 2020-03-11 05:40:34 +00:00
Automerger Merge Worker
53c55d5ed5 Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98 am: cb9cfc19c3 am: 423c789130 am: e740596789 am: 96071bfe6d 
Change-Id: I652110917e9ae5df1dcf70fd2b238a6e965f40c6
 2020-03-11 05:08:47 +00:00
Automerger Merge Worker
849372e897 Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98 am: 489d671497 am: 0daf548b0a am: 8584b3345b 
Change-Id: I6b64a964fef7c8f9a176b9652dc76cc2ca979435
 2020-03-11 05:08:39 +00:00
Automerger Merge Worker
bb1deeca73 Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98 am: cb9cfc19c3 am: 570ec6a4a1 am: 99974b69db 
Change-Id: I4a70e6fb297ea12873dc7b71f4bb1de3bafb703d
 2020-03-11 05:08:29 +00:00
Automerger Merge Worker
96071bfe6d Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98 am: cb9cfc19c3 am: 423c789130 am: e740596789 
Change-Id: Ia8adddeb723d267eb051cc9b12db0492557c8ffc
 2020-03-11 05:08:25 +00:00
Automerger Merge Worker
8584b3345b Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98 am: 489d671497 am: 0daf548b0a 
Change-Id: I5cf171bb528dcfea552c0e637b75aca6a630fe66
 2020-03-11 04:54:31 +00:00
Automerger Merge Worker
99974b69db Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98 am: cb9cfc19c3 am: 570ec6a4a1 
Change-Id: I32a2fffe6ba73fefeece5d52b8263b4955ca29ac
 2020-03-11 04:54:22 +00:00
Automerger Merge Worker
e740596789 Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98 am: cb9cfc19c3 am: 423c789130 
Change-Id: I08b8fd741fdebd4caa5f354ddbc14fcfe5c1a0f3
 2020-03-11 04:54:19 +00:00
Automerger Merge Worker
0daf548b0a Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98 am: 489d671497 
Change-Id: I4e4d1d0061f8a5b221d3c2449e901ab1c3c70830
 2020-03-11 04:34:15 +00:00
Automerger Merge Worker
423c789130 Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98 am: cb9cfc19c3 
Change-Id: Ic33bc4574017d972cd4007ab25373c9b6443652e
 2020-03-11 04:34:11 +00:00
Automerger Merge Worker
570ec6a4a1 Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98 am: cb9cfc19c3 
Change-Id: Ic62a6994e362f797100bedb425bbc024fc518a34
 2020-03-11 04:34:02 +00:00
Automerger Merge Worker
a422c8146e Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7 am: 88321847f2 am: a4f49c2211 am: 579a1462a0 am: 0027417aec 
Change-Id: I052dd96b5c213224481da62327e69274fcb5ee85
 2020-03-11 04:20:51 +00:00
Automerger Merge Worker
56113b2cd1 Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7 am: 18bc0af360 am: 135cf3abc6 am: 005f196f26 
Change-Id: If5c3c370edefe7d40f80b5c46cc9ebf1b8d86553
 2020-03-11 04:20:37 +00:00