PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
68,454 Commits 1 Branch 0 Tags
77573ddec70f28ef0a0c7c63d17b1d38a534b54d
Commit Graph

32605 Commits

Author SHA1 Message Date
Mady Mellor
0ffd6c0b17 Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e 
Change-Id: Ia002914e6a8c939fdb79ff9a1a918b3869e721d2
 2020-04-28 22:30:08 +00:00
Mady Mellor
a27918494f Add list of selected/excluded convos to bubble settings 
* Some changes to extend AppConversationListPrefController
* When a user removes something from the selected or
  excluded list that resets the channel setting

Bug: 148619540
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER="Bubble"
Change-Id: I7a9ed7b70208dbdefca6c3c09d34d55c65f06408
 2020-04-28 13:18:56 -07:00
Brad Ebinger
e6fae38169 Fix NPE if CarrierConfigManager is not available 
Fixes: 155147094
Test: Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony
Change-Id: Iecf3e385a88d18c7578eb520449f4042324e21f5
 2020-04-28 11:27:27 -07:00
Beverly
5ed8cf12e8 Update strings to be more translation friendly am: dcc79e9942 am: 0d644b34ed am: 2c3e295e2f am: 7b79d4bb08 
Change-Id: I7e1ef371eaed8840429d468be51adb16c2d0b88a
 2020-04-28 17:58:03 +00:00
Beverly
2c3e295e2f Update strings to be more translation friendly am: dcc79e9942 am: 0d644b34ed 
Change-Id: I4954569d276c25c4e14bd6031d11d0209abcb384
 2020-04-28 17:16:38 +00:00
Beverly
f32362f03a Update strings to be more translation friendly am: dcc79e9942 
Change-Id: Ic9de15791cf1298605683eb42c25ee4a0901b613
 2020-04-28 16:50:46 +00:00
Beverly
0d644b34ed Update strings to be more translation friendly am: dcc79e9942 
Change-Id: Ic545a4151940b97dc705d1f7bb8f252e108c9d1b
 2020-04-28 16:49:37 +00:00
TreeHugger Robot
9a9b0b5e18 Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e am: 46f68f51e6 am: 6b3c8a4169 am: 6dcc97e72d 
Change-Id: I84359aed0aa5915e35081d082cceea5014bc4ade
 2020-04-28 15:29:13 +00:00
TreeHugger Robot
6b3c8a4169 Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e am: 46f68f51e6 
Change-Id: I6e114287d6495105022e498293000b8fbacda13d
 2020-04-28 14:54:57 +00:00
Beverly
dcc79e9942 Update strings to be more translation friendly 
Use different strings for "None" based on the context of the string.
Some languages may require different gendered grammar depending on its
context.

Also update contacts summary string to include plurals (1 vs many).

Test: make RunSettingsRoboTests7
Bug: 154898476
Fixes: 154944295
Change-Id: If9949d75de573042389a19df3d4c5d15c6cbeb25
 2020-04-28 14:53:08 +00:00
TreeHugger Robot
47b56d7152 Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e 
Change-Id: I4a63e84c417fd31e87b0b4cae0a957b13e9b79c5
 2020-04-28 14:36:28 +00:00
TreeHugger Robot
46f68f51e6 Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e 
Change-Id: Iaa49b317fbe48f2641b0d3a75be9596ead8bcc7b
 2020-04-28 14:36:23 +00:00
TreeHugger Robot
4eeb99d63e Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev 2020-04-28 14:21:14 +00:00
TreeHugger Robot
d49493a1f8 Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: 4738734887 am: 4bc961c95d am: 6637170b1d 
Change-Id: Ie7bdb43e3e3fa4919b7e8286bdda57077ae49156
 2020-04-28 14:20:50 +00:00
TreeHugger Robot
dcfafabdf0 Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c am: 462f4cd695 am: 4d26a4e326 am: c2fc5892d0 
Change-Id: I346d0ffc3ecf5310107f1756243a0daa4a3b701c
 2020-04-28 14:19:41 +00:00
TreeHugger Robot
4bc961c95d Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: 4738734887 
Change-Id: Ia923da6427ace26e9231bba0e464cf9d0a1f3a77
 2020-04-28 14:08:16 +00:00
TreeHugger Robot
dcba11ba82 Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 
Change-Id: I90d6f44c1b5af1037422aadae7fae71eabcaa452
 2020-04-28 14:02:40 +00:00
TreeHugger Robot
4738734887 Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 
Change-Id: I5d739de32339359c28bab9ab6957abf1c287b9e1
 2020-04-28 14:02:27 +00:00
TreeHugger Robot
6f482cef09 Merge "Updates for msg apps that don't use shortcuts" into rvc-dev 2020-04-28 13:57:15 +00:00
TreeHugger Robot
4d26a4e326 Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c am: 462f4cd695 
Change-Id: Ib15cfba1fe1da528b2bd8b755ffa11a92326a6e6
 2020-04-28 13:53:22 +00:00
Bonian Chen
7ec01ecd10 Merge "[Settings] Avoid mobile data usage init in WiFi usage" into rvc-dev am: 38b0d3091d am: d0783f22c0 am: 907949b2eb am: f5612b39da 
Change-Id: I7a0ea19cbc5abc8f9c27b531f829cb7f5a148e51
 2020-04-28 13:53:22 +00:00
TreeHugger Robot
f635ce3685 Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c 
Change-Id: I47d066f5a8be772d4f4367facee5ae13373b2438
 2020-04-28 13:38:12 +00:00
TreeHugger Robot
462f4cd695 Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c 
Change-Id: I5bc7cb1b0ac17d75e7ff336b63bd6bcd4d18a0d2
 2020-04-28 13:37:55 +00:00
Bonian Chen
907949b2eb Merge "[Settings] Avoid mobile data usage init in WiFi usage" into rvc-dev am: 38b0d3091d am: d0783f22c0 
Change-Id: I25419396bfc8a04be851f165fde5ead3dc61aa04
 2020-04-28 13:21:38 +00:00
TreeHugger Robot
f7ee64da6c Merge "Fix when search "storage", there are multiple results" into rvc-dev 2020-04-28 13:21:34 +00:00
TreeHugger Robot
faebaf1637 Merge "Add icon to current screen saver preference" into rvc-dev am: beb92c325a am: 9921ee8713 am: 41913ceb3d am: a1f8fe8937 
Change-Id: I28a6dadeb52c2616a4f8f1721bba86e7bf8db0a6
 2020-04-28 13:21:07 +00:00
Bonian Chen
414949593c Merge "[Settings] Avoid mobile data usage init in WiFi usage" into rvc-dev am: 38b0d3091d 
Change-Id: I2da3995606dee5652a146fb7f67649432d951945
 2020-04-28 13:03:30 +00:00
Bonian Chen
d0783f22c0 Merge "[Settings] Avoid mobile data usage init in WiFi usage" into rvc-dev am: 38b0d3091d 
Change-Id: Ic9aca8582c7567e689d7b381cd735280f7282600
 2020-04-28 13:03:30 +00:00
Bonian Chen
38b0d3091d Merge "[Settings] Avoid mobile data usage init in WiFi usage" into rvc-dev 2020-04-28 12:50:18 +00:00
Alex Johnston
05c0ab0324 Check if FRP policy is supported in Settings 
* Check if FRP policy is supported before
  erasing a device via settings.
* Call DPM TestAPI isFactoryResetProtectionPolicySupported
* If FRP policy is not supported, then do not
  erase the device.

Bug: 155057616
Test: atest com.android.settings.MasterClearConfirmTest
Change-Id: I56e4a6566457f31932658188646abe21701637fc
 2020-04-28 13:48:01 +01:00
TreeHugger Robot
41913ceb3d Merge "Add icon to current screen saver preference" into rvc-dev am: beb92c325a am: 9921ee8713 
Change-Id: Ic66fc07f9ac9656e450781031f7749bbd90c02ff
 2020-04-28 12:39:55 +00:00
TreeHugger Robot
1e27d08127 Merge "Add icon to current screen saver preference" into rvc-dev am: beb92c325a 
Change-Id: I096ba58579b7f49aeba7bc60ec9d758b007b8e1e
 2020-04-28 12:21:18 +00:00
TreeHugger Robot
9921ee8713 Merge "Add icon to current screen saver preference" into rvc-dev am: beb92c325a 
Change-Id: I30cee5190eb1a2879f5cb8383cd3be96a989eff0
 2020-04-28 12:21:11 +00:00
TreeHugger Robot
beb92c325a Merge "Add icon to current screen saver preference" into rvc-dev 2020-04-28 12:05:16 +00:00
Yanting Yang
69f5514c74 Merge "Remove sub-text from slice builder" into rvc-dev am: 38bd23cb7f am: 70abedee86 am: 38a90b2090 am: 0ff67f4a59 
Change-Id: If8f5b7acdb2f4948cee7bc8e07845565c63684f2
 2020-04-28 09:12:38 +00:00
Mill Chen
c91a8bce5b Add icon to current screen saver preference 
The screen saver setting is coming from different apps to modify
their options. This will confuse people that they were modifying
something in Settings rather than in other apps. To improve that,
we added an icon of active dream and put it on the left side of
current screen saver setting, which is to let people clearer to
know that they were modifying the options in other apps.

Bug: 129994275
Test: robotests
Change-Id: I014c9de745044c2bd39d22782b6c36f8605d8f56
 2020-04-28 17:09:01 +08:00
Yanting Yang
38a90b2090 Merge "Remove sub-text from slice builder" into rvc-dev am: 38bd23cb7f am: 70abedee86 
Change-Id: I4004c82c62a78f8c329cdc8c74a8a17a4733c0bd
 2020-04-28 08:45:00 +00:00
Yanting Yang
70abedee86 Merge "Remove sub-text from slice builder" into rvc-dev am: 38bd23cb7f 
Change-Id: I1f6023e3652dfc45694abf3cb537c8591f4205a0
 2020-04-28 08:26:06 +00:00
Yanting Yang
f3354ea59c Merge "Remove sub-text from slice builder" into rvc-dev am: 38bd23cb7f 
Change-Id: I9703a63418d231dedef72a332286fac6af86b648
 2020-04-28 08:25:33 +00:00
Yanting Yang
38bd23cb7f Merge "Remove sub-text from slice builder" into rvc-dev 2020-04-28 07:48:45 +00:00
Bonian Chen
225db346b6 [Settings] Avoid mobile data usage init in WiFi usage 
Avoid from initial in WiFi usage and update into mobile data usage after
refresh.

Bug: 151751844
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest
Change-Id: Ic6176952953ded9d47f1fc52c3f311e6568a5b90
 2020-04-28 15:47:30 +08:00
hoffc
4b575ec0d1 Settings: Fix force close when destory sim lock fragment view 
Sim lock fragment does not override its parent onCreateView method and diretly
return null, which results in NPE when destory after removing Sim card.

Override its parent onCreateView when no sim card inserted.

Bug: 154743278
Test: build pass
Change-Id: I0b10a07c1767cda74096dc44ef7ffa7839a9aae4
 2020-04-28 07:21:36 +00:00
Bonian Chen
6ff2dc5d24 Merge "[Settings] Align data usage calculation" into rvc-dev am: 0e385a58de am: a281c7bf49 am: 068f6e3a39 am: c6234f4efc 
Change-Id: Ic52f15e1272e27560db167551cad4d1803a18cce
 2020-04-28 06:51:32 +00:00
Jason Hsu
f6fc1154f3 Merge "Change the name of accessibility service fragment type to more descriptive names" into rvc-dev am: e0adf5bfd6 am: cb4587f098 am: 98c5ec6e58 am: 5c884a95a3 
Change-Id: I81d5eccf9a3eb45df7958ab17b13ce7fe740e952
 2020-04-28 06:51:20 +00:00
Bonian Chen
068f6e3a39 Merge "[Settings] Align data usage calculation" into rvc-dev am: 0e385a58de am: a281c7bf49 
Change-Id: Iad1f8005bed021f00a18cd7240b0662f946d922a
 2020-04-28 06:24:47 +00:00
Jason Hsu
98c5ec6e58 Merge "Change the name of accessibility service fragment type to more descriptive names" into rvc-dev am: e0adf5bfd6 am: cb4587f098 
Change-Id: I127aabddf277c184ac090920e89325755c98a46a
 2020-04-28 06:24:37 +00:00
Bonian Chen
3134966696 Merge "[Settings] Align data usage calculation" into rvc-dev am: 0e385a58de 
Change-Id: I471475149350474ea54d3a4e6f720d84349e60b1
 2020-04-28 06:16:47 +00:00
Bonian Chen
a281c7bf49 Merge "[Settings] Align data usage calculation" into rvc-dev am: 0e385a58de 
Change-Id: I9481a97defc128b964531fb85113798234125a82
 2020-04-28 06:16:30 +00:00
Yanting Yang
96127fe621 Remove sub-text from slice builder 
We would like to remove all sub-text from Settings Search. But slice
view does not support API to configure the sub-text visibility.
Therefore, the only way is to remove the sub-text from slices directly.

Since Settings slices are also invoked by other apps, we can not
directly remove the sub-text.

Finally, we decide to check the caller's uid. If it comes from Settings
Search, we will return the slice without the sub-text.

Bug: 143118037
Test: visual, robotests
Change-Id: Iac72f1683a2c930592634e0599058890d86f669d
 2020-04-28 14:15:16 +08:00
Bonian Chen
0e385a58de Merge "[Settings] Align data usage calculation" into rvc-dev 2020-04-28 06:13:58 +00:00