Commit Graph

52224 Commits

Author SHA1 Message Date
Xiangyu/Malcolm Chen
39e8aaba93 Merge "Create enable MMS notification." into qt-dev am: 25de66c030
am: 4a0f2aedd5

Change-Id: I508a0eb6ee8a23e9bcf6c6394af8e1860cfae31d
2019-05-01 11:22:28 -07:00
Sunny Goyal
ffe474de2f Merge "Restoring pinned shortcuts to original state after restore" into qt-dev am: 011c18e22b
am: 3937b263ef

Change-Id: I42b5db6ee730f288e9820c877c6ca71bcfebd703
2019-05-01 07:35:41 -07:00
Raff Tsai
cd4731fb2f Merge "Fix Battery Fix slice can not displayed" into qt-dev am: 9f7485897e
am: cbc56f8542

Change-Id: I1c29d29202897f1533447249781fc3522b759d0a
2019-05-01 07:34:50 -07:00
Fan Zhang
0360305461 Merge "Delete a broken test" into qt-dev am: c824a0cb82
am: cad5eb221c

Change-Id: Ia3baf3ef35e2520efb58c6dd85e70a2d3bca58a1
2019-05-01 07:33:55 -07:00
Mill Chen
1d7f051b41 Merge "Add synonym to "Add an account"" into qt-dev am: 5f45c17a60
am: f323f072de

Change-Id: I52e8f260aa4118c96376d32637ec6d774e22d9db
2019-05-01 07:32:57 -07:00
Yohei Yukawa
30a8d60a20 Merge "Let Settings app use InputMethodInfo#loadIcon()" into qt-dev am: 104906b344
am: 93ddd72aa9

Change-Id: I96cfdd5db00559ec60fa127c87d9845bbe703744
2019-05-01 07:32:03 -07:00
Antony Sargent
d4f37bb46e Merge "Add 'Erase SIM' to mobile network details page" into qt-dev am: 2740c4a052
am: 4e1273c53f

Change-Id: Ia925f6646eeb49564750dad9a055898ddbdd650f
2019-05-01 07:19:34 -07:00
Sunny Shao
fbe30c5bf7 Merge "Show mobile data slice in Search even no SIM card" into qt-dev am: 8b285f2355
am: 6fba302a0d

Change-Id: I917e58a68eecac6c28500eefab8ad4cc31f2087e
2019-05-01 07:18:45 -07:00
Fan Zhang
761b9931ff [automerger skipped] Merge "Delete bad translation for a few strings" into qt-dev am: c962ea0978 -s ours
am: ecf5deee74

Change-Id: If0271d04d703dc37ac26e6b8f880a52d848a4969
2019-05-01 07:17:54 -07:00
Xiangyu/Malcolm Chen
4a0f2aedd5 Merge "Create enable MMS notification." into qt-dev
am: 25de66c030

Change-Id: I5744cd16cfa4e60f70ad7a069c7efd06d419f605
2019-05-01 07:13:26 -07:00
Sunny Goyal
3937b263ef Merge "Restoring pinned shortcuts to original state after restore" into qt-dev
am: 011c18e22b

Change-Id: Ia2d627908b2d345806bc8fbca3cb8345580eb7a8
2019-05-01 07:12:22 -07:00
Raff Tsai
cbc56f8542 Merge "Fix Battery Fix slice can not displayed" into qt-dev
am: 9f7485897e

Change-Id: I0a1481ad480c8728684ab689e5ef37b063d8885e
2019-05-01 07:11:38 -07:00
Fan Zhang
cad5eb221c Merge "Delete a broken test" into qt-dev
am: c824a0cb82

Change-Id: I03296dda94edb42b9c9911a8594aca35bcb6465b
2019-05-01 07:10:51 -07:00
Mill Chen
f323f072de Merge "Add synonym to "Add an account"" into qt-dev
am: 5f45c17a60

Change-Id: Iaf7353b0c761cc5a05422e9f054cf087765eb98c
2019-05-01 07:09:57 -07:00
Yohei Yukawa
93ddd72aa9 Merge "Let Settings app use InputMethodInfo#loadIcon()" into qt-dev
am: 104906b344

Change-Id: I8972d88937c8b84b820292a19058d0dc431bea02
2019-05-01 07:09:07 -07:00
Antony Sargent
4e1273c53f Merge "Add 'Erase SIM' to mobile network details page" into qt-dev
am: 2740c4a052

Change-Id: I7fe388644b137549807d74b0a7888fdd9d7eab74
2019-05-01 07:08:19 -07:00
Sunny Shao
6fba302a0d Merge "Show mobile data slice in Search even no SIM card" into qt-dev
am: 8b285f2355

Change-Id: Ibb7ab1b8b0425938092b27dad980ef0c11ee2b66
2019-05-01 07:07:32 -07:00
Fan Zhang
ecf5deee74 [automerger skipped] Merge "Delete bad translation for a few strings" into qt-dev
am: c962ea0978 -s ours
am skip reason: SHA1 c962ea0978 skipped by user hansson

Change-Id: I439b8949e02e823d34b22c615caa4341db612247
2019-05-01 07:06:28 -07:00
Fan Zhang
7309f2c7a0 Merge "Remove parent activity from TTS_SETTINGS" into qt-dev am: 87631db975
am: 3f7b3d653f

Change-Id: I5934425f788e5c1c57b11f2af400d11d62d73d69
2019-04-30 23:16:32 -07:00
Lifu Tang
1c0c74220d Merge "Update location app stats" into qt-dev am: 5bfa4b24e2
am: 3ee7292958

Change-Id: Icb598b8930394d65012bf4e7a82b7be2e80db19a
2019-04-30 23:11:07 -07:00
hughchen
aa729ebd4d Merge "Make UI smoothly when switch device in MediaOuput slice" into qt-dev am: 9efd0c9685
am: 4d33bdc909

Change-Id: Ie0a90f79ef7ef241dd40ab390a2f480b62ff9fba
2019-04-30 23:05:14 -07:00
Yi-Ling Chuang
ab5cfcdf33 Merge "Only shows two suggestion cards at once." into qt-dev am: 15524dbaee
am: 191e38abec

Change-Id: I086330ea5c300ba13fdcdfa2d5e4e4ed0137ee9e
2019-04-30 22:57:18 -07:00
Lei Yu
2f862295fd Merge "Fix a crash in battery settings page" into qt-dev am: 116d4f14dc
am: cdce15c670

Change-Id: I3b3f4ccaa1efb7461d381906ca92d507d8c00a05
2019-04-30 22:33:43 -07:00
Fan Zhang
3f7b3d653f Merge "Remove parent activity from TTS_SETTINGS" into qt-dev
am: 87631db975

Change-Id: I7e3bf0d7fb79a6529e4b06cfe5e770148b867843
2019-04-30 21:58:18 -07:00
Lifu Tang
3ee7292958 Merge "Update location app stats" into qt-dev
am: 5bfa4b24e2

Change-Id: Ida6d56aa38861ae76654f7a01e2a0921bd1b5e6f
2019-04-30 21:57:34 -07:00
hughchen
4d33bdc909 Merge "Make UI smoothly when switch device in MediaOuput slice" into qt-dev
am: 9efd0c9685

Change-Id: Iaf9dc9b055e5ae544d499d52437c57d609b196b4
2019-04-30 21:56:49 -07:00
Yi-Ling Chuang
191e38abec Merge "Only shows two suggestion cards at once." into qt-dev
am: 15524dbaee

Change-Id: I628873293315d2850f95e8f42fbb011417dc50a5
2019-04-30 21:56:01 -07:00
Leon Liao
2250a8d36d Merge "Replace the placeholder animation." into qt-dev am: fc20597133
am: 458f15a1da

Change-Id: I142dd50313c028bcb82263b3f8152785e776d4f5
2019-04-30 20:02:36 -07:00
Beverly
d781f1a2e0 Merge "Add null check to avoid settings crash" into qt-dev am: a02cbbf23f
am: 532ba82f14

Change-Id: Iede8f734ff7524efd93c6f7480077fc483c07b88
2019-04-30 20:01:35 -07:00
Ilya Matyukhin
77faf64a86 Merge changes from topic "fingerprint-settings-after-enrollment" into qt-dev am: 64693e31d9
am: e1a84e5c23

Change-Id: Ib2cc2e7ccf0f01fe6f5156e593515ff21556e232
2019-04-30 20:00:48 -07:00
Julia Reynolds
4ad850af69 Merge "Fix visibility and editability of importance fields" into qt-dev am: 7c802e553f
am: 4c77fd575c

Change-Id: I9f0e7f1e13082d86bd9dd3bf50fb3dc70775f606
2019-04-30 19:59:59 -07:00
Beverly
43c5b3755b Merge "Update DND strings - use pull-down shade" into qt-dev am: 34fb0485fa
am: aa4adeda1c

Change-Id: I4f3d5b6c3453e71d7bfa65ac8e0c8da573fbac48
2019-04-30 19:59:10 -07:00
Lei Yu
cdce15c670 Merge "Fix a crash in battery settings page" into qt-dev
am: 116d4f14dc

Change-Id: Icf99350b41c88a6f3f6aaafd34477e5af57a49d3
2019-04-30 19:21:41 -07:00
Leon Liao
458f15a1da Merge "Replace the placeholder animation." into qt-dev
am: fc20597133

Change-Id: I00743475bc757c197a1b53f8f3af90ab01c3eb82
2019-04-30 17:28:03 -07:00
Beverly
532ba82f14 Merge "Add null check to avoid settings crash" into qt-dev
am: a02cbbf23f

Change-Id: I2f142ae998946dd84fbb4c0e46b3d48b94b0ade3
2019-04-30 17:26:59 -07:00
Ilya Matyukhin
e1a84e5c23 Merge changes from topic "fingerprint-settings-after-enrollment" into qt-dev
am: 64693e31d9

Change-Id: I93a19028b425eadb10317b93cc5de7a60f9ccaa3
2019-04-30 17:26:12 -07:00
Julia Reynolds
4c77fd575c Merge "Fix visibility and editability of importance fields" into qt-dev
am: 7c802e553f

Change-Id: I84ed085ac5dba8423f6d49beb2045c8a9460c6ed
2019-04-30 17:25:17 -07:00
Beverly
aa4adeda1c Merge "Update DND strings - use pull-down shade" into qt-dev
am: 34fb0485fa

Change-Id: If173adf304c1ac232f34bc852df93873fd06f25b
2019-04-30 17:24:26 -07:00
Xiangyu/Malcolm Chen
25de66c030 Merge "Create enable MMS notification." into qt-dev 2019-04-30 23:05:25 +00:00
TreeHugger Robot
011c18e22b Merge "Restoring pinned shortcuts to original state after restore" into qt-dev 2019-04-30 21:51:35 +00:00
TreeHugger Robot
9f7485897e Merge "Fix Battery Fix slice can not displayed" into qt-dev 2019-04-30 21:48:22 +00:00
Fan Zhang
c824a0cb82 Merge "Delete a broken test" into qt-dev 2019-04-30 20:55:35 +00:00
Fan Zhang
c34d9c9b48 Merge "Tweak paddings for apps filter in app info screen" into qt-dev am: 2da861cd52
am: abdcf0038d

Change-Id: I06af4ae8b331706ce5916cc7b4c3d58e05976541
2019-04-30 13:35:55 -07:00
Pasty Chang
8b6857951c Merge "Set QR scan activity to light theme in setup flow" into qt-dev am: 54cddc70e5
am: 9f8406d876

Change-Id: I4ca7732c16bfaf11b5ede3763a3b20e1bd9c74ae
2019-04-30 13:34:49 -07:00
TreeHugger Robot
5f45c17a60 Merge "Add synonym to "Add an account"" into qt-dev 2019-04-30 20:12:40 +00:00
Malcolm Chen
f3425dd778 Adding new strings needed for Enable MMS toggle. am: 3b5a28e2e9
am: 6baa0e1422

Change-Id: I75173e22c9302f066b7aa81879a9ce38824e58b9
2019-04-30 11:55:11 -07:00
Fan Zhang
abdcf0038d Merge "Tweak paddings for apps filter in app info screen" into qt-dev
am: 2da861cd52

Change-Id: I64d9c58d2ccca79ad461f79106d508ac62e84f1f
2019-04-30 11:42:32 -07:00
Pasty Chang
9f8406d876 Merge "Set QR scan activity to light theme in setup flow" into qt-dev
am: 54cddc70e5

Change-Id: I93fb36b2a44b37484f938a3a2066c0b5767de021
2019-04-30 11:41:18 -07:00
Malcolm Chen
6baa0e1422 Adding new strings needed for Enable MMS toggle.
am: 3b5a28e2e9

Change-Id: I28547d24978b048d9d3145520dce369daea2705f
2019-04-30 11:40:29 -07:00
Fan Zhang
e2e104f563 Delete a broken test
The test has been broken for a while.

Fixes: 120505691
Test: robotest
Change-Id: I92537d1676ba1dc94595e87893ca7324d4740a70
2019-04-30 11:37:21 -07:00