PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
74,722 Commits 1 Branch 0 Tags
bfc5b8555d343e5dc97fe502aca276b16b5d5ec7
Commit Graph

74722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arc Wang
bfc5b8555d [automerger skipped] Merge "Revert "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib"" into rvc-qpr-dev am: bd86a39c7d am: f420f94e7d -s ours am: fc51452b25 -s ours 
am skip reason: Change-Id Id4901d632f7f4634461ebbbc096e36d348a33365 with SHA-1 fef7216ef9 is in history

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

Change-Id: I9f2fd3fba50743931b6c29dcb20ad8ba8942f29c
 2020-07-25 01:28:33 +00:00
Arc Wang
fc51452b25 [automerger skipped] Merge "Revert "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib"" into rvc-qpr-dev am: bd86a39c7d am: f420f94e7d -s ours 
am skip reason: Change-Id Id4901d632f7f4634461ebbbc096e36d348a33365 with SHA-1 fef7216ef9 is in history

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

Change-Id: I7faf8acb261b24cdbaf79e1e0286eaed20f06a36
 2020-07-25 01:18:30 +00: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
ff6f289c94 BluetoothPairingRequest: Add null check for action am: 1805f666e7 am: e8dd64f891 am: a9ffaaec62 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12214808

Change-Id: Idc8e9dfeedb79290d61441677e39ea5f82515f94
 2020-07-24 22:38:08 +00:00
Chen Chen
a9ffaaec62 BluetoothPairingRequest: Add null check for action am: 1805f666e7 am: e8dd64f891 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12214808

Change-Id: Ic34c9a8730c108d1d67eaeaeccdac2ab9c5ca9dd
 2020-07-24 22:25:07 +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
1805f666e7 BluetoothPairingRequest: Add null check for action 
Bug: 159728132
Test: Build

Change-Id: I24668e20accf96c7469c9e1ab589b1383ab59d18
 2020-07-24 18:15:19 +00:00
TreeHugger Robot
662f2fc4d9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: bea26691e2 -s ours am: 125b8d1ea1 -s ours am: 965d3d37b3 -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: I5d002db694b5f43dfffe3a3f9b734e9301e4bd0a
 2020-07-24 17:01:42 +00:00
TreeHugger Robot
6054a1a1b7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2a5fd7c6ad -s ours am: 5516b6cbd0 -s ours am: 855af64db8 -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: Ic63d148af4790f3cdc2acbfadb84ebb8d1e05e3a
 2020-07-24 17:01:06 +00:00
TreeHugger Robot
965d3d37b3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: bea26691e2 -s ours am: 125b8d1ea1 -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: I4714f83f634715bc8b48b38eac2b7a764b56c40f
 2020-07-24 16:40:48 +00:00
TreeHugger Robot
855af64db8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2a5fd7c6ad -s ours am: 5516b6cbd0 -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: I08d58e4d48b038f2526232ef73debf7a39e5df35
 2020-07-24 16:40:34 +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
TreeHugger Robot
21ecf8107b Merge "Fix the color-check-baseline checker error while repo upload" am: c8e69e99db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12224007

Change-Id: I329654598ab82b4fd52bb63ab0ee0b28d42f915c
 2020-07-24 13:41:15 +00:00
TreeHugger Robot
c8e69e99db Merge "Fix the color-check-baseline checker error while repo upload" 2020-07-24 13:27:59 +00:00
Arc Wang
7167803573 [Wi-Fi] Change Wi-Fi Auto-connect preference summary string am: 9c737122e8 am: 1313ac5514 am: 0cc0a05399 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12224002

Change-Id: I76bccc0593db1e53d81311249d314503232fb97e
 2020-07-24 07:57:24 +00:00
Arc Wang
0cc0a05399 [Wi-Fi] Change Wi-Fi Auto-connect preference summary string am: 9c737122e8 am: 1313ac5514 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12224002

Change-Id: I30e68231e9c61e63a74d04f6429005d3771e9784
 2020-07-24 07:42:48 +00: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
Sunny Shao
befb192cb2 Fix the color-check-baseline checker error while repo upload 
Fixes: 162044633
Test: pass color-check-baseline verification
Change-Id: Idca9db26db4b73d4b99d73e1b14b2953fc5dc754
 2020-07-24 13:25:30 +08:00
Arc Wang
77b7d02058 Merge "[Wi-Fi] Remove WifiTrackerLib/AccessPoint constant & API usage" am: 4f9960231b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11951645

Change-Id: Ic578c2912fe17109cc80d895a11fdd360b0406b2
 2020-07-24 03:39:07 +00:00
Arc Wang
4f9960231b Merge "[Wi-Fi] Remove WifiTrackerLib/AccessPoint constant & API usage" 2020-07-24 03:21:35 +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
TreeHugger Robot
f9b675e1d9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d8d0ad7577 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8adeeebcd1d92d82857b41ee8a2ab790dd36bfd8
 2020-07-23 21:01:21 +00:00
TreeHugger Robot
d8d0ad7577 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-07-23 20:44:34 +00:00
Bill Yi
8b078733b1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5d1166009c549ea39f1af4c5845ca7efafacec58
 2020-07-23 06:51:39 -07:00
TreeHugger Robot
7b1eb71d8e Merge "[Wi-Fi] Remove the files which use SettingsLib Wi-Fi objects" am: bc7c42621b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11951640

Change-Id: I756bb335d03e744344741a928ac96f8a1bb04b31
 2020-07-23 08:18:04 +00:00
TreeHugger Robot
bc7c42621b Merge "[Wi-Fi] Remove the files which use SettingsLib Wi-Fi objects" 2020-07-23 08:01:19 +00:00
Arc Wang
16e0a896fe Merge "[Wi-Fi] Apply WifiTrackerLib objects in Wi-Fi Slice" am: 6934c0225b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12188907

Change-Id: Ic008eb1a58fe179abb600f09ae9d876145504b8f
 2020-07-23 01:57:28 +00:00
Arc Wang
d397d8ceaf Merge "[Wi-Fi] Support WifiTrackerLib in WifiDialogActivity" am: 551dcf08e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12178216

Change-Id: Ia397d4b5e5222096a29f62334d32cbf2ee4b8e46
 2020-07-23 01:57:20 +00:00
Arc Wang
6934c0225b Merge "[Wi-Fi] Apply WifiTrackerLib objects in Wi-Fi Slice" 2020-07-23 01:38:08 +00:00
Arc Wang
551dcf08e4 Merge "[Wi-Fi] Support WifiTrackerLib in WifiDialogActivity" 2020-07-23 01:37:47 +00:00
Anton Hansson
de80e2990d [automerger skipped] Merge "Add explicit dep on ims-common" am: 0f6b2ec233 am: 7fe08c1923 -s ours am: afc6e0ac41 -s ours am: e812d32eba -s ours am: fc38f709f6 -s ours am: 5801b85254 -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: Iaf4ad73011a66f29f16fa17f2c612debd1b71223
 2020-07-22 17:36:50 +00:00
Anton Hansson
5801b85254 [automerger skipped] Merge "Add explicit dep on ims-common" am: 0f6b2ec233 am: 7fe08c1923 -s ours am: afc6e0ac41 -s ours am: e812d32eba -s ours am: fc38f709f6 -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: I364a323ea8e2f5169931585adf9d66a7678f7e9c
 2020-07-22 17:31:47 +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
Goven Liu
4274053f04 Merge "[Wi-Fi] WiFi Settings inclusive language fix plan phase 1" am: ac26cd541c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12180121

Change-Id: Iba5ce4f2c9103a924ff4f1d71cd20dac7fb79299
 2020-07-22 11:29:39 +00:00
Goven Liu
c5e248341f Merge "[Wi-Fi] WiFi Settings inclusive language fix plan phase 2" am: 6bbeb49a0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12201787

Change-Id: I06ddaf5f42216b428f92ff3502440984e5dbff59
 2020-07-22 11:29:13 +00:00
Goven Liu
ac26cd541c Merge "[Wi-Fi] WiFi Settings inclusive language fix plan phase 1" 2020-07-22 11:06:29 +00:00
Goven Liu
6bbeb49a0b Merge "[Wi-Fi] WiFi Settings inclusive language fix plan phase 2" 2020-07-22 11:05:09 +00:00
Treehugger Robot
40618bc59d Merge "Remove "storage type" preference from Settings" am: d6ac86d602 am: 44c538ccef am: 7643891ae7 am: b33b295586 am: 81d394261d am: dbf64071d9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1353609

Change-Id: I560ce523352d61f6d2e7f11490ad72b764e7fd63
 2020-07-22 10:04:19 +00:00