PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
70,283 Commits 1 Branch 0 Tags
ae418fc5e81eab2eeda7bd5c07f5835e8aacb2cc
Commit Graph

70283 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
9b63618b47 Merge "Update language to comply with Android's inclusive language guidance" am: 7df1fb2af1 am: 4d421a47dc am: 7b10a29318 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374789

Change-Id: I3be1c10144d2d4b1076f843aa4fecbfe7bed8b0c
 2020-07-29 08:49:06 +00:00
Treehugger Robot
7b10a29318 Merge "Update language to comply with Android's inclusive language guidance" am: 7df1fb2af1 am: 4d421a47dc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374789

Change-Id: I47066c39d6fced154b263febab7a3fb0a1e56049
 2020-07-29 08:26:22 +00:00
Treehugger Robot
4d421a47dc Merge "Update language to comply with Android's inclusive language guidance" am: 7df1fb2af1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374789

Change-Id: I02ccfae146dd0e360fa34592a3bb21f5c2501833
 2020-07-29 08:07:46 +00:00
Treehugger Robot
7df1fb2af1 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-29 07:47:02 +00:00
Amy Hsu
e81c695a47 Change the UI strings of developer in Settings app 
Bug: 161694718
Test: Manually check Settings app
Change-Id: I79a9b955aae70da5e19f93504b39b2191a151c8f
Merged-In: I79a9b955aae70da5e19f93504b39b2191a151c8f
 2020-07-29 07:21:34 +00:00
Treehugger Robot
033bbb2df6 Merge "Update language to comply with Android's inclusive language guidance" am: 2c5a28bb2d am: f130a08d5e am: 0dd2798bf6 am: 2d6884929e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375044

Change-Id: I309ee3bbc1e950f0a77099da008a0660c4c602d6
 2020-07-29 07:01:28 +00:00
Treehugger Robot
2d6884929e Merge "Update language to comply with Android's inclusive language guidance" am: 2c5a28bb2d am: f130a08d5e am: 0dd2798bf6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375044

Change-Id: If5c1b0a191bd1695f73c20eb7a6bb535cd8d7217
 2020-07-29 06:46:24 +00:00
Treehugger Robot
0dd2798bf6 Merge "Update language to comply with Android's inclusive language guidance" am: 2c5a28bb2d am: f130a08d5e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375044

Change-Id: I72db12567fbe5febdb09e67535904ad82925484d
 2020-07-29 06:28:35 +00:00
Treehugger Robot
f130a08d5e Merge "Update language to comply with Android's inclusive language guidance" am: 2c5a28bb2d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375044

Change-Id: If0c4119754ddb20c9dab6e6a3221ef2898c34c55
 2020-07-29 06:13:21 +00:00
Treehugger Robot
2c5a28bb2d Merge "Update language to comply with Android's inclusive language guidance" 2020-07-29 05:51:09 +00:00
Treehugger Robot
4727c3b1c5 Merge "Update language to comply with Android's inclusive language guidance" am: ba534426bf am: 95773b6f1a am: d7e5e940ea am: c397bd301d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374111

Change-Id: Idd6d6589c99d8b40eaba09cc435aac6fd5a5db0e
 2020-07-29 03:27:08 +00:00
Treehugger Robot
78399afc0f Merge "Update language to comply with Android's inclusive language guidance" am: c0d28b0f96 am: da02fb34b7 am: 0a318adf46 am: 0093ecd57f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375043

Change-Id: I0f68a475fcfc214b4b8b39a0f80fe8fd99558879
 2020-07-29 03:25:37 +00:00
Treehugger Robot
c397bd301d Merge "Update language to comply with Android's inclusive language guidance" am: ba534426bf am: 95773b6f1a am: d7e5e940ea 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374111

Change-Id: I3b337e53b5696121ccb6a72634aebddf9c04f955
 2020-07-29 03:08:26 +00:00
Treehugger Robot
0093ecd57f Merge "Update language to comply with Android's inclusive language guidance" am: c0d28b0f96 am: da02fb34b7 am: 0a318adf46 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375043

Change-Id: Ie8d9822dba24a284fb18fe6c3a167fd747bebd17
 2020-07-29 03:08:10 +00:00
Treehugger Robot
d7e5e940ea Merge "Update language to comply with Android's inclusive language guidance" am: ba534426bf am: 95773b6f1a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374111

Change-Id: I458ae96ae298c32cc2f070dddac54d625929332c
 2020-07-29 02:48:26 +00:00
Treehugger Robot
0a318adf46 Merge "Update language to comply with Android's inclusive language guidance" am: c0d28b0f96 am: da02fb34b7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375043

Change-Id: I497a616313d2f9465f9a33fc296cd26ded64c835
 2020-07-29 02:48:12 +00:00
Treehugger Robot
95773b6f1a Merge "Update language to comply with Android's inclusive language guidance" am: ba534426bf 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1374111

Change-Id: I8470490508ae353636146d760564449938999daa
 2020-07-29 02:23:46 +00:00
Treehugger Robot
da02fb34b7 Merge "Update language to comply with Android's inclusive language guidance" am: c0d28b0f96 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375043

Change-Id: I9ceecd654f6ac6403d46b8287c18afe6994fc953
 2020-07-29 02:23:33 +00:00
Treehugger Robot
ba534426bf Merge "Update language to comply with Android's inclusive language guidance" 2020-07-29 02:22:28 +00:00
Treehugger Robot
c0d28b0f96 Merge "Update language to comply with Android's inclusive language guidance" 2020-07-29 02:09:58 +00:00
Blake Kragten
eda0a42118 Remove Enhanced Connectivity Dev Option 
Applying to d1-dev as this change will be propagated to qpr branch.

Remove Developer Option Enhanced Connectivity. Remove controller and
layout variables/tests.

Bug: 162231796
Test: On Device Custom Build. Testing BSM trigger. Developer Option does
not appear anymore.

Change-Id: I8a385eb444e84975a3bbd7c063c5ce94e507c25f
 2020-07-28 22:44:06 +00:00
Curtis Belmonte
5612e2c5c7 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference
 
Test: Presubmit
Bug: 161896447

Change-Id: Ib5f445c3987c6eda2c3f3be8b9ac641c4e7f934e
 2020-07-28 20:23:05 +00:00
Curtis Belmonte
1e8c7905a2 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference
 
Test: Presubmit
Bug: 161896447

Change-Id: I4ecfd2d806314e7dc3bbff00849ad4be6f81d506
 2020-07-28 20:16:03 +00:00
Curtis Belmonte
bd8f120e95 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference
 
Test: Presubmit
Bug: 161896447

Change-Id: I89dbc737c62a796d3622cf17437f9eac930c99b3
 2020-07-28 20:12:49 +00:00
Treehugger Robot
07f44b2a4a [automerger skipped] Merge "BluetoothPairingRequest: Add null check for action" am: ed7662f6f6 am: 3366290e20 am: 5486a2fdd4 am: 785b480259 -s ours 
am skip reason: Change-Id I24668e20accf96c7469c9e1ab589b1383ab59d18 with SHA-1 1805f666e7 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1372268

Change-Id: I6ad95d0325e6ec8d9ffe58a2ff6083518f5e1b61
 2020-07-28 20:08:31 +00:00
Curtis Belmonte
1aa03da058 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Change-Id: I25b5f8a2d87d8754e6536d24f986ab90a2bc69fe
Test: Presubmit
Bug: 161896447
 2020-07-28 20:08:17 +00:00
Treehugger Robot
785b480259 Merge "BluetoothPairingRequest: Add null check for action" am: ed7662f6f6 am: 3366290e20 am: 5486a2fdd4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1372268

Change-Id: Ia6bb375c12cf0acba4c5c79e292eefa2d69cddfe
 2020-07-28 19:50:46 +00:00
Treehugger Robot
5486a2fdd4 Merge "BluetoothPairingRequest: Add null check for action" am: ed7662f6f6 am: 3366290e20 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1372268

Change-Id: Iad124b74fc6c55d2220d340fbe14ae85ddcb1d13
 2020-07-28 19:33:12 +00:00
Treehugger Robot
3366290e20 Merge "BluetoothPairingRequest: Add null check for action" am: ed7662f6f6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1372268

Change-Id: Icebef90c2b18b36e5112d94aae02ae770ab300d3
 2020-07-28 19:05:02 +00:00
Treehugger Robot
ed7662f6f6 Merge "BluetoothPairingRequest: Add null check for action" 2020-07-28 18:51:00 +00:00
Treehugger Robot
ce59418d0a Merge "More inclusive language." am: 4be2b5c2f6 am: ef56fb20c3 am: b2a470166e am: 17c895b94c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1373177

Change-Id: Ia6d55cdd8c42406e347175cdf6c769bfe7e4a83e
 2020-07-28 11:25:00 +00:00
Treehugger Robot
17c895b94c Merge "More inclusive language." am: 4be2b5c2f6 am: ef56fb20c3 am: b2a470166e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1373177

Change-Id: I9d4404f5d94a9b18682b260eb7ed6413fb540202
 2020-07-28 11:14:07 +00:00
Treehugger Robot
b2a470166e Merge "More inclusive language." am: 4be2b5c2f6 am: ef56fb20c3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1373177

Change-Id: I4cd918e07ced74d846b75f01550f57e447229d51
 2020-07-28 10:58:05 +00:00
Treehugger Robot
ef56fb20c3 Merge "More inclusive language." am: 4be2b5c2f6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1373177

Change-Id: I4848004145a681e49a75a3f2d6e267b32c424585
 2020-07-28 10:42:13 +00:00
Treehugger Robot
4be2b5c2f6 Merge "More inclusive language." 2020-07-28 10:25:10 +00:00
Arc Wang
2df3a3e7df [Wi-Fi] Support multi-SIM for SIM dependent EAP methods 
Before this change, users are not able to choose SIM
card for SIM dependent EAP methods when a device supports
multi-SIM.

This change support to choose a SIM when adding an EAP
Wi-Fi network. And this change support to show the related
SIM information on Wi-Fi detail screen.

Bug: 142792009
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi.WifiConfigControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi.WifiConfigController2Test
      make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi.details2.WifiDetailPreferenceController2Test
      Manually add an EAP Wi-Fi network of EAP-SIM type, observe the
      value in Wi-Fi detail screen.
Change-Id: I2910931166dc6541897663857c46abcc1b3115fa
 2020-07-28 10:02:16 +08:00
Alan Stokes
cd2c453cbd More inclusive language. 
Test: Builds
Bug: 161896447
Change-Id: Ie4d64dca9f4720eea532b534162e47ed81aea03b
 2020-07-27 18:21:56 +01:00
Bill Yi
c410ef3a43 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d7b0e0a00e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12230457

Change-Id: Iadd61c89433d1a0fe4d951715e369acda302eabb
 2020-07-26 14:45:25 +00:00
Bill Yi
d7b0e0a00e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I96f100c3d048b2b1fdb9a5969149eba0bd677b79
 2020-07-25 18:33:55 -07:00
Arc Wang
f420f94e7d Merge "Revert "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib"" into rvc-qpr-dev am: bd86a39c7d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12193284

Change-Id: I14788fb9f4ce105fc4f095ccd2fdd4862022bcc9
 2020-07-25 01:03:34 +00:00
Arc Wang
bd86a39c7d Merge "Revert "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib"" into rvc-qpr-dev 2020-07-25 00:52:56 +00:00
Arc Wang
55bce77aea Revert "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" 
This reverts commit ebf8ffd8fd.

Reason for revert: b/161659380

Bug: 161659380
Test: manual, observe threads after launching 'Network & internet'.
Change-Id: I28773eac40c6bf194e3410b829a1a7b744f79597
Merged-In: Id4901d632f7f4634461ebbbc096e36d348a33365
 2020-07-25 00:51:50 +00:00
Chen Chen
e8dd64f891 BluetoothPairingRequest: Add null check for action am: 1805f666e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12214808

Change-Id: I48e1d4f390a6c71c86d1c191d4b9090d1f4d29bc
 2020-07-24 22:07:57 +00:00
Chen Chen
fc7b6693ee BluetoothPairingRequest: Add null check for action 
Bug: 159728132
Test: Build

Change-Id: I24668e20accf96c7469c9e1ab589b1383ab59d18
Merged-In: I24668e20accf96c7469c9e1ab589b1383ab59d18
(cherry picked from commit 1805f666e7)
 2020-07-24 14:54:35 -07:00
Chen Chen
1805f666e7 BluetoothPairingRequest: Add null check for action 
Bug: 159728132
Test: Build

Change-Id: I24668e20accf96c7469c9e1ab589b1383ab59d18
 2020-07-24 18:15:19 +00:00
TreeHugger Robot
125b8d1ea1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: bea26691e2 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12213755

Change-Id: I623b723848388158bd97fdb0a0d3cd93c7ccff17
 2020-07-24 16:29:37 +00:00
TreeHugger Robot
5516b6cbd0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2a5fd7c6ad -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12226482

Change-Id: I6d080ca5055224082044b620a1e3138123abebf2
 2020-07-24 16:29:28 +00:00
TreeHugger Robot
bea26691e2 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-07-24 16:19:51 +00:00
TreeHugger Robot
2a5fd7c6ad Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-07-24 16:14:39 +00:00
Bill Yi
a7c91c79a0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id76718f68db5dab542ea821cd972ee9338eaa64c
 2020-07-24 07:31:31 -07:00