PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,577 Commits 1 Branch 0 Tags
d6c1d47dffaa15673fdcedb64114dfa3228dbd3c
Commit Graph

65577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
2a3fe1c938 Import translations. DO NOT MERGE 
Change-Id: I110ea7607bf1a03f53ec852eb9fa791f7ad7a2f3
Auto-generated-cl: translation import
 2020-04-28 16:54:21 -07:00
Mady Mellor
94a291c45c Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e am: 0ffd6c0b17 am: 53f46dd5e2 am: 8b4406dadb 
Change-Id: I4b8aaad4daa7ac4f0812429762d78599ab077762
 2020-04-28 23:11:51 +00:00
Mady Mellor
aaf8c30551 Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e am: ec9e965d90 am: 045dfbcca4 
Change-Id: I544a0778153c228f372a1d7e704c682e2c251a92
 2020-04-28 23:00:32 +00:00
Mady Mellor
fad77d3ffd Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e am: 0ffd6c0b17 am: e62939420e 
Change-Id: I9fc2c7433bc2209822b393c55ea63ca8f04e1280
 2020-04-28 22:59:51 +00:00
Mady Mellor
8b4406dadb Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e am: 0ffd6c0b17 am: 53f46dd5e2 
Change-Id: I640571a848e93fbe159cfc96a8cc279a526461c3
 2020-04-28 22:59:39 +00: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
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
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
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
99ed0a9d04 Fix some icons on conversation screen am: 1a2e7ad52f am: 1dae9fac9d am: 9cdfc636ff am: 6e748079c0 
Change-Id: I23e8e60b957cb97a7871d6592568507a0e9966cb
 2020-04-28 21:20:17 +00:00
Julia Reynolds
cb8dd459b9 Fix some icons on conversation screen am: 1a2e7ad52f am: b97501ff23 am: ea5d476de0 
Change-Id: I739fb766f654240302691658a558a3e89b241df6
 2020-04-28 21:01:02 +00:00
Julia Reynolds
412ddf12e0 Fix some icons on conversation screen am: 1a2e7ad52f am: 1dae9fac9d am: 2581f68bd9 
Change-Id: Idd18708114b024cfc894f09facc1820f3e91b9ae
 2020-04-28 21:00:19 +00:00
Julia Reynolds
6e748079c0 Fix some icons on conversation screen am: 1a2e7ad52f am: 1dae9fac9d am: 9cdfc636ff 
Change-Id: I6b0a50ca6c4d5d8677afb84f2c526048a2b295a1
 2020-04-28 21:00:17 +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
9cdfc636ff Fix some icons on conversation screen am: 1a2e7ad52f am: 1dae9fac9d 
Change-Id: I5779c55539ec749802760b17199e1037f051a14b
 2020-04-28 20:45:56 +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
fdb8693a8a Update strings to be more translation friendly am: dcc79e9942 am: 0d644b34ed am: e792b84f57 am: 1f3cc80103 
Change-Id: I007195dc0f9b746265a2f150af93c8979533699a
 2020-04-28 17:51:28 +00:00
Beverly
0dccdc11b6 Update strings to be more translation friendly am: dcc79e9942 am: f32362f03a am: e6f80c2626 
Change-Id: Ia88d14a388104804618c905d62faea09e3f8c64e
 2020-04-28 17:29:49 +00:00
Beverly
1f3cc80103 Update strings to be more translation friendly am: dcc79e9942 am: 0d644b34ed am: e792b84f57 
Change-Id: I7138ed95b98c566c6fa026a8bef1a9fe07dc424c
 2020-04-28 17:29:44 +00:00
Beverly
7b79d4bb08 Update strings to be more translation friendly am: dcc79e9942 am: 0d644b34ed am: 2c3e295e2f 
Change-Id: Ide9faeb6a1c9bbb883923b79efdfc84ed18283bc
 2020-04-28 17:29:30 +00: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
e792b84f57 Update strings to be more translation friendly am: dcc79e9942 am: 0d644b34ed 
Change-Id: I9ab4817ac8029df1bb25f1238046145613c3a798
 2020-04-28 17:16:34 +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
73d0f7fb6f Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e am: 46f68f51e6 am: 24e88c6666 am: 6a320d3856 
Change-Id: Ib502c137a80c4407888a5f70e12d724585ec481c
 2020-04-28 15:29:48 +00:00
TreeHugger Robot
6a320d3856 Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e am: 46f68f51e6 am: 24e88c6666 
Change-Id: Icccabc819c1ab4ca1b0effa98234b128632b4fbc
 2020-04-28 15:08:31 +00:00
TreeHugger Robot
3628ac675a Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e am: 47b56d7152 am: 305663b436 
Change-Id: Idc724fe340a16bafc06e09075abbfa7df62be265
 2020-04-28 15:08:20 +00:00
TreeHugger Robot
6dcc97e72d Merge "[Wi-Fi] Show Wi-Fi editor for authentication failures" into rvc-dev am: 4eeb99d63e am: 46f68f51e6 am: 6b3c8a4169 
Change-Id: I9cfbd0aae537fb5804c719de44ad91ce555effc8
 2020-04-28 15:08:06 +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
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
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
1e348937e2 Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: 4738734887 am: d7478b0db4 am: 22446ccf4a 
Change-Id: I8b7375e4ed5eff94f70f6f404da0a85f4da187ce
 2020-04-28 14:20:46 +00:00
TreeHugger Robot
2d8c3431dc Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c am: 462f4cd695 am: 1676898f76 am: fbb7b19880 
Change-Id: I4e8598a5ccd70774f1bdaf7d58703102108734a0
 2020-04-28 14:20:12 +00:00
Automerger Merge Worker
614a41c3d0 Merge "Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: dcba11ba82" into rvc-d1-dev-plus-aosp am: 8bb8384164 
Change-Id: I9bf34f9c451a8b1e864ee9a60363c0d81e7e48cd
 2020-04-28 14:16:37 +00:00
TreeHugger Robot
6637170b1d Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: 4738734887 am: 4bc961c95d 
Change-Id: I4b8570b4f4fe62ac0e1753cda956ec06286ea803
 2020-04-28 14:16:19 +00:00
TreeHugger Robot
22446ccf4a Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: 4738734887 am: d7478b0db4 
Change-Id: I5a79813584186bc54de9d5a8f64854a20e7ca6f5
 2020-04-28 14:16:18 +00:00