Merge icons.ts with semantic_icons.ts Change-Id: I618a155b0ee85888c22af438e14c588e85648b9a

diff --git a/ui/src/frontend/flow_events_panel.ts b/ui/src/frontend/flow_events_panel.ts
index 2debfba..964c021 100644
--- a/ui/src/frontend/flow_events_panel.ts
+++ b/ui/src/frontend/flow_events_panel.ts

@@ -14,7 +14,7 @@
 
 import m from 'mithril';
 
-import {BLANK_CHECKBOX, CHECKBOX} from '../base/icons';
+import {Icons} from '../base/semantic_icons';
 import {Actions} from '../common/actions';
 import {raf} from '../core/raf_scheduler';
 import {DurationWidget} from '../widgets/duration';
@@ -173,7 +173,7 @@
               raf.scheduleFullRedraw();
             },
           },
-          allWasChecked ? CHECKBOX : BLANK_CHECKBOX)),
+          allWasChecked ? Icons.Checkbox : Icons.BlankCheckbox)),
     ]));
 
     categoryToFlowsNum.forEach((num, cat) => {
@@ -193,7 +193,7 @@
                 raf.scheduleFullRedraw();
               },
             },
-            wasChecked ? CHECKBOX : BLANK_CHECKBOX)),
+            wasChecked ? Icons.Checkbox : Icons.BlankCheckbox)),
       ];
       rows.push(m('tr', data));
     });

diff --git a/ui/src/frontend/query_history.ts b/ui/src/frontend/query_history.ts
index d094bae..59690e9 100644
--- a/ui/src/frontend/query_history.ts
+++ b/ui/src/frontend/query_history.ts

@@ -14,7 +14,7 @@
 
 import m from 'mithril';
 
-import {STAR} from '../base/icons';
+import {Icons} from '../base/semantic_icons';
 
 import {
   arrayOf,
@@ -76,7 +76,7 @@
                   raf.scheduleFullRedraw();
                 },
               },
-              m(Icon, {icon: STAR, filled: vnode.attrs.entry.starred}),
+              m(Icon, {icon: Icons.Star, filled: vnode.attrs.entry.starred}),
               ),
           m('button',
             {

diff --git a/ui/src/frontend/track_group_panel.ts b/ui/src/frontend/track_group_panel.ts
index 3be23a3..e1f2c86 100644
--- a/ui/src/frontend/track_group_panel.ts
+++ b/ui/src/frontend/track_group_panel.ts

@@ -15,14 +15,8 @@
 import {hex} from 'color-convert';
 import m from 'mithril';
 
-import {
-  BLANK_CHECKBOX,
-  CHECKBOX,
-  EXPAND_DOWN,
-  EXPAND_UP,
-  INDETERMINATE_CHECKBOX,
-} from '../base/icons';
 import {assertExists} from '../base/logging';
+import {Icons} from '../base/semantic_icons';
 import {Actions} from '../common/actions';
 import {
   getContainingTrackId,
@@ -96,16 +90,16 @@
     const selection = globals.state.currentSelection;
 
     const trackGroup = globals.state.trackGroups[attrs.trackGroupId];
-    let checkBox = BLANK_CHECKBOX;
+    let checkBox = Icons.BlankCheckbox;
     if (selection !== null && selection.kind === 'AREA') {
       const selectedArea = globals.state.areas[selection.areaId];
       if (selectedArea.tracks.includes(attrs.trackGroupId) &&
           trackGroup.tracks.every((id) => selectedArea.tracks.includes(id))) {
-        checkBox = CHECKBOX;
+        checkBox = Icons.Checkbox;
       } else if (
           selectedArea.tracks.includes(attrs.trackGroupId) ||
           trackGroup.tracks.some((id) => selectedArea.tracks.includes(id))) {
-        checkBox = INDETERMINATE_CHECKBOX;
+        checkBox = Icons.IndeterminateCheckbox;
       }
     }
 
@@ -131,7 +125,8 @@
 
           m('.fold-button',
             m('i.material-icons',
-              this.trackGroupState.collapsed ? EXPAND_DOWN : EXPAND_UP)),
+              this.trackGroupState.collapsed ? Icons.ExpandDown :
+                                               Icons.ExpandUp)),
           m('.title-wrapper',
             m(
                 'h1.track-title',

diff --git a/ui/src/frontend/track_panel.ts b/ui/src/frontend/track_panel.ts
index d08ad8b..4d59dfa 100644
--- a/ui/src/frontend/track_panel.ts
+++ b/ui/src/frontend/track_panel.ts

@@ -15,7 +15,7 @@
 import {hex} from 'color-convert';
 import m from 'mithril';
 
-import {BLANK_CHECKBOX, CHECKBOX, PIN} from '../base/icons';
+import {Icons} from '../base/semantic_icons';
 import {duration, Span, time} from '../base/time';
 import {Actions} from '../common/actions';
 import {pluginManager} from '../common/plugins';
@@ -144,7 +144,7 @@
               globals.dispatch(
                   Actions.toggleTrackPinned({trackId: attrs.trackState.id}));
             },
-            i: PIN,
+            i: Icons.Pin,
             filledIcon: isPinned(attrs.trackState.id),
             tooltip: isPinned(attrs.trackState.id) ? 'Unpin' : 'Pin to top',
             showButton: isPinned(attrs.trackState.id),
@@ -158,7 +158,8 @@
                       {id: attrs.trackState.id, isTrackGroup: false}));
                   e.stopPropagation();
                 },
-                i: isSelected(attrs.trackState.id) ? CHECKBOX : BLANK_CHECKBOX,
+                i: isSelected(attrs.trackState.id) ? Icons.Checkbox :
+                                                     Icons.BlankCheckbox,
                 tooltip: isSelected(attrs.trackState.id) ?
                     'Remove track' :
                     'Add track to selection',

diff --git a/ui/src/frontend/widgets_page.ts b/ui/src/frontend/widgets_page.ts
index 09ec172..fe23918 100644
--- a/ui/src/frontend/widgets_page.ts
+++ b/ui/src/frontend/widgets_page.ts

@@ -16,7 +16,6 @@
 
 import {classNames} from '../base/classnames';
 import {Hotkey, Platform} from '../base/hotkeys';
-import {LIBRARY_ADD_CHECK} from '../base/icons';
 import {Icons} from '../base/semantic_icons';
 import {raf} from '../core/raf_scheduler';
 import {Anchor} from '../widgets/anchor';
@@ -666,7 +665,7 @@
             }),
             popupPosition: PopupPosition.Top,
             label: 'Multi Select',
-            icon: icon ? LIBRARY_ADD_CHECK : undefined,
+            icon: icon ? Icons.LibraryAddCheck : undefined,
             onChange: (diffs: MultiSelectDiff[]) => {
               diffs.forEach(({id, checked}) => {
                 options[id] = checked;