PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,252 Commits 1 Branch 0 Tags
29f6ec314eac63df1dbc39aed6ffb35d3f69f0fa
Commit Graph

61252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
29f6ec314e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8c28127323 -s ours am: c763d18148 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ic87ea23e12d78533b2bf67fa9691c13324573662
 2020-04-29 05:50:19 +00:00
TreeHugger Robot
f80898b03b [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: fdb8558d88 -s ours am: 899dbf039f -s ours 
am skip reason: subject contains skip directive

Change-Id: I5313f8a3cbb131e3f9b140cc55b8baa37a74cba1
 2020-04-29 05:50:13 +00:00
TreeHugger Robot
ae12c347ee Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 am: 222da24344 
Change-Id: I2306bbe11fb2eeccfd9fc498d0faef3b4290077c
 2020-04-29 05:49:50 +00:00
TreeHugger Robot
c763d18148 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8c28127323 -s ours 
am skip reason: subject contains skip directive

Change-Id: Id2be69ba0089b706e6251e260c2b2a0efa4c8d2b
 2020-04-29 05:40:07 +00:00
TreeHugger Robot
8c28127323 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-29 05:37:45 +00:00
TreeHugger Robot
899dbf039f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: fdb8558d88 -s ours 
am skip reason: subject contains skip directive

Change-Id: I6b1514ea2a852fc8e77e413d7415d6493d749778
 2020-04-29 05:33:27 +00:00
TreeHugger Robot
222da24344 Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609 
Change-Id: I8ba500b881798bfe9ee55d5a1d82e3f8926cd4a0
 2020-04-29 05:33:14 +00:00
TreeHugger Robot
fdb8558d88 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-29 05:24:29 +00:00
TreeHugger Robot
4c221d1609 Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev 2020-04-29 05:17:30 +00:00
Paul Chang
dc0233d022 Merge "Fix - Bug report handler settings is not shown when it is launched by a work profile app." into rvc-dev am: e52353609e am: c6f8af3626 
Change-Id: I966ad09438a6607942342de174984d2af7b93847
 2020-04-29 03:11:19 +00:00
Paul Chang
c6f8af3626 Merge "Fix - Bug report handler settings is not shown when it is launched by a work profile app." into rvc-dev am: e52353609e 
Change-Id: I9e901b0b99fbcf40a34a1d0a0a6d9af11f1c22c8
 2020-04-29 02:55:05 +00:00
Paul Chang
e52353609e Merge "Fix - Bug report handler settings is not shown when it is launched by a work profile app." into rvc-dev 2020-04-29 02:38:45 +00:00
TreeHugger Robot
20876aa35e Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev am: 7a2f3dd8a7 am: 0886b927ec 
Change-Id: Ic08c232d198b32d77771ae6addff4a5a47915419
 2020-04-29 02:19:46 +00:00
TreeHugger Robot
0886b927ec Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev am: 7a2f3dd8a7 
Change-Id: I3749154738a770247a35284d26061a5f530294bf
 2020-04-29 02:01:35 +00:00
TreeHugger Robot
7a2f3dd8a7 Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev 2020-04-29 01:44:42 +00:00
Bill Yi
6de079f842 Import translations. DO NOT MERGE 
Change-Id: Ia9288eff67da11149c3207ff4c99093b5b4a2271
Auto-generated-cl: translation import
 2020-04-28 17:26:06 -07:00
Bill Yi
2a3fe1c938 Import translations. DO NOT MERGE 
Change-Id: I110ea7607bf1a03f53ec852eb9fa791f7ad7a2f3
Auto-generated-cl: translation import
 2020-04-28 16:54:21 -07:00
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
53f46dd5e2 Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e am: 0ffd6c0b17 
Change-Id: Iafa2295158931e2c51dd87ee52cb94996bb895b8
 2020-04-28 22:43:40 +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
9cdfc636ff Fix some icons on conversation screen am: 1a2e7ad52f am: 1dae9fac9d 
Change-Id: I5779c55539ec749802760b17199e1037f051a14b
 2020-04-28 20:45:56 +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
e792b84f57 Update strings to be more translation friendly am: dcc79e9942 am: 0d644b34ed 
Change-Id: I9ab4817ac8029df1bb25f1238046145613c3a798
 2020-04-28 17:16:34 +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
24e88c6666 Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e am: 46f68f51e6 
Change-Id: I900e7fe4f3b3d0ec4ef7f91a85bb66912bca5f81
 2020-04-28 14:55:28 +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
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
d7478b0db4 Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: 4738734887 
Change-Id: Iee676688bd868b5bb045bd4da5296c7549ab8860
 2020-04-28 14:08:22 +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
1676898f76 Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c am: 462f4cd695 
Change-Id: I74770262398fabbe4d7127b7faa42b81eb252c5b
 2020-04-28 13:53:58 +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
06483a6af1 Merge "[Settings] Avoid mobile data usage init in WiFi usage" into rvc-dev am: 38b0d3091d am: d0783f22c0 
Change-Id: Ifd5c59ab77f0f577f4a9d476b24bb31fda01c41c
 2020-04-28 13:22:15 +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
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
TreeHugger Robot
ab6dd73faf Merge "Add icon to current screen saver preference" into rvc-dev am: beb92c325a am: 9921ee8713 
Change-Id: Ie3b3089e0890a188e0d8c3a9d699735021289ee5
 2020-04-28 12:40:11 +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
Yanting Yang
bb6ca0fbc7 Merge "Remove sub-text from slice builder" into rvc-dev am: 38bd23cb7f am: 70abedee86 
Change-Id: I52348b944a861b144538d3455479a177494270f4
 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
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