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

62952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Chyn
1895f8b5f2 Move ImeAwareTextEdit to android.widget 
Allows it to be used in more projects

Bug: 154161590

Test: Manually opened each setting that was impacted
Change-Id: Ife59074e5f8ffa76c2c81cca4022ca200bb59526
 2020-04-28 15:57:40 -07:00
Mady Mellor
045dfbcca4 Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e am: ec9e965d90 
Change-Id: I9c498750d13804dd2c06d6116c93a2e81cd58adc
 2020-04-28 22:43:41 +00:00
Mady Mellor
e62939420e Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e am: 0ffd6c0b17 
Change-Id: I9cea0ab8a2d0c1173e8bbd412a08065f9c18794d
 2020-04-28 22:43:11 +00:00
Mady Mellor
ec9e965d90 Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e 
Change-Id: I382f080699006d2a3d160290f7b71d84cd65f033
 2020-04-28 22:30:18 +00:00
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
2b42301a6e Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev 2020-04-28 22:17:05 +00:00
Julia Reynolds
ea5d476de0 Fix some icons on conversation screen am: 1a2e7ad52f am: b97501ff23 
Change-Id: I4d2e0c65d95a7723f2e66fad041aedc7c4e67a6c
 2020-04-28 20:52:40 +00:00
Julia Reynolds
2581f68bd9 Fix some icons on conversation screen am: 1a2e7ad52f am: 1dae9fac9d 
Change-Id: Iaf9aaa690e95b62347720d39eb72302d7bf0d4ea
 2020-04-28 20:45:40 +00:00
Julia Reynolds
b97501ff23 Fix some icons on conversation screen am: 1a2e7ad52f 
Change-Id: Iee93e4294fb026c6d62f7bd1cb7bdc37404e9619
 2020-04-28 20:33:48 +00:00
Julia Reynolds
1dae9fac9d Fix some icons on conversation screen am: 1a2e7ad52f 
Change-Id: I51705467345bc8f961a43b4f3b2ecf2fa808cb3e
 2020-04-28 20:33:27 +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
Julia Reynolds
1a2e7ad52f Fix some icons on conversation screen 
Test: manual
Fixes: 154930822
Change-Id: Ic480203f494eaccd743a7c77895596174f52539b
 2020-04-28 19:07:08 +00: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
e6f80c2626 Update strings to be more translation friendly am: dcc79e9942 am: f32362f03a 
Change-Id: Id2f6cb93b5d5c3e00c795c78aaa6a093390b51b4
 2020-04-28 17:17:08 +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
Paul Chang
6950a8056e Fix - Bug report handler settings is not shown when it is launched by a work profile app. 
BUG: 155045928
Test: Bug report handler settings can be shown when it is launched by a work profile app

Change-Id: I1e9b5e81aac4b0bf646d4ac1cf84afd64df1df67
 2020-04-28 23:02:57 +08:00
TreeHugger Robot
305663b436 Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e am: 47b56d7152 
Change-Id: I2609354dc855493301734a2004c21e989594f974
 2020-04-28 14:55:29 +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
Automerger Merge Worker
8bb8384164 Merge "Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: dcba11ba82" into rvc-d1-dev-plus-aosp 2020-04-28 14:08:29 +00:00
TreeHugger Robot
5c427c828a Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: dcba11ba82 
Change-Id: If4766ce87e8786f179898d11f8873ff5bcda39d0
 2020-04-28 14:08:22 +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
ac9ba09d91 Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c am: f635ce3685 
Change-Id: I6ac0e23924c4ccb76281d0c719a8aa9f5351d2da
 2020-04-28 13:53:56 +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
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
2dbb480320 Merge "[Settings] Avoid mobile data usage init in WiFi usage" into rvc-dev am: 38b0d3091d am: 414949593c 
Change-Id: I4853658b7dc0fa101fb2d60de744f9b25664ea3b
 2020-04-28 13:21:58 +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
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
9c550e6fae Merge "Add icon to current screen saver preference" into rvc-dev am: beb92c325a am: 1e27d08127 
Change-Id: I0601504d78fd3b9ad5a15e61eacea815bece99cb
 2020-04-28 12:40:25 +00: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
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
Automerger Merge Worker
effc307614 Merge "Merge "Remove sub-text from slice builder" into rvc-dev am: 38bd23cb7f am: f3354ea59c" into rvc-d1-dev-plus-aosp 2020-04-28 08:45:05 +00: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
e40201f4a2 Merge "Remove sub-text from slice builder" into rvc-dev am: 38bd23cb7f am: f3354ea59c 
Change-Id: Iec234ec0192fe87894c30d3471f7d17ff62cee1c
 2020-04-28 08:45:00 +00:00