PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
69,916 Commits 1 Branch 0 Tags
3adb69ca0585d393a8c5e1e64fe2a419326e770c
Commit Graph

69916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Bill Yi
73f9f6df04 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6ab3d9023ae30f76708deb4ee1cc71efff64c675
 2020-07-24 06:46:58 -07:00
Arc Wang
1313ac5514 [Wi-Fi] Change Wi-Fi Auto-connect preference summary string am: 9c737122e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12224002

Change-Id: Ia25c646dc304f2b7ce71ae88fffa5331bff1a62f
 2020-07-24 07:31:06 +00:00
Arc Wang
9c737122e8 [Wi-Fi] Change Wi-Fi Auto-connect preference summary string 
To improve UX.

Bug: 162035429
Test: manual visual
Change-Id: I00d6284a4a01f21e87559477ccfba5a64f882c5c
 2020-07-24 03:13:24 +00:00
Anton Hansson
fc38f709f6 [automerger skipped] Merge "Add explicit dep on ims-common" am: 0f6b2ec233 am: 7fe08c1923 -s ours am: afc6e0ac41 -s ours am: e812d32eba -s ours 
am skip reason: Change-Id Ic663e206a0e2e780be2f27b5d539c274d4eef245 with SHA-1 d3c9df3e7e is in history

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

Change-Id: Ieacd05ccc5a8e9644642f85056de5d55eb00d850
 2020-07-22 17:05:28 +00:00
Anton Hansson
e812d32eba [automerger skipped] Merge "Add explicit dep on ims-common" am: 0f6b2ec233 am: 7fe08c1923 -s ours am: afc6e0ac41 -s ours 
am skip reason: Change-Id Ic663e206a0e2e780be2f27b5d539c274d4eef245 with SHA-1 d3c9df3e7e is in history

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

Change-Id: I3aaca7efeeb861bdb711f86eda21643b800dedf3
 2020-07-22 16:47:47 +00:00
Anton Hansson
afc6e0ac41 [automerger skipped] Merge "Add explicit dep on ims-common" am: 0f6b2ec233 am: 7fe08c1923 -s ours 
am skip reason: Change-Id Ic663e206a0e2e780be2f27b5d539c274d4eef245 with SHA-1 d3c9df3e7e is in history

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

Change-Id: I5a18c3037d6533ff85bf1f812cdc5214f99f2f50
 2020-07-22 16:33:32 +00:00
Anton Hansson
7fe08c1923 Merge "Add explicit dep on ims-common" am: 0f6b2ec233 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1370159

Change-Id: I4a02bab9e52768605891f076f504256b3198fa4a
 2020-07-22 16:11:05 +00:00
Anton Hansson
0f6b2ec233 Merge "Add explicit dep on ims-common" 2020-07-22 15:55:41 +00:00
Anton Hansson
3d12fcb246 Add explicit dep on ims-common 
android_robolectric_test is having some implicit deps removed
from it, so add in what we depend on directly.

Bug: 157451444
Test: m RunSettingsRoboTests
Exempt-From-Owner-Approval: cp from internal
Change-Id: Ic663e206a0e2e780be2f27b5d539c274d4eef245
Merged-In: Ic663e206a0e2e780be2f27b5d539c274d4eef245
 2020-07-22 14:40:27 +00:00
Treehugger Robot
81d394261d Merge "Remove "storage type" preference from Settings" am: d6ac86d602 am: 44c538ccef am: 7643891ae7 am: b33b295586 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1353609

Change-Id: I2e5ec07200ea2e2a57f87be40284753fe4ccb2cc
 2020-07-22 09:33:09 +00:00
Treehugger Robot
b33b295586 Merge "Remove "storage type" preference from Settings" am: d6ac86d602 am: 44c538ccef am: 7643891ae7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1353609

Change-Id: I474c32b3800cbf5a9c48a6086655b6c5ea8953eb
 2020-07-22 09:22:13 +00:00
Treehugger Robot
7643891ae7 Merge "Remove "storage type" preference from Settings" am: d6ac86d602 am: 44c538ccef 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1353609

Change-Id: I2e9fc90f247f4b088f749afeb75a0b3e67e73198
 2020-07-22 09:07:27 +00:00
Treehugger Robot
44c538ccef Merge "Remove "storage type" preference from Settings" am: d6ac86d602 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1353609

Change-Id: I2c12af92fc35cbfc73a58773023bd2f36edeab15
 2020-07-22 08:52:21 +00:00
Treehugger Robot
d6ac86d602 Merge "Remove "storage type" preference from Settings" 2020-07-22 08:34:56 +00:00
Treehugger Robot
b0bcaf6fea Merge "Improve the performance of displaying preference - multithread." am: 01eeece2f1 am: bf44d4eed2 am: b85a454835 am: a59338f4be 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1369637

Change-Id: I9185a72b5c417959a4d624cb4b23a8031ad77b3c
 2020-07-22 07:31:06 +00:00
Treehugger Robot
a59338f4be Merge "Improve the performance of displaying preference - multithread." am: 01eeece2f1 am: bf44d4eed2 am: b85a454835 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1369637

Change-Id: I372c94673199e4483ed3668c3e0648ba0f6bc859
 2020-07-22 07:13:32 +00:00
Treehugger Robot
b85a454835 Merge "Improve the performance of displaying preference - multithread." am: 01eeece2f1 am: bf44d4eed2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1369637

Change-Id: I8a0952d30e00f35779fd127abe9677a002f83186
 2020-07-22 06:58:04 +00:00
Treehugger Robot
bf44d4eed2 Merge "Improve the performance of displaying preference - multithread." am: 01eeece2f1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1369637

Change-Id: I46f554c200cb9f1c20e03a98f7188f3799bb6b5d
 2020-07-22 06:46:52 +00:00
Treehugger Robot
01eeece2f1 Merge "Improve the performance of displaying preference - multithread." 2020-07-22 06:33:42 +00:00
Zoey Chen
c33f162fc9 Improve the performance of displaying preference - multithread. 
Test: manual test, use command to run MobileNetworkSettings and record it.
Bug: 161691402
Change-Id: I33be3fab9eb470b48c0d0870d4c03cdaecbac334
Merged-In: I33be3fab9eb470b48c0d0870d4c03cdaecbac334
 2020-07-22 13:17:43 +08:00
Automerger Merge Worker
f666bc8e85 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: cc5fdda22e -s ours am: f3bde78e6d -s ours" into rvc-qpr-dev-plus-aosp 2020-07-22 03:41:15 +00:00
TreeHugger Robot
f7a62b4d23 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: cc5fdda22e -s ours am: f3bde78e6d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I50dd255deb4a277aa95554537c69575b8e78d98c
 2020-07-22 03:41:06 +00:00
TreeHugger Robot
e642d28e25 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: cc5fdda22e -s ours am: d88cc7e01f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I75ef2cf8d3a4d8588e5197acd623b2da144be712
 2020-07-22 03:41:05 +00:00
TreeHugger Robot
d88cc7e01f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: cc5fdda22e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5d678bf5dbb4fadea92236276f29c30b991ebbfb
 2020-07-22 03:20:38 +00:00
TreeHugger Robot
f3bde78e6d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: cc5fdda22e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieb8d3dc3df7b83e2a04c9c58e3bdd40197e550f8
 2020-07-22 03:20:35 +00:00
TreeHugger Robot
cc5fdda22e Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-07-22 03:08:07 +00:00
Bill Yi
533b0f5299 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id0c490cbe4d3a3c21a2ebfec2046cf8492de5f2f
 2020-07-21 16:18:49 -07:00
Automerger Merge Worker
1ac0cca558 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 708e1e4f9e -s ours am: 8a34f66650 -s ours am: 41d9c588eb -s ours" into rvc-qpr-dev-plus-aosp 2020-07-21 19:59:27 +00:00
Bill Yi
e313403c99 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 708e1e4f9e -s ours am: 8a34f66650 -s ours am: 41d9c588eb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If25be3840f955c48cd00e045704ecbfdcd14973d
 2020-07-21 19:59:23 +00:00
Bill Yi
e3ced7bba8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 708e1e4f9e -s ours am: cd282d2f47 -s ours am: e5727731fb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f524c68c3ef50ce8ffb3e4609d6185e4263fefd
 2020-07-21 19:59:18 +00:00
Automerger Merge Worker
bac91c4ea3 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88cbc21e3d -s ours am: d98f641fca -s ours" into rvc-qpr-dev-plus-aosp 2020-07-21 19:59:14 +00:00