PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,678 Commits 1 Branch 0 Tags
f36ca50ec79ec753ad2308d1f572b0a4c75a1531
Commit Graph

53678 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fan Zhang
f36ca50ec7 Add slice uri to slice index db 
And slightly refactored the SliceDataConverter to remove 1 reflection.

Bug: 126222433
Test: robotest
Change-Id: Ic5782bdd71f5c9cb77879a35de81dc61c01d1912
 2019-05-30 16:47:31 -07:00
Alex Salo
88e3adce68 Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev am: fa127bd6f7 
am: ac7851e1ce

Change-Id: Id621a398191568a76ed1e5bce00a63ad48a22f86
 2019-05-30 16:31:17 -07: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
77d4025099 Merge "Increase char limit to 60 for string translation" into qt-dev am: 178d4a7f8f am: 5d77656d5d 
am: 6db3e8bf18

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

Change-Id: I634d14637d8d9be256b7efb85d63969cc1473eac
 2019-05-30 15:37:57 -07:00
Colin Cross
ab93f00e11 [automerger skipped] Merge "Convert Settings to Android.bp" am: 06dfd75660 am: 8ddf9e7e3f -s ours am: c1b598b218 -s ours 
am: 243ed56948 -s ours
am skip reason: change_id I267534c095c30833f77273dbdb1893b7830ed45d with SHA1 946a0fd964 is in history

Change-Id: I851b13ea1260eb67e615966c3af8d52644fbd14a
 2019-05-30 15:23:14 -07: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
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
Julia Reynolds
37344f57b3 Merge "Change notification alert icon" into qt-dev am: 2821456995 am: 72182e1ffc 
am: cffcc4cb42

Change-Id: If297546cb7359b52ba2ea441dd116e317d00aa09
 2019-05-30 14:39:15 -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
42c33d0798 Merge "Change notification alert icon" into qt-dev am: 2821456995 am: f5afaffc2c 
am: 71420a2209

Change-Id: Ifffa09d63f2ff782b199eb4f9ddd065d079b16e6
 2019-05-30 14:33:38 -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
Christine Franks
6f77114944 Merge "Add SIM color picker" into qt-dev am: b747c5c270 am: 02c4e123b7 
am: d28539d045

Change-Id: I380b2c60027f12f8abcb6d9a3d0696c3c2c0019f
 2019-05-30 14:14:37 -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
Christine Franks
2adf1f213d Merge "Add SIM color picker" into qt-dev am: b747c5c270 am: c1c4a0858d 
am: 3ccc01ca18

Change-Id: I0e2c4d96df27e71d11b8a092f2cf86733d29727b
 2019-05-30 14:09:41 -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
354d3322c6 Merge "Fix a11y readout of notification importance buttons" into qt-dev am: 1b25f986cb am: 0a4dce78c1 
am: 80bcae426d

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

Change-Id: Ia4106b40535a25e3315f0e0466dd54b073931bd8
 2019-05-30 12:31:03 -07: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
Adam He
bb10d70e7d Merge "Profile select only shows with multiple profiles present." into qt-r1-dev am: c9364bffbc 
am: 65a6dbc797

Change-Id: Id3efe7c862b0fbeccc75f9c68331fd13e6f862a5
 2019-05-30 12:09:18 -07:00
TreeHugger Robot
1b25f986cb Merge "Fix a11y readout of notification importance buttons" into qt-dev 2019-05-30 18:53:57 +00:00
Yi-Ling Chuang
65597889ea Merge "Load wallpaper colors in a background thread." into qt-dev am: 7b332d981d am: d164bf2309 
am: 0ea2104eb6

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

Change-Id: I499c073afd07b5b468afe2c3146bb0c122949ff5
 2019-05-30 11:51:09 -07:00
Lei Yu
4668e06f46 Merge "Update SliceView when slice is null" into qt-dev am: f32025a17d am: e74d9b438c 
am: 72340ab3af

Change-Id: I1d5cc2ce9872d57e25f6af6dfcbe5130dc84661f
 2019-05-30 11:48:48 -07:00
Julia Reynolds
eeefeebeff Change notification alert icon 
Test: manual
Bug: 134054170
Change-Id: Ibd66a55a30ac9fbeb7a32638fe236067c6175bc4
 2019-05-30 14:47:07 -04:00
Lei Yu
ebdca63be8 Merge "Update SliceView when slice is null" into qt-dev am: f32025a17d am: 949c937fce 
am: 2dd116845a

Change-Id: I8f7c3467362d2e4662c0a7ad9649a2b1ab505c07
 2019-05-30 11:44:04 -07: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