PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,713 Commits 1 Branch 0 Tags
20dca0ac1e035e5cefbe74d04440c6371430338c
Commit Graph

61713 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
android-build-team Robot
20dca0ac1e Snap for 6437181 from 52614d9226 to mainline-release 
Change-Id: I97e4a66b584081c4c78414524c64b47874249bb8
 2020-04-28 07:06:27 +00:00
TreeHugger Robot
52614d9226 Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389 am: 7cf00c8a97 am: 6cd00f8a4d 
Change-Id: I42fcfc0e87a402afc33a726b0fbc9b161b2895b6
 2020-04-28 03:35:29 +00:00
TreeHugger Robot
6cd00f8a4d Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389 am: 7cf00c8a97 
Change-Id: I75d03086165bd3ba6a72f02ed2bee4a577903628
 2020-04-28 03:19:39 +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
e194ca5528 Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: 7aa3131201 am: eab97e5548 
Change-Id: I39b9eee2e6edb9b24b5216ff0c77258ed289de8c
 2020-04-27 21:10:27 +00:00
TreeHugger Robot
eab97e5548 Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: 7aa3131201 
Change-Id: Icff3bab54b6b26f68ee83c451abd3b9e24105a23
 2020-04-27 20:52:03 +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
36b7fd7322 Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462 am: 1e84f0252b am: a84e0cb241 
Change-Id: I4cc6c791999c42fa46dcb30e722883b06c2da9b8
 2020-04-27 18:22:34 +00:00
TreeHugger Robot
a0823cbb6c Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 am: e1617681df am: e0b855898a 
Change-Id: I1d271b9fb31b38f874d6459daa5b9c7b67a8d22b
 2020-04-27 18:22:24 +00:00
TreeHugger Robot
a84e0cb241 Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462 am: 1e84f0252b 
Change-Id: I8eab9035ceacc23c3f8deabadcb0ad88ecb28387
 2020-04-27 18:04:09 +00:00
TreeHugger Robot
e0b855898a Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 am: e1617681df 
Change-Id: I4cf2d49a51639240483eb162f386a5ca1b7b4710
 2020-04-27 18:03:57 +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
2ac1f2cfa7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7f15836d47 -s ours am: 5d8f6ee782 -s ours am: 0b338dd383 -s ours 
am skip reason: subject contains skip directive

Change-Id: I9d7eb901575813b7609eb1282944034df4c09bbe
 2020-04-27 15:38:48 +00:00
TreeHugger Robot
0b338dd383 [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: I0996cc0acf0d7014d72e72601145a45ce2cdaeaa
 2020-04-27 15:31:07 +00:00
Menghan Li
7ad40cc9e4 Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev am: 24f71c6e91 am: 8afeaa1fa7 am: dc0196627d 
Change-Id: I17af5b51d03b6d5841bfe83140c393175f59e3d7
 2020-04-27 15:20:44 +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
dc0196627d Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev am: 24f71c6e91 am: 8afeaa1fa7 
Change-Id: I4e1cf7113623b30c671495f8fd5412185368df05
 2020-04-27 15:08:11 +00:00
TreeHugger Robot
7f15836d47 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-27 14:57:02 +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
2d9cc070fc Merge "Hide the "play media to" option" into rvc-dev am: 2152d0ce4f am: 1580c35296 am: 0a1de20630 
Change-Id: Ie60f349d5baab515dc55d8453553db55abb13baf
 2020-04-27 10:32:52 +00:00
TreeHugger Robot
0a1de20630 Merge "Hide the "play media to" option" into rvc-dev am: 2152d0ce4f am: 1580c35296 
Change-Id: I6ce388d461a93aad999a8b7b4cb72ba3cc0b2e6b
 2020-04-27 10:20:34 +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
ad92213c6f Merge "[Wi-Fi] Add object comments for WifiTrackerLib migration" into rvc-dev am: 71b353352c am: 854130ec24 am: 5354a3ec51 
Change-Id: Id4d00c9f53fccd4260d0a8ca42b44af70f60d9c0
 2020-04-27 10:02:01 +00:00
Bonian Chen
bfeefb3309 Merge "[Settings] Sync summary of call preference with dialer" into rvc-dev am: 51433a5ea8 am: 408e49b369 am: b03a392406 
Change-Id: Ibccc037b78ee270355ba198d1866180bfae80862
 2020-04-27 10:01:53 +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
5354a3ec51 Merge "[Wi-Fi] Add object comments for WifiTrackerLib migration" into rvc-dev am: 71b353352c am: 854130ec24 
Change-Id: I6d1ed797a90703a4da083b78e734005a12d0c6f5
 2020-04-27 09:47:10 +00:00
Bonian Chen
b03a392406 Merge "[Settings] Sync summary of call preference with dialer" into rvc-dev am: 51433a5ea8 am: 408e49b369 
Change-Id: I4a2039bdeb9e2ecf10b0be33a3d21dc5c22a8ec0
 2020-04-27 09:46:49 +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
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
TreeHugger Robot
2a2d8f2b89 Merge "Dynamic grouping failed the first time" into rvc-dev am: 2e16d78872 am: 03f59415ce am: c1e566a22e 
Change-Id: Ie1e89387f03cd73e662cf348da145f7a96819fb4
 2020-04-27 09:07:05 +00:00
Bonian Chen
8da5435581 Merge "[Settings] Support re-init DataUsageSummaryPreferenceController" into rvc-dev am: 1b5f347893 am: 5450d488b4 am: e407de2ad6 
Change-Id: I10814347701d111680339c1630b9e38142b7e9b4
 2020-04-27 09:06:50 +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
c1e566a22e Merge "Dynamic grouping failed the first time" into rvc-dev am: 2e16d78872 am: 03f59415ce 
Change-Id: I3147846138f6c79aefc4981ef98996b5a7caa212
 2020-04-27 08:51:30 +00:00
Bonian Chen
e407de2ad6 Merge "[Settings] Support re-init DataUsageSummaryPreferenceController" into rvc-dev am: 1b5f347893 am: 5450d488b4 
Change-Id: Ia6d84b34f25b3b74a379d262468b3db43f86974a
 2020-04-27 08:51:24 +00:00
TreeHugger Robot
03f59415ce Merge "Dynamic grouping failed the first time" into rvc-dev am: 2e16d78872 
Change-Id: I193214a4dd54c751ea6bee005a4b6b847cf171d7
 2020-04-27 08:38:38 +00:00
Bonian Chen
5450d488b4 Merge "[Settings] Support re-init DataUsageSummaryPreferenceController" into rvc-dev am: 1b5f347893 
Change-Id: Iece45eb3a95b4c45bf42d346f814c693071d60f4
 2020-04-27 08:38:30 +00:00
TreeHugger Robot
2e16d78872 Merge "Dynamic grouping failed the first time" into rvc-dev 2020-04-27 08:35:48 +00:00