Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,727 Commits 1 Branch 0 Tags
6471bef55c2f17bbc28cdd5a522a13d169428e78
Commit Graph

62727 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
6471bef55c Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389 am: 7cf00c8a97 
Change-Id: I727061ec65629bf410aafdf953893ab0092e7db0
 2020-04-28 03:19:03 +00:00
TreeHugger Robot
7cf00c8a97 Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389 
Change-Id: Id1c919ccbe9570d1e724e55f9d738782542fc12b
 2020-04-28 03:03:08 +00:00
TreeHugger Robot
6fcac1d389 Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev 2020-04-28 02:43:55 +00:00
TreeHugger Robot
91585bd8a5 Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: f6ab80044d 
Change-Id: I6132ee88c9944f706a77a74305eb35e8a2e99a98
 2020-04-27 20:52:17 +00:00
TreeHugger Robot
de07ac05d8 Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: 7aa3131201 
Change-Id: I4e7f836bef89d2c2f4a8dbf6005a22ac0ff17896
 2020-04-27 20:51:46 +00:00
TreeHugger Robot
f6ab80044d Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e 
Change-Id: Iff94af0e29f4537aefcb3905452efd4c34927331
 2020-04-27 20:38:25 +00:00
TreeHugger Robot
7aa3131201 Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e 
Change-Id: I91b09f88338864003ce982eb37f8cd42e1ee6971
 2020-04-27 20:37:53 +00:00
TreeHugger Robot
5c3f71859e Merge "Allow > 1 line title for DND duration preference" into rvc-dev 2020-04-27 20:21:50 +00:00
Beverly
f939976367 Allow > 1 line title for DND duration preference 
Test: manual
Fixes: 154694705
Change-Id: I9eaffb21e5d5902782beb5e9f845394015ba23be
 2020-04-27 14:23:54 -04:00
TreeHugger Robot
f150f8b606 Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462 am: 1e84f0252b 
Change-Id: I235dc0a55178e646502f987f62ad95deed6d00ea
 2020-04-27 18:03:45 +00:00
TreeHugger Robot
0c76c7cba0 Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 am: e1617681df 
Change-Id: I538434bb22af23b06da7b927daa2b8408bd1b6f1
 2020-04-27 18:03:39 +00:00
TreeHugger Robot
f9ddba1a51 Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462 am: d120058c87 
Change-Id: Ic35bececf0122e56e6716a4e05094fc83e2c9cb4
 2020-04-27 18:03:15 +00:00
TreeHugger Robot
6acc3d6c95 Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 am: 001dcc9a5b 
Change-Id: I1a04aef01625aae848e26dd94e5fe23f2fd17b98
 2020-04-27 18:02:57 +00:00
TreeHugger Robot
d120058c87 Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462 
Change-Id: Ia6dcc5c5f142838bceac1b170669be939f7065e2
 2020-04-27 17:39:13 +00:00
TreeHugger Robot
001dcc9a5b Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 
Change-Id: I2479c711420447d02e7742a00e4b1002c18dcff5
 2020-04-27 17:39:07 +00:00
TreeHugger Robot
1e84f0252b Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462 
Change-Id: I515b17b9408bdb84b5dc0d0f951f0bf167b27132
 2020-04-27 17:39:06 +00:00
TreeHugger Robot
e1617681df Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 
Change-Id: I98945495e8b451863faeb5bd18ee01b7f8ca0de2
 2020-04-27 17:38:57 +00:00
TreeHugger Robot
50a5a0c462 Merge "Separate dnd categories in a list" into rvc-dev 2020-04-27 17:38:06 +00:00
TreeHugger Robot
d28fca9182 Merge "Separate call/messages dnd summary string" into rvc-dev 2020-04-27 17:26:16 +00:00
Beverly
ae2d681faf Separate dnd categories in a list 
For translations purposes, separate strings that are the first element
in a list of sound categories from the stand alone category titles.

Test: manual
Bug: 154694384
Change-Id: I1ba5a487f179103ccfa881fdc57b10b6ec2560ad
 2020-04-27 12:08:11 -04:00
TreeHugger Robot
093ce3ce46 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7f15836d47 -s ours am: 5d8f6ee782 -s ours 
am skip reason: subject contains skip directive

Change-Id: I50541c7179208c537847cdb9cd887538d6ad1fdb
 2020-04-27 15:31:53 +00:00
TreeHugger Robot
c96e38337e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7f15836d47 -s ours am: 9ecf1649fb -s ours 
am skip reason: subject contains skip directive

Change-Id: I8f0a6037ffcc40b3817abf52cf5f3802219dfb9a
 2020-04-27 15:30:27 +00:00
TreeHugger Robot
9ecf1649fb [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7f15836d47 -s ours 
am skip reason: subject contains skip directive

Change-Id: I8b03a47456963e4553c8e248900b229c57290269
 2020-04-27 15:13:41 +00:00
TreeHugger Robot
5d8f6ee782 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7f15836d47 -s ours 
am skip reason: subject contains skip directive

Change-Id: I7e0d481d302186bad525a009193949684221fb69
 2020-04-27 15:13:38 +00:00
Menghan Li
e8c5238fd4 Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev am: 24f71c6e91 am: b49fb33540 
Change-Id: I6f67943fa45a1b8c57e83b0b457e25f8af64104b
 2020-04-27 15:08:44 +00:00
Menghan Li
abc21bdb41 Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev am: 24f71c6e91 am: 8afeaa1fa7 
Change-Id: I840a42b41004b3557ba9d25e20958ad1672081c1
 2020-04-27 15:07:40 +00:00
TreeHugger Robot
7f15836d47 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-27 14:57:02 +00:00
Menghan Li
b49fb33540 Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev am: 24f71c6e91 
Change-Id: Ib348a11d558771871da94e32e7c3fa5040590669
 2020-04-27 14:41:14 +00:00
Menghan Li
8afeaa1fa7 Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev am: 24f71c6e91 
Change-Id: I1f61856a89598b4d72bdf9873e0e7ac63e50f53f
 2020-04-27 14:40:56 +00:00
kholoud mohamed
c5b78e072f Fix broken tests in RedactionInterstitialTest 
correctly set the user as managed profile after the
implementation for ShadowUserManager#isManagedProfile changed.

Fixes: 154567856
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.notification.RedactionInterstitialTest
Change-Id: I14472913391c3986c5f27391023e396b7b64aad3
 2020-04-27 15:25:42 +01:00
Menghan Li
24f71c6e91 Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev 2020-04-27 14:22:22 +00:00
Beverly
a8ea534674 Separate call/messages dnd summary string 
The translation for call/messages may be feminine or masculine depending
on the language which changes the way this string should be translated.
Therefore, separate the string to prevent bad translations.

Test: manual
Fixes: 154687360
Change-Id: I3cbef72d41626a244ce82a0d0574427fb9c4462e
 2020-04-27 10:02:28 -04:00
Bill Yi
c162aa3acb Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I5fd1212a2ca1683651184562d1d51811883c56cd
 2020-04-27 04:37:20 -07:00
TreeHugger Robot
5c46f94ec1 Merge "Hide the "play media to" option" into rvc-dev am: 2152d0ce4f am: 4dc3280bd8 
Change-Id: I7ecbd623db551e7e6be20d7198f23ba9d6c30c1c
 2020-04-27 10:20:33 +00:00
TreeHugger Robot
8dc3937594 Merge "Hide the "play media to" option" into rvc-dev am: 2152d0ce4f am: 1580c35296 
Change-Id: Iac86942ec17d36aa05ae73eeb920173629ae5e5c
 2020-04-27 10:20:04 +00:00
TreeHugger Robot
4dc3280bd8 Merge "Hide the "play media to" option" into rvc-dev am: 2152d0ce4f 
Change-Id: I653f6f990d6bde8b6cc1187486cecb73560d34ec
 2020-04-27 10:07:55 +00:00
TreeHugger Robot
1580c35296 Merge "Hide the "play media to" option" into rvc-dev am: 2152d0ce4f 
Change-Id: I50adccf9f3fa816cefbec2490c50657be577cf29
 2020-04-27 10:07:45 +00:00
TreeHugger Robot
2152d0ce4f Merge "Hide the "play media to" option" into rvc-dev 2020-04-27 09:55:56 +00:00
TreeHugger Robot
2561796c9d Merge "[Wi-Fi] Add object comments for WifiTrackerLib migration" into rvc-dev am: 71b353352c am: c343242cd6 
Change-Id: Iadadce2dbe2f4614e25a8cccfb32a61728dd9838
 2020-04-27 09:47:01 +00:00
TreeHugger Robot
a7084cb125 Merge "[Wi-Fi] Add object comments for WifiTrackerLib migration" into rvc-dev am: 71b353352c am: 854130ec24 
Change-Id: If9b4c00324c133a40dda7fa224e3907e69385f0d
 2020-04-27 09:46:55 +00:00
Bonian Chen
d2c13b4f36 Merge "[Settings] Sync summary of call preference with dialer" into rvc-dev am: 51433a5ea8 am: 08ea07fb44 
Change-Id: I45eec6f92ba4744ac88010958844e8739d0530ec
 2020-04-27 09:46:44 +00:00
Bonian Chen
8034f50076 Merge "[Settings] Sync summary of call preference with dialer" into rvc-dev am: 51433a5ea8 am: 408e49b369 
Change-Id: I6090250799a1985c2d2f8d53c304c03ed3b6f14a
 2020-04-27 09:46:39 +00:00
TreeHugger Robot
c343242cd6 Merge "[Wi-Fi] Add object comments for WifiTrackerLib migration" into rvc-dev am: 71b353352c 
Change-Id: I1ed7e9356ed5fd2a92116ace80770723aa200f96
 2020-04-27 09:31:54 +00:00
TreeHugger Robot
854130ec24 Merge "[Wi-Fi] Add object comments for WifiTrackerLib migration" into rvc-dev am: 71b353352c 
Change-Id: Ie798a4182e284c9b2ac9ec5cfe42669b32a46e11
 2020-04-27 09:31:40 +00:00
Bonian Chen
08ea07fb44 Merge "[Settings] Sync summary of call preference with dialer" into rvc-dev am: 51433a5ea8 
Change-Id: I1542af86709326dc6db1bef691523df0e435d01a
 2020-04-27 09:31:31 +00:00
Bonian Chen
408e49b369 Merge "[Settings] Sync summary of call preference with dialer" into rvc-dev am: 51433a5ea8 
Change-Id: Ic99a56c4a37733ee40334f33d71c1a30f3713772
 2020-04-27 09:31:17 +00:00
TreeHugger Robot
71b353352c Merge "[Wi-Fi] Add object comments for WifiTrackerLib migration" into rvc-dev 2020-04-27 09:15:00 +00:00
Bonian Chen
51433a5ea8 Merge "[Settings] Sync summary of call preference with dialer" into rvc-dev 2020-04-27 09:14:22 +00:00
Bonian Chen
e17e302c9e [Settings] Sync summary of call preference with dialer 
Replacing the display of summary part within Settings' calls preference
by VoIP account when configured calling account settings within Dialer.

The click behavior for calls preference remain unchanged, due to this is
the configuration for subscription (instead of for all kinds of
accounts).

Bug: 136277187
Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DefaultSubscriptionControllerTest
Change-Id: Iaa5fa1f3efe7ba2463caa0b450077f885d42b1c8
 2020-04-27 08:53:18 +00:00
TreeHugger Robot
6ff1bb5be5 Merge "Dynamic grouping failed the first time" into rvc-dev am: 2e16d78872 am: a7183d4323 
Change-Id: Icbfb3b2c03bc5ff6c4060dc7468951ef63a4b9f5
 2020-04-27 08:51:32 +00:00