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
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
Bonian Chen
260ad5c523
[Settings] Align data usage calculation
...
Align the calculation of data usage between
DataUsageSummaryPreferenceController and DataUsagePrefereneController.
Bug: 143996139
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest
Change-Id: I73de79b5cc298bf949827eda0a8bb0274089c016
2020-04-27 19:39:01 +08: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
4cc9f38aaa
Merge "Hide the "play media to" option" into rvc-dev am: 2152d0ce4f am: 1580c35296 am: 0a1de20630 am: 2d9cc070fc
...
Change-Id: I1519420186fd0c273c249e0b2edfd648b620754f
2020-04-27 10:47:24 +00:00
TreeHugger Robot
77d557a522
Merge "Hide the "play media to" option" into rvc-dev am: 2152d0ce4f am: 4dc3280bd8 am: 5c46f94ec1
...
Change-Id: Iffa714f3a35cdfa138e809e5f7415d58ac578c08
2020-04-27 10:33:42 +00:00
TreeHugger Robot
ce613552f9
Merge "Hide the "play media to" option" into rvc-dev am: 2152d0ce4f am: 1580c35296 am: 8dc3937594
...
Change-Id: I77424c774cfdcdc210279f3f66fa6d8a09fc7daf
2020-04-27 10:33:35 +00: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
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
11f1bc92cf
Merge "[Wi-Fi] Add object comments for WifiTrackerLib migration" into rvc-dev am: 71b353352c am: 854130ec24 am: 5354a3ec51 am: ad92213c6f
...
Change-Id: Iea97fa61ee12459d9226f437c0162ecc687bd6e5
2020-04-27 10:15:09 +00:00
Bonian Chen
be4d8bb27d
Merge "[Settings] Sync summary of call preference with dialer" into rvc-dev am: 51433a5ea8 am: 408e49b369 am: b03a392406 am: bfeefb3309
...
Change-Id: I163f2f07c2ccd267174bf4f8e630341b605fa69d
2020-04-27 10:15:03 +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
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
88e3e828e2
Merge "[Wi-Fi] Add object comments for WifiTrackerLib migration" into rvc-dev am: 71b353352c am: c343242cd6 am: 2561796c9d
...
Change-Id: I285abf5230987dcf5e366a11a30dadcd5d3727dd
2020-04-27 09:57:17 +00:00
TreeHugger Robot
2a9eedda51
Merge "[Wi-Fi] Add object comments for WifiTrackerLib migration" into rvc-dev am: 71b353352c am: 854130ec24 am: a7084cb125
...
Change-Id: I038a2a078b97ddee615299932fde006bcdfd487c
2020-04-27 09:57:08 +00:00
Bonian Chen
19a2ab6b1a
Merge "[Settings] Sync summary of call preference with dialer" into rvc-dev am: 51433a5ea8 am: 08ea07fb44 am: d2c13b4f36
...
Change-Id: If62d5e7b16e8033ffe21d28692bef671bf183799
2020-04-27 09:56:59 +00:00
Bonian Chen
6ca45c623f
Merge "[Settings] Sync summary of call preference with dialer" into rvc-dev am: 51433a5ea8 am: 408e49b369 am: 8034f50076
...
Change-Id: I33262f4b91420ea280a35c6aad90a6ac1b280bd9
2020-04-27 09:56:47 +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
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
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
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
0abea4fed4
Merge "Dynamic grouping failed the first time" into rvc-dev am: 2e16d78872 am: 03f59415ce am: c1e566a22e am: 2a2d8f2b89
...
Change-Id: Ia9f2c3b3cf604e7bd45913fea6ac6d4c88198662
2020-04-27 09:23:31 +00:00
Bonian Chen
21d9086e22
Merge "[Settings] Support re-init DataUsageSummaryPreferenceController" into rvc-dev am: 1b5f347893 am: 5450d488b4 am: e407de2ad6 am: 8da5435581
...
Change-Id: I24a48b01ace2787759da5f8bb1c3c9dbbe74da05
2020-04-27 09:23:23 +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
TreeHugger Robot
9c25e873e3
Merge "Dynamic grouping failed the first time" into rvc-dev am: 2e16d78872 am: a7183d4323 am: 6ff1bb5be5
...
Change-Id: I88a44c691b7548e7523397202adeb65f2a554e7b
2020-04-27 09:02:45 +00:00
Bonian Chen
5d17a5fa5a
Merge "[Settings] Support re-init DataUsageSummaryPreferenceController" into rvc-dev am: 1b5f347893 am: 8e09bdaa6b am: b72c15c7e8
...
Change-Id: I448cd62ac5258bce7d5552c7df6e8c04f156ad2e
2020-04-27 09:02:38 +00:00
TreeHugger Robot
cc24b800a1
Merge "Dynamic grouping failed the first time" into rvc-dev am: 2e16d78872 am: 03f59415ce am: 0de5e57557
...
Change-Id: I94aa2d9e81c49b1d11ce93e8d4a6e9feb3b70bc6
2020-04-27 09:02:32 +00:00
Bonian Chen
958469e462
Merge "[Settings] Support re-init DataUsageSummaryPreferenceController" into rvc-dev am: 1b5f347893 am: 5450d488b4 am: 9ca919591d
...
Change-Id: I254f2b7ddcdffc677b6773e3b9cc885fcfe2e07f
2020-04-27 09:02: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
