Commit Graph

52940 Commits

Author SHA1 Message Date
Bill Yi
b7cc89cf2d [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d1ddb16617 -s ours
am: f78ed7078e -s ours
am skip reason: subject contains skip directive

Change-Id: I02e30980ecd606b9e18dfe1f61af71e0c01706fa
2019-05-30 17:47:52 -07:00
Bill Yi
f78ed7078e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: d1ddb16617 -s ours
am skip reason: subject contains skip directive

Change-Id: Id0af6c3c08db79fbfa30f6c50f3e404d5011a9e5
2019-05-30 17:38:37 -07:00
TreeHugger Robot
d1ddb16617 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-05-31 00:30:42 +00:00
Joshua Mccloskey
9b79a4c902 Merge "String update." into qt-r1-dev
am: b471e2439c

Change-Id: I63a30632336f2df104440ed4e51c3d76d4f2aa9f
2019-05-30 16:32:47 -07:00
Joshua Mccloskey
b471e2439c Merge "String update." into qt-r1-dev 2019-05-30 23:12:53 +00:00
Alex Salo
ac7851e1ce Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev
am: fa127bd6f7

Change-Id: Ie61452dd21b1d3d6183edab66c01b51d39c008da
2019-05-30 16:12:36 -07:00
Alex Salo
fa127bd6f7 Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev 2019-05-30 22:59:12 +00:00
Mehdi Alizadeh
6db3e8bf18 Merge "Increase char limit to 60 for string translation" into qt-dev am: 178d4a7f8f
am: 5d77656d5d

Change-Id: Ia6a3e930209d6c182f063ecc9c7fe786db73f7fb
2019-05-30 15:20:20 -07:00
Mehdi Alizadeh
97f5ab6fac Merge "Increase char limit to 60 for string translation" into qt-dev am: 178d4a7f8f
am: 4937d4ca1f

Change-Id: Ib4f85a72db8e8d36e5016c90857c532195632904
2019-05-30 15:19:22 -07:00
Bill Yi
bd1ab2754b Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6da271a883e0a62cc5f32890c3411e64ef856fa7
2019-05-30 15:17:06 -07:00
Mehdi Alizadeh
4937d4ca1f Merge "Increase char limit to 60 for string translation" into qt-dev
am: 178d4a7f8f

Change-Id: I8369dc9dc525652253f4d5a8945725b09268470c
2019-05-30 15:16:16 -07:00
Mehdi Alizadeh
5d77656d5d Merge "Increase char limit to 60 for string translation" into qt-dev
am: 178d4a7f8f

Change-Id: Ia7882da10d3f323234267cbec3ea1136214fd974
2019-05-30 15:14:15 -07:00
TreeHugger Robot
178d4a7f8f Merge "Increase char limit to 60 for string translation" into qt-dev 2019-05-30 22:04:47 +00:00
Colin Cross
243ed56948 [automerger skipped] Merge "Convert Settings to Android.bp" am: 06dfd75660 am: 8ddf9e7e3f -s ours
am: c1b598b218 -s ours
am skip reason: change_id I267534c095c30833f77273dbdb1893b7830ed45d with SHA1 946a0fd964 is in history

Change-Id: Id148a1ec77e363cc5e7f2cbe94adb172377107af
2019-05-30 14:53:04 -07:00
Colin Cross
c1b598b218 [automerger skipped] Merge "Convert Settings to Android.bp" am: 06dfd75660
am: 8ddf9e7e3f -s ours
am skip reason: change_id I267534c095c30833f77273dbdb1893b7830ed45d with SHA1 946a0fd964 is in history

Change-Id: I8e7fd2f64f6ccd6ba0f8ef2809a93322a46ac87a
2019-05-30 14:45:35 -07:00
Colin Cross
8ddf9e7e3f Merge "Convert Settings to Android.bp"
am: 06dfd75660

Change-Id: Ie863baa7e286a44a8e13b4c5e162f4fecc57de74
2019-05-30 14:37:45 -07:00
Julia Reynolds
cffcc4cb42 Merge "Change notification alert icon" into qt-dev am: 2821456995
am: 72182e1ffc

Change-Id: I59f6af8e04981f9c0c3053f58d41b7461c1101b1
2019-05-30 14:26:01 -07:00
Julia Reynolds
71420a2209 Merge "Change notification alert icon" into qt-dev am: 2821456995
am: f5afaffc2c

Change-Id: I340a6394fece9fe398e92c219b3a186db341001c
2019-05-30 14:22:17 -07:00
Julia Reynolds
72182e1ffc Merge "Change notification alert icon" into qt-dev
am: 2821456995

Change-Id: I7b38e88e702ce91162f29592c69dcc4f8612181d
2019-05-30 14:11:52 -07:00
Julia Reynolds
f5afaffc2c Merge "Change notification alert icon" into qt-dev
am: 2821456995

Change-Id: I5877100513be3b2e17d6074bedc5237fcf5ac772
2019-05-30 14:08:51 -07:00
Colin Cross
06dfd75660 Merge "Convert Settings to Android.bp" 2019-05-30 21:08:37 +00:00
TreeHugger Robot
2821456995 Merge "Change notification alert icon" into qt-dev 2019-05-30 20:51:49 +00:00
Christine Franks
d28539d045 Merge "Add SIM color picker" into qt-dev am: b747c5c270
am: 02c4e123b7

Change-Id: I1f37ffa348b5330d17a1aad5caff94d12136f9e9
2019-05-30 13:48:43 -07:00
Christine Franks
3ccc01ca18 Merge "Add SIM color picker" into qt-dev am: b747c5c270
am: c1c4a0858d

Change-Id: I0c4ac5abe7be3eeb2df324b41f13284ed25dea95
2019-05-30 13:35:49 -07:00
Christine Franks
02c4e123b7 Merge "Add SIM color picker" into qt-dev
am: b747c5c270

Change-Id: Ib5f272280d1d23c70412c3112bfcfc432af181ed
2019-05-30 13:26:55 -07:00
Christine Franks
c1c4a0858d Merge "Add SIM color picker" into qt-dev
am: b747c5c270

Change-Id: Ia234bd596017cf98dd5a76202c6fe7af486562f4
2019-05-30 13:20:46 -07:00
Christine Franks
b747c5c270 Merge "Add SIM color picker" into qt-dev 2019-05-30 20:01:48 +00:00
Julia Reynolds
80bcae426d Merge "Fix a11y readout of notification importance buttons" into qt-dev am: 1b25f986cb
am: 0a4dce78c1

Change-Id: I8494b145e87e1878929b4ff01a753746f76723e8
2019-05-30 12:18:00 -07:00
Julia Reynolds
9ae4df15fd Merge "Fix a11y readout of notification importance buttons" into qt-dev am: 1b25f986cb
am: 9e865f88be

Change-Id: Icd84f4b664f5aaa58cca23c2c89b9a4c3412981d
2019-05-30 12:16:41 -07:00
Julia Reynolds
9e865f88be Merge "Fix a11y readout of notification importance buttons" into qt-dev
am: 1b25f986cb

Change-Id: I7c94082364ef16412ef2613003c91881905ba12a
2019-05-30 12:10:23 -07:00
Julia Reynolds
0a4dce78c1 Merge "Fix a11y readout of notification importance buttons" into qt-dev
am: 1b25f986cb

Change-Id: Ia42d67cab34dfb380d5be909f22f717f8ecfd5b6
2019-05-30 12:09:22 -07:00
TreeHugger Robot
1b25f986cb Merge "Fix a11y readout of notification importance buttons" into qt-dev 2019-05-30 18:53:57 +00:00
Julia Reynolds
eeefeebeff Change notification alert icon
Test: manual
Bug: 134054170
Change-Id: Ibd66a55a30ac9fbeb7a32638fe236067c6175bc4
2019-05-30 14:47:07 -04:00
Adam He
65a6dbc797 Merge "Profile select only shows with multiple profiles present." into qt-r1-dev
am: c9364bffbc

Change-Id: I4bdd3a802d57190815e274cdaf0b2909e4236432
2019-05-30 11:39:53 -07:00
Yi-Ling Chuang
0ea2104eb6 Merge "Load wallpaper colors in a background thread." into qt-dev am: 7b332d981d
am: d164bf2309

Change-Id: I375729ab04f2b333cfba7b6620663912a21387a9
2019-05-30 11:38:31 -07:00
TreeHugger Robot
c9364bffbc Merge "Profile select only shows with multiple profiles present." into qt-r1-dev 2019-05-30 18:32:54 +00:00
Yi-Ling Chuang
d164bf2309 Merge "Load wallpaper colors in a background thread." into qt-dev
am: 7b332d981d

Change-Id: I97aea80bd414e26a443d549fcf0cdc93e07b58db
2019-05-30 11:24:31 -07:00
Yi-Ling Chuang
abccbcb23b Merge "Load wallpaper colors in a background thread." into qt-dev am: 7b332d981d
am: dd7133e523

Change-Id: Ic9c0446a211db1e9de2094fe5f13d30281a2508c
2019-05-30 11:20:43 -07:00
Yi-Ling Chuang
dd7133e523 Merge "Load wallpaper colors in a background thread." into qt-dev
am: 7b332d981d

Change-Id: I36b5b699bb4e844083fc2d9b269b1cfe311a3575
2019-05-30 11:18:03 -07:00
Lei Yu
72340ab3af Merge "Update SliceView when slice is null" into qt-dev am: f32025a17d
am: e74d9b438c

Change-Id: Ifd48a04a6e574a92568b8d370fdc516d4fc7bf51
2019-05-30 11:12:49 -07:00
Lei Yu
2dd116845a Merge "Update SliceView when slice is null" into qt-dev am: f32025a17d
am: 949c937fce

Change-Id: Ied1099bc8d4781e6b804e53cb04b61614543cb9a
2019-05-30 11:10:41 -07:00
Lei Yu
949c937fce Merge "Update SliceView when slice is null" into qt-dev
am: f32025a17d

Change-Id: Ic68f9ecae701ed79e11401ec089cf02ab786c4ad
2019-05-30 11:00:47 -07:00
Lei Yu
e74d9b438c Merge "Update SliceView when slice is null" into qt-dev
am: f32025a17d

Change-Id: I3ada32a9c34ded2d1324228314272030b6f6b489
2019-05-30 11:00:45 -07:00
TreeHugger Robot
7b332d981d Merge "Load wallpaper colors in a background thread." into qt-dev 2019-05-30 17:59:54 +00:00
joshmccloskey
5ef0a1d11d String update.
Test: Manual.
Bug: 133783098
Change-Id: If8ea2b6c9372a3da02b93b815f76e3143cc54dea
2019-05-30 10:51:34 -07:00
Lei Yu
f32025a17d Merge "Update SliceView when slice is null" into qt-dev 2019-05-30 17:38:59 +00:00
Pavel Grafov
275f036189 Merge "Make work challenge pattern resizeable." into qt-dev am: caa3b34243
am: b49bfe3b02

Change-Id: I6a57b3b5a924568996a5ad1e0e092d98f83ea6ff
2019-05-30 09:16:37 -07:00
Pavel Grafov
12fc1492b0 Merge "Make work challenge pattern resizeable." into qt-dev am: caa3b34243
am: c690471080

Change-Id: Icb784ada8940dffc791fc7344575e11d6c0b5ac4
2019-05-30 09:13:09 -07:00
Pavel Grafov
c690471080 Merge "Make work challenge pattern resizeable." into qt-dev
am: caa3b34243

Change-Id: I21c4d74ee6540fc47b477bc1113121f00304a472
2019-05-30 09:06:07 -07:00
Pavel Grafov
b49bfe3b02 Merge "Make work challenge pattern resizeable." into qt-dev
am: caa3b34243

Change-Id: I6ec27069266c2efcea3aa6fcfb08a8298eaad00a
2019-05-30 09:06:07 -07:00