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

60952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tsung-Mao Fang
72b780aa89 Fix and Ignore broken test cases 
Test: Run Test
Bug: 150914062
Bug: 151201888
Bug: 150907639
Change-Id: I7f467aebbbe35cb20d5c42b1db04e2838c12cfbb
 2020-03-11 18:39:21 +08: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
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
Automerger Merge Worker
489d671497 Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98 
Change-Id: I26425ff7fa3413bc5cb3458843f643bb346696e5
 2020-03-11 04:20:28 +00:00
Automerger Merge Worker
0027417aec Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7 am: 88321847f2 am: a4f49c2211 am: 579a1462a0 
Change-Id: I3ae3c0a62cd0557bd8c03688f587fb59030273dc
 2020-03-11 04:20:28 +00:00
Automerger Merge Worker
cb9cfc19c3 Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98 
Change-Id: I0764e99d5970a34f7cf3a01665870123151a94f5
 2020-03-11 04:20:12 +00:00
Automerger Merge Worker
5ed31a7e16 Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7 am: 88321847f2 am: be6dd1a9c5 am: 81d2c6dad2 
Change-Id: I979fa95da971363f2da11e46781e5076aa0517ec
 2020-03-11 04:20:09 +00:00
Daniel Bright
fa5ffc97e6 Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED 
Bug: 148160428
Test: make, flash
Merged-In: I9404e2c3c816311c7ef3875622fe5cd5a315ec58
Change-Id: I9404e2c3c816311c7ef3875622fe5cd5a315ec58
 2020-03-10 21:12:25 -07:00
Arc Wang
b8fb854e98 Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev 2020-03-11 04:00:49 +00:00
Automerger Merge Worker
005f196f26 Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7 am: 18bc0af360 am: 135cf3abc6 
Change-Id: I0b31971968bc1e4b363bd378af95d307df0570b4
 2020-03-11 04:00:25 +00:00
Automerger Merge Worker
81d2c6dad2 Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7 am: 88321847f2 am: be6dd1a9c5 
Change-Id: I3b8eac3e75f61718dfae5f77a4e0cd35828cee51
 2020-03-11 04:00:14 +00:00
Automerger Merge Worker
579a1462a0 Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7 am: 88321847f2 am: a4f49c2211 
Change-Id: Ib3dd9cf888c4de1c29d193bc4f606fb256b6d9e9
 2020-03-11 04:00:13 +00:00
Automerger Merge Worker
a4f49c2211 Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7 am: 88321847f2 
Change-Id: Id257eb221584b0236ca15ed49486419979a8e828
 2020-03-11 03:46:30 +00:00
Automerger Merge Worker
135cf3abc6 Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7 am: 18bc0af360 
Change-Id: I4aa03884f25151d96cac094b64c475b17397cb99
 2020-03-11 03:46:28 +00:00
Automerger Merge Worker
be6dd1a9c5 Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7 am: 88321847f2 
Change-Id: Ie2c912682699d8dcc71eed50cb26a325d5d52bf5
 2020-03-11 03:46:17 +00:00
Automerger Merge Worker
18bc0af360 Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7 
Change-Id: I6ba6d60334ef3bdd9a873ae5435f6757789f7842
 2020-03-11 03:33:24 +00:00
Automerger Merge Worker
88321847f2 Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7 
Change-Id: I56111d64a362e93fae8ff5b12af7f12e53bfc043
 2020-03-11 03:33:13 +00:00
Automerger Merge Worker
eeb762a663 [automerger skipped] Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" am: bb8841c22e am: d0d3fd6457 -s ours am: e9711ca347 -s ours am: a50ef9ba54 -s ours am: 51c34c1004 -s ours 
am skip reason: Change-Id Ic635b11c995077ebf1e143d9562b100d7730fe52 with SHA-1 a381196b8b is in history

Change-Id: Id19a7b4b36f29ee0f029d1f274f934b3b180a32b
 2020-03-11 03:24:03 +00:00
TreeHugger Robot
6aa40f6ea7 Merge "Revert "Ignore some failed tests."" into rvc-dev 2020-03-11 03:16:49 +00:00
Yi-Ling Chuang
ef4550c504 Revert "Ignore some failed tests." 
This reverts commit db4fd2b1c3.

Reason for revert: Test failures are fixed.

Fixes: 150914017
Change-Id: I561816d51427f1141aae42128659b42cc25221dd
 2020-03-11 03:16:33 +00:00
Automerger Merge Worker
51c34c1004 [automerger skipped] Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" am: bb8841c22e am: d0d3fd6457 -s ours am: e9711ca347 -s ours am: a50ef9ba54 -s ours 
am skip reason: Change-Id Ic635b11c995077ebf1e143d9562b100d7730fe52 with SHA-1 a381196b8b is in history

Change-Id: I2c10c3f11662da6cd5d81e9f25908be9481f147e
 2020-03-11 03:06:37 +00:00
Automerger Merge Worker
a50ef9ba54 [automerger skipped] Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" am: bb8841c22e am: d0d3fd6457 -s ours am: e9711ca347 -s ours 
am skip reason: Change-Id Ic635b11c995077ebf1e143d9562b100d7730fe52 with SHA-1 a381196b8b is in history

Change-Id: Ifd675716ba383ae3d92520808293044f7750d4bf
 2020-03-11 02:40:40 +00:00
Automerger Merge Worker
e9711ca347 [automerger skipped] Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" am: bb8841c22e am: d0d3fd6457 -s ours 
am skip reason: Change-Id Ic635b11c995077ebf1e143d9562b100d7730fe52 with SHA-1 a381196b8b is in history

Change-Id: I9079a3807c1d493ccc3cba4e188db11da94eeaaa
 2020-03-11 02:20:11 +00:00
Automerger Merge Worker
d0d3fd6457 Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" am: bb8841c22e 
Change-Id: I3a0714c6e42bf6dde1371f2c188b4fa3bc4aceba
 2020-03-11 02:01:13 +00:00
Bonian Chen
bb8841c22e Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" 2020-03-11 01:45:14 +00:00
Automerger Merge Worker
1ca731169f Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964 am: b56ca208d9 am: e09cffdfdb am: c8ec6b0fd6 am: 07513e6385 
Change-Id: I5d01e70f113e024450bf34945798ba655da43c66
 2020-03-11 01:22:32 +00:00
Automerger Merge Worker
aa94a44d64 Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964 am: 6e0521fefd am: 3e4484fff8 am: 43fa1fb3fd 
Change-Id: I628041360c43586c7e1a2aabeed68639f7051c40
 2020-03-11 01:22:02 +00:00
Automerger Merge Worker
07513e6385 Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964 am: b56ca208d9 am: e09cffdfdb am: c8ec6b0fd6 
Change-Id: Id443beaa04534aeeb5de12437cae4bcaac3e1b34
 2020-03-11 01:21:41 +00:00
Automerger Merge Worker
c5b9a68b08 Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964 am: b56ca208d9 am: 855712ea9c am: 6dad4a0da6 
Change-Id: I97d35aaa014bdf02a986bd8405e88083ae154fc8
 2020-03-11 01:21:11 +00:00