Merge "Final cleanups to permission slices" into pi-dev am: 64a33d695d

am: 3f3f1ebc17

Change-Id: I075703514267496004435b984733133c3a8887bf

diff --cc core/res/res/values/symbols.xml
index 42aad6a,f7ff377..3f32578
--- 1/core/res/res/values/symbols.xml
--- 2/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@@ -3382,11 -3382,7 +3382,13 @@@
    <java-symbol type="id" name="user_loading" />
  
    <java-symbol type="string" name="battery_saver_description_with_learn_more" />
 +
 +  <java-symbol type="attr" name="opticalInsetLeft" />
 +  <java-symbol type="attr" name="opticalInsetTop" />
 +  <java-symbol type="attr" name="opticalInsetRight" />
 +  <java-symbol type="attr" name="opticalInsetBottom" />
 +
    <java-symbol type="drawable" name="ic_lock_lockdown" />
+   <java-symbol type="drawable" name="ic_arrow_forward" />
+   <java-symbol type="drawable" name="ic_permission" />
  </resources>

diff --cc packages/SystemUI/AndroidManifest.xml
Simple merge

diff --cc packages/SystemUI/src/com/android/systemui/SlicePermissionActivity.java
Simple merge