From 8e62d9ae7e47c3d84895761b254034604b6ea80a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sun, 10 May 2015 22:43:05 +0200
Subject: [PATCH] Add install confirm+perms screen to SystemInstaller

---
 F-Droid/AndroidManifest.xml                   |   8 +
 .../ic_bullet_key_permission.png              | Bin 0 -> 545 bytes
 F-Droid/res/drawable-hdpi/ic_coins_s.png      | Bin 0 -> 1100 bytes
 .../drawable-hdpi/tab_unselected_holo.9.png   | Bin 0 -> 153 bytes
 .../ic_bullet_key_permission.png              | Bin 0 -> 611 bytes
 .../ic_bullet_key_permission.png              | Bin 0 -> 453 bytes
 F-Droid/res/drawable-mdpi/ic_coins_s.png      | Bin 0 -> 741 bytes
 .../drawable-mdpi/tab_unselected_holo.9.png   | Bin 0 -> 157 bytes
 .../ic_bullet_key_permission.png              | Bin 0 -> 646 bytes
 F-Droid/res/drawable-xhdpi/ic_coins_s.png     | Bin 0 -> 1483 bytes
 .../drawable-xhdpi/tab_unselected_holo.9.png  | Bin 0 -> 166 bytes
 .../ic_bullet_key_permission.png              | Bin 0 -> 1518 bytes
 .../drawable-xxhdpi/tab_unselected_holo.9.png | Bin 0 -> 1054 bytes
 F-Droid/res/drawable/ic_text_dot.xml          |  22 +
 F-Droid/res/layout/app_permission_item.xml    |  50 ++
 .../res/layout/app_permission_item_money.xml  |  76 +++
 .../res/layout/app_permission_item_old.xml    |  55 ++
 F-Droid/res/layout/app_perms_summary.xml      |  43 ++
 F-Droid/res/layout/install_app_details.xml    |  68 +++
 F-Droid/res/layout/install_confirm.xml        | 149 +++++
 F-Droid/res/layout/install_start.xml          |  37 ++
 F-Droid/res/layout/label.xml                  |  20 +
 F-Droid/res/layout/permissions_list.xml       |  53 ++
 F-Droid/res/values/colors.xml                 |   7 +-
 F-Droid/res/values/strings.xml                |  29 +-
 .../installer/AppSecurityPermissions.java     | 525 ++++++++++++++++++
 .../installer/CaffeinatedScrollView.java      |  75 +++
 .../installer/InstallConfirmActivity.java     | 251 +++++++++
 .../fdroid/fdroid/installer/Installer.java    |  12 -
 .../fdroid/installer/SystemInstaller.java     |  44 +-
 .../fdroid/fdroid/installer/TabsAdapter.java  | 163 ++++++
 .../fdroid/localrepo/LocalRepoService.java    |   3 +-
 .../org/fdroid/fdroid/RepoUpdaterTest.java    |   2 +-
 33 files changed, 1666 insertions(+), 26 deletions(-)
 create mode 100644 F-Droid/res/drawable-hdpi/ic_bullet_key_permission.png
 create mode 100644 F-Droid/res/drawable-hdpi/ic_coins_s.png
 create mode 100644 F-Droid/res/drawable-hdpi/tab_unselected_holo.9.png
 create mode 100644 F-Droid/res/drawable-ldpi/ic_bullet_key_permission.png
 create mode 100644 F-Droid/res/drawable-mdpi/ic_bullet_key_permission.png
 create mode 100644 F-Droid/res/drawable-mdpi/ic_coins_s.png
 create mode 100644 F-Droid/res/drawable-mdpi/tab_unselected_holo.9.png
 create mode 100644 F-Droid/res/drawable-xhdpi/ic_bullet_key_permission.png
 create mode 100644 F-Droid/res/drawable-xhdpi/ic_coins_s.png
 create mode 100644 F-Droid/res/drawable-xhdpi/tab_unselected_holo.9.png
 create mode 100644 F-Droid/res/drawable-xxhdpi/ic_bullet_key_permission.png
 create mode 100644 F-Droid/res/drawable-xxhdpi/tab_unselected_holo.9.png
 create mode 100644 F-Droid/res/drawable/ic_text_dot.xml
 create mode 100644 F-Droid/res/layout/app_permission_item.xml
 create mode 100644 F-Droid/res/layout/app_permission_item_money.xml
 create mode 100644 F-Droid/res/layout/app_permission_item_old.xml
 create mode 100644 F-Droid/res/layout/app_perms_summary.xml
 create mode 100644 F-Droid/res/layout/install_app_details.xml
 create mode 100644 F-Droid/res/layout/install_confirm.xml
 create mode 100644 F-Droid/res/layout/install_start.xml
 create mode 100644 F-Droid/res/layout/label.xml
 create mode 100644 F-Droid/res/layout/permissions_list.xml
 create mode 100644 F-Droid/src/org/fdroid/fdroid/installer/AppSecurityPermissions.java
 create mode 100644 F-Droid/src/org/fdroid/fdroid/installer/CaffeinatedScrollView.java
 create mode 100644 F-Droid/src/org/fdroid/fdroid/installer/InstallConfirmActivity.java
 create mode 100644 F-Droid/src/org/fdroid/fdroid/installer/TabsAdapter.java

diff --git a/F-Droid/AndroidManifest.xml b/F-Droid/AndroidManifest.xml
index cd48da400..679b6d7af 100644
--- a/F-Droid/AndroidManifest.xml
+++ b/F-Droid/AndroidManifest.xml
@@ -292,6 +292,14 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".FDroid" />
         </activity>
+        <activity
+            android:name=".installer.InstallConfirmActivity"
+            android:label=""
+            android:parentActivityName=".FDroid">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".FDroid" />
+        </activity>
         <activity
             android:name=".views.ManageReposActivity"
             android:label="@string/app_name"
diff --git a/F-Droid/res/drawable-hdpi/ic_bullet_key_permission.png b/F-Droid/res/drawable-hdpi/ic_bullet_key_permission.png
new file mode 100644
index 0000000000000000000000000000000000000000..4cf50ade1039f437455cc7b023304518ac8c6c58
GIT binary patch
literal 545
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}trX+877l!}s{b%+Ad7K3vk;OpT
z1B~5HX4`=T%L*LRfizez!?|}o;S3Cnnw~C>ArXh)PIb&XWFX+WUv|m8B?Sy(whYpI
z4M$XWu%tUL^4``mIi%=WX(GE)OVaj}Y$x+mE06s@{;fhORBNi&Q{Dnq&o9jS>YR~3
zA2rQUxqsrFpI=<;%}+UOf49$`GcC$%*DI|jkL|kp5`5$oZITXmGB`XqqITA<FTbhL
zU8X}~np^w5q*ad1H<)A<JEa@>ZXA1I!rWdkM^V<_pW&RL)!75e*Zd#xPc}W&ubpz}
z)1<JhU#H{~vbLPke!_FCm@Djgkk2LGZ%XG+mv~G5XK#-vsH{9GE_PYpa@tEi4(4u)
zduIceDZP6%LoQNb$?-CuiIO}?8{cKV*WZ~Me@pAsthtjXzjTiOHRZ~yX!}orw(1|I
zm)+%6n|<@v*8_)m>nud{*M(?JJ!SoY`@XNVk3`tH*T4`|Epd$~Nl7e8wMs5Z1yT$~
z28M>Zh6cKZCLxAqRwkxaCdRr3=2iv<=cb=iM$wR)pOTqYiLSxG%D@n!!OLtB2T+3~
u$cEtjw370~qErUQl>DSr1<%~X^wgl##FWaylc_d9MGT&<elF{r5}E*rMal^P

literal 0
HcmV?d00001

diff --git a/F-Droid/res/drawable-hdpi/ic_coins_s.png b/F-Droid/res/drawable-hdpi/ic_coins_s.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ada1d00810359137bc726ab39fe6cd805f85c3d
GIT binary patch
literal 1100
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEa{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YPV
z+ueoXKL{?^yL>WGgtNdSvY3H^TL^?1FWs&C!@$7w!_&nv#N+tftKJ<kt|Dv?-ru`D
zS#rMMqz;Xa{sm4w3)X5h>8V@{z0k{Dx_E~`X{LjsM32TUg9RN;KbQ)iDrtwCX&n?l
z#uEN<qGRA<i4z=di+zsmtBt*~^5v^-g2@M;iiIve_kVu*Ro-6#3*EHWmhO<6y+QF@
z-y?-@kEdH?8#u9Fy~eyOT$G`dBd)W(!1x+_!A>ikhq7;uJ!ibMPHPU+O6QXt)*JcD
zMNhd)95e6Q{8e$Y{=F^69X<>t6+FA03M@+Rcdyqw*RHsmyT84!O3VRh)9eqLe%#ZH
zS<~0(?3P*gSF2-<(3)*>0gtx@+?&_(Dd(;L_YJedZ+AJy_Xc+{{JUSu_U<t6v5l*Y
zZtXs}#L{zu-n}^--)%a-fAC@`TamS=-@KRk&Oi32YYP{|A9Gt-7FMADt>yOaD6J*7
zj7I5mB6Ard-W4A^^U!pqm>lneoeVoUZ*T7Idz4et&Hgd*$Hs}97R|iX{~^%8w&VHZ
zb==)mjAiO#tMV?ae^g|>?s(jvw&H@g25zPHkHtTJ^i7!0k;S;BrB`xid-?|E^N*}`
z9vu&eNw)LZuk|Ol?NiOQmeS*!ZaT00|AuGbeP!i&zosiZXS1xGcm17Av(6uuYY+5u
zjz#XUmw0+yTdn&13Xg_4+niT^l?gJ~ArXGWZui^7n6BH(A4&x>lIHJUR<YUK<7~3-
z<FZ=8eI4C0OU&fnAAfD3cedSoN#8DouM1UIUJxtPTX)pELb}v%<x_*qV!<VICe>#C
z_#-e)=h%P#l{2nAbjmq6y+UErTF2Rp>kc2EI7_-mI$q92d5-+f*mXH?7c$&!RPIuo
zlKeq(-NERCTV@6+HI*wd%{{Nh^TBhEWm3_Xbz#pF_jE1)$mVyvH)!En%>$c`9{<=I
za#6gcdfSv`PcPoozVk83pqlT#x9<k7YoCvuEnr>#$mfpmn(eL&HhUj;nCRMd`t%2m
zJl>=G-Gp@7AF-}<tLw_CRAkz>YLCpHy-Ygk=dbUGer3M>LDA&RkNj%{-kmJ`!Tx#A
zKej*5?%PQ}WSI!e7@{Sv5hcz=sfi_-`FRQ<nYpP9mik7f`i4ekf2J%0Do_O}NJ%V7
zwMqu5N@XxIFf`INu+%j&4KXyeGBCF?HP!`^1_mXi2bfSa<mRVjrd8tBz^YNP52!%~
xWJ7R%T1k0gQ7VIDN`6wRf?H-$YI%N9cCmtUuxa7e$7Vov44$rjF6*2UngICu*c$)<

literal 0
HcmV?d00001

diff --git a/F-Droid/res/drawable-hdpi/tab_unselected_holo.9.png b/F-Droid/res/drawable-hdpi/tab_unselected_holo.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..19532ab10d4fe414d597ed44ed50c91a3e3b9279
GIT binary patch
literal 153
zcmeAS@N?(olHy`uVBq!ia0vp^tU%1c!3HD^Kbl$tDVAa<&kznEsNqQI0P;BtJR*x3
z7`Qt@n9=;?>9s&XYfl%)5RRG2KmPx>XJ%$TT(5HGK*O1ak257UFsy01aiHFf4G12u
u^?&$m-q&fz7T&FR9W0_QnO}Q~fkExE@YIkG=lX%hFnGH9xvX<aXaWFP^)L7U

literal 0
HcmV?d00001

diff --git a/F-Droid/res/drawable-ldpi/ic_bullet_key_permission.png b/F-Droid/res/drawable-ldpi/ic_bullet_key_permission.png
new file mode 100644
index 0000000000000000000000000000000000000000..4aff20ce976352059399e9c39ddf4e7a3f7e38dd
GIT binary patch
literal 611
zcmeAS@N?(olHy`uVBq!ia0vp^;vmey0wleZWwe15Q<As43&a2R{xkc5JkA1-$YLPv
z0mg18v+Y2FWd)AuKpL!<fv<^s4+8^Zwx^3@h{fr<lkD}K3q{)I7w3QNHwbW=J;B4}
zP{S+t7wQ3GvkyMfp3#$ZSY=}bkCI!b02?QBqQJ&2vVX2m*m5>E@AWHNvAv3=$)fM`
zEiEh0owVHl`B3~+174Ptqbnp|w`mGD{5Z_8dC`^o%NPYR6Ksw?b<CVA<@qJfc1?VM
zOThiaXDO2oUfg@w`uWSh|NcI(m>ZQ8`m4U}ve2T;gy)+U{Jb^UZa1s#u9tp%hRJ^z
z+yk6v#_zd0XL6x&-m$a$?!G=WYmv}5jrErV3RUmeCMA1D>S%VSPJ8L;v3$kLT!|Iz
zrVR^3YYvP3{lhA(?H~}7pSZp{R8)8F^BkGA8LeGmS09=j*ACg5D3Kb`())Jq?g^3%
zKC{l={c}rg>XsdHdDogHA{piUy>x4H1H(_fNf)0!SNBbJXQJsmPr(JN|5{4QcDu)S
z^^41<>sM~rfA?#5RL6vbJ(?n_VsAWJ8QAK-&Rp;MhbR2}uisDqzh)Mn-Wgl)-Od>p
z2dX8m5hW>!C8<`)MX5lF!N|bSK-bVv*T5*m(9p`j#LC!I*TCG$z+j^Is@o_Ua`RI%
z(<*Umc;F=jie*WV4Z-<oCFO}lsSJ)O`AMk?p1FzXsX?iUDV2pMQ*D5X7(8A5T-G@y
GGywqYGV5mm

literal 0
HcmV?d00001

diff --git a/F-Droid/res/drawable-mdpi/ic_bullet_key_permission.png b/F-Droid/res/drawable-mdpi/ic_bullet_key_permission.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fee560242de9db33b65c8c8383083b3353f9dd9
GIT binary patch
literal 453
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UOiAAEE)4(M`_JqL@;D1TB8!2v
z2N=7Z%(epwmK8Xr18D^?ZvQoBE|787)5S5w<M`XjhFpgYcwFn}tYzWa>$+S{q5R~8
zyX|kU7z!Arzqxd5ee+zW?#C4;Ug!&a+phCk+EYuzf+2KHn(bPZhuc2}Ox_XaT~w5~
zb<=Or4a>@`UTVEuxV$H3(S!di9L+Bz7$sgZP5y0or9-aZ-~#t6JFjcI9A?;~@S~A!
z;?e{A?=$s@@?|_WozbhKW?kfbXeMWc^9SMQHJouRtkV(_Y-i6t5S}=bamL2RPM77<
zFBi>TvisRvx2{#cwtZSOKUAk8e@2hWbg5-cP0k+}7g#Kv;QJ)~8qi~^C9V-ADTyVi
zR>?)FK#IZ0z|c_F&_LJFB*f6n%EZ*l#8}tB+{(b<-1KwGC>nC}Q!>*k(KQ%Y85lw|
zc$qEY0BVo~*$|wcR#Ki=l*-_klAn~S;F+74o*I;zm{M7IGSvpCh{4m<&t;ucLK6UC
Cg`{Wz

literal 0
HcmV?d00001

diff --git a/F-Droid/res/drawable-mdpi/ic_coins_s.png b/F-Droid/res/drawable-mdpi/ic_coins_s.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b8fd8abd5277e2ae61becdfbdee85a8ec89c3ca
GIT binary patch
literal 741
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YPV
z+ueoXKL{?^yL>WGgtNdSvY3H^TL^?1FWs&C12lf3r;B5V#p%+^w%H+x0;~_7-`oAs
zc)=o$MPgb@gl3ygh+xtEBEMu4mspc;j?N#(s9P&rd;c-#-c^cP(dxpo)nHLapuj{?
zmkVz;RqK9>+2J80@$Bhei{fWz_PE}CJxwCn`rJdFzL__w*E~?HTfB3%#cnREn==l}
z%DDF`F_=#K$R+-94KEW=>AVBUZ;qXK7WOb)XzxLhwx%-6{`Q?aX7U^Kdh4d8GH=+N
z`1t>|Id6}a&he5=oq6m3mM;>j+pY({NahU>`XqEr_1+^hyVk&|H@=nc=sc>@Bt7Hh
z1MYckN9AOE_KNO%T<kEdK;vuwqT4xv-*-8E<ovcY)ZM94JZ*zLzjXdCqx%;kkL8%{
zPh$MMcIJxW^*%BW#p28vxH~Uf$S3l<zh%BL&HZo2wl;AMsRsGZ!x#2;J(qmk+w)Ou
za-n|Ev)U_jWxi~jx904GGe>W4>)ZX&E6V7A_nc$yGQ8bd3CuO#<_{dDHwt@w-ykY}
z=^DT0@^k<CG75NCCt4(ZnkiL!d}gEToSf1G=Ke`Pm)Gz65+AX;_<#GEASPgpiI%uV
zlsFfqCYEI8=P86_=B6@O>KmEr8ycDYnX(M1Koz7QC9x#cDjB3ImBGls&`8(7QrE~d
z#L(2rz}(8zSQkhd7?hMA0GWu;kei>9nO2Eg1FJ^GKA;8}kPX54X(i=}MX3yqDfvmM
i3T~N2spa`a*~JRZ!KQ^<ADaQyF?hQAxvX<aXaWFS4<VTV

literal 0
HcmV?d00001

diff --git a/F-Droid/res/drawable-mdpi/tab_unselected_holo.9.png b/F-Droid/res/drawable-mdpi/tab_unselected_holo.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2dbf42b74f7fafb6d8a057306a9c021867d035c
GIT binary patch
literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^EI`c0!3HFsSlX9@1d5$JLpXq-h9ji|$mcBZh%9Dc
z;O+!rM)Q-W*8&CYJzX3_IA$jQ`2XLYnVI=;y+&GsLz;ns!JqUb2WA}}9-f|K(evAk
wfFg6gPD@K@^jg!TZFujONZyK%*Ov1zxbO?iIdA+_5oi>Hr>mdKI;Vst04D7$hX4Qo

literal 0
HcmV?d00001

diff --git a/F-Droid/res/drawable-xhdpi/ic_bullet_key_permission.png b/F-Droid/res/drawable-xhdpi/ic_bullet_key_permission.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a0bdfcb1b43be721326d91b544e0878cdbd1027
GIT binary patch
literal 646
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I0wfs{c7_5;rX+877l!}s{b%+Ad7K3vk;OpT
z1B~5HX4`=T%L*LRfwTh{zxw<mfq{Xs&(p;*B;(%OX@-8Xh5~K&?<ZS0&C*!3;GP+;
zhvp6rq2mrRt-=K?Doad6GK*U@L`*m|MQm(;FOJyXYI8#PUW&7E{MPLL^t#*Do0%O2
zSU~8*xh3CJ?biCLIK=R8+npU3sI05u@73VqKJU?ni*-En8~JOV34dtLztgignD6V`
zhps+J?`M{;+xhv-zH@)d42oOgJKXPGyKppUexB{B&BdM)<@IY`oqEobfBbdu4DSO@
zZ~ms<<FNNQaql*NSTU!^qo3V(?d@AXAIy?t^t|&qanIN3BJy{HrG*w|2V7wM{U&GY
z&BXm@v%4FnB#3XTNoLx;a;3-?j*8i}i;s&Hw`Om9tIv4-(xi4>Cawb0DYxw>?OZkO
z|GZgk;#qa3?3=0#)1~-YUmRGvI$R|sT+epKc7a6oc`H(#owlt|znbL6c-VB#wGT(9
zu8x|qY5D)>^)q}PEu5}*{ICArF9mb5KUuC-e5s*QweN%AkCWm1l<$7{x_#%Idy{gP
zJw8(R;{B{k>&%v>Rs~CegH3?t{W)d7c?*s2p0#@gj3U(%*NBpo#FA92<f2p{#b9J$
zXsBywplfInVrXV%Vrpe#tZQIyWnge_`Z;A34Y~O#nQ4{i8Vsxq3?Ul4%ocF~HAsSN
t2+mI{DNig)WpGT%PfAtr%uP&B4N6T+sVqF1Y6Dcn;OXk;vd$@?2>>rd0T%!O

literal 0
HcmV?d00001

diff --git a/F-Droid/res/drawable-xhdpi/ic_coins_s.png b/F-Droid/res/drawable-xhdpi/ic_coins_s.png
new file mode 100644
index 0000000000000000000000000000000000000000..13d134e6b64e2760f3c9ed505fe17d4c4a9853e0
GIT binary patch
literal 1483
zcmZ{kdpOe#6vuxt$>j1j%gp^QCCnycUUONqR${EEDZ`W%+nAAia$A(!DtaXqT9U#;
z5k-?JrHcyXGA&WB%$;h_yLbM4|9GGCob!FoIiK%y{ySV>AG{hE4h8@~jo|G?lB>~r
zZrUiXv5ARGaseH4-{%eh4F#%Fs*=3l5KF>)0QLQP-`2@6Z_+*hNVEWe^h^NwB_E|v
z13;V|0DKPt0OwKw&}Npm`C;UXjiE%m7a&`Y%8r{Q@`(!5J17<aRJW|>hPR`sQu(=f
zf|q+hprCq?kk2D)D$gB_*YKiX9nHZe_V%4rO3!f$MA?rES3-$6WY$C28DhQ#9IfN4
z0mlU(&nAkV;Bpe|EOzD+uNT2^pm-G+7F0I7GWUJCJu)Iu^T-12(W&6OwPTNK{~;e$
zx}4$~O7_K#b~+mj*el_?$Bsy|4d;`L4|^)^<G&aUsUk-@jODKq0yBv$aLq(%OVh)9
z&~b5aT~7-q*c4r)&(EF;y9d+AgiO-AOD1neJ!S|<n7lOb75yvxtr?b7n~Ke1wI%Js
z18<=FQ7e1O2rN$2G(Fr>m6yY=<Z=VgjQIw_>o!&?R}NYX<TrI(I}tiVW(WQhnL0s!
zds2m-f-HyrS&iU=t=iwFJ2$`3nD}T6i$2=?I!@o`e1{);^N$JsXLdP1cbHmF>G5YC
zYM0>e3=jH0^9je-!X{rExs{^ei%gai!piLBBLniuVtO0dF{c$yf^mqLdH9D3a`_?Y
zn1?7f8D{lPcC+Ey0ax}NK|;Q&%Pz4ZMF;VI1`AmYEzmkIU|lzG=1fpWbngEsIM&!*
zx~RaVqcG*^S!>PdmXH@+*fB#1>eepGnZKAgX@yGN=^JJ(n62lmIo?%owzFh^U)urM
z>*%`+D_nlkwRiWN#ZDF1)l0s@=TL;J-bufC_(`E^f@16(xJ7FtJuCSRlS%CD?*i`-
z6x$)S?jpr#+i}Feq?nYKqHZX@lVG^L=)D%#Ry0*OnsKEeO}XAChH6IA4R$UZKj;l@
z*q~a~EmgQm=t%P~G8}yXpW2P-`xJ+$Na~v!<_}E^1KRb*P;<B5NhI(I$5sdR_cfm;
zt>0ps+So=(%b<SnG5QwP2qflych@0m6$xYNe#CZWhdT0hE9RHta~w{3`HxjHiOZSD
zHUXiO@e{2v3p7T_o@J1<n7gU}qPLlVN4)3qq!IagZQ!(x%cY2*TH1?;_YAZ%|3SY6
zk++pFljn~Z)Qk1nbCg-=o#22rR(Q?>nfc2+1`!&2)hl_BsNYB`ez{+Oy=*y3NHEZ?
zZcDS`?JcPdIcf9&Z*pIMNbm8hONpJ<+?7Q-M@J-a`&>5DIb1ozb1>CYOU{y*`3&W!
zIKi7t(<1P7<3jQpKlrG67wp!tyPHbY#2`iUgL#^4-PEWHrK}W~A(Y=-GfBDcA}A|M
z_$bogt+e-=AM|<JdT>cRUic~hCbNvUj6yEvR>&?wBo4-y1N3S)7==#re?DBX-D36Z
zPHy*y?D<dg)ktNec%)L2S*{38&U@H^P~UOs>u)6|ANq|efzi5;iW*ZD3`!DvicQ!*
zj<@t0zoOedmDzqyzO{6b5cH?%7om<Q?{W2;6AVg-b@T;<3^D?n({Pz3f9&}p-8ZP8
zofMXKmG?|nu*TWO!V6{Ep$B?rbDR3ApYa{Fma4l}f;!@`q4im(dvx?g<LBb5zBZGr
zrxrW}sfI1NH-`srAmTkaHS7#tX;YQ$mzA0(OU<8cLw#CqpS2g#68jFnE3^-}EdNVT
zHZG9u8AGG8BN@>~0g+KO0Bwsv+1eu<rMwzBV7?B7Q`t1<uyu+CAnfcBHg;$m1S-HD
z<!rah8RcLjuXc9qxK4%t7@`>AkrAi<-=Jib@JMdZTfgAXh+xN4V`zYTI3tv1v^z3}
c7SD(|5o_e>k76~89pxNA!1;L9dxT{C3-1hx3;+NC

literal 0
HcmV?d00001

diff --git a/F-Droid/res/drawable-xhdpi/tab_unselected_holo.9.png b/F-Droid/res/drawable-xhdpi/tab_unselected_holo.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..9465173781eaa7fc9ab0e191904f928ad1c0b8f4
GIT binary patch
literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ#0V1dK=^FznmSQK*5Dp-y;YjHK@;M7UB8wRq
zxI00Z(fs7;wLn1+PZ!4!j+x0n{{OdUW@bKIZ*t~9!x;yr|1&pm7#RS;1ieP?Kk11H
z2?+-Ger=J9{IX`d2{ZSUyAFF~k44WnGFVV~q2hHg8$(d6=$w>Y|ILABGI+ZBxvX<a
GXaWE(5Hf}U

literal 0
HcmV?d00001

diff --git a/F-Droid/res/drawable-xxhdpi/ic_bullet_key_permission.png b/F-Droid/res/drawable-xxhdpi/ic_bullet_key_permission.png
new file mode 100644
index 0000000000000000000000000000000000000000..a74c2862bb9d09833de2e7888a447dd358f1ebd6
GIT binary patch
literal 1518
zcmbVMeN5bB7%v~&E(A8vOl5#6U9t?vUE4eEt8&0`?TvHZ0mnITC|T(hu7hh!Tet(_
zJV%7hm}OZ=9FmM>8JZ{~IQEfqBRDZL5C%*V34;ZlLAHo<bBQjZnJsYWA7m~zY2WvG
z-{<#xzI&v|wL2khTO0rY3628XEwB5PSG7_8-aZj9$xE_Clu0FAl@uTa8nAk~N*Z+d
z$!gk7litR<VLBTCVyYNVnN;R{6{9%6hE#MkK|e2}0U$d!$dgnJErFGEHN#q<UoH<q
zAmg<_rFtjg<ZZN%DQFVtk|vjjYO0~kUMM#Q%no8QfuEL0FzBykMJ#B6mU%IGuN=b=
zxU3@8SfCZB%A7@@jT2~4uR+ulVn9FxszG&GMx!wk)FLPXBU%{Ms!=1R(_#n$u0D`#
zP4HG>Zrr|VOO`B<Pm*{Hh690sCZN-BLN$z<&1Qu|t5wSyYO#@($e@}Pw?`OoTBHPq
zml%!(6-Kg>tCuX0?CDAfe%|R^BWA_bM9C?GgCq~58U*(HmAIC*MafP7<How$qNkCk
zVK*&u^#Uc=qiTBuEa&dYh7?8F8>~=Z<f4$ZI7ij{X;yOJ7D&F)co{EdBC@n5lSymU
zY7GVxikgh5-EPV!aKvcVp?WmJu^!fnShXg-2`2~xilPK!#m!c`PR3bnR>YWZh+rM8
zD3L5hN9;1P-BqmZiCD}g(4@o(9*(PxbU=}hlQ_}G@u00l4?0PTVHH^^&q}m7EietV
z*Di2=a5=vivyT1$j(Y{`{XaQ_WoKZeIsVlwkt4YSmF-&V%fj05(5yT$f;<`o-~2NG
zM8D|3t)Ae`#ZKpLyg0ROJnP8e!#k6%e?&k~E0g?IXm7V+^4#>)rWY<8n9MBKzjr4F
z?`*K)ozL}WKm;D2)Nydi^68DyEVy(bb$p1^-TSL6ywD-uo9XZjR2c8S9Y3)_l?Q-8
zR0xO#q7#9q74Cm%-7@&F{oLu%ozMQ(UpikLcArc-7XQ=8(c}L9H;Igl>YP;1NK5Wr
z^-Eum<hL!|%9t5ZM}J=JG#9sCo_$<0?bakt+-etZe!MTG*X8JqD|7cYKbklG+MT(}
zsPYx=3zt?cy>aQ2(Tus-P3L!X<t?O?>&8{S@s@#Wg@^7`qz|clF3r_3<Hd%}QP+nz
ze$#p>`o|b%s66V2cg}x*HY9=m;I8j1#|&4t7A2fX;5K-onW34K&(i0K<URZ!9a#_h
z)9qitcv{ITeFulT#{zY+`1>aw)!~Ei^K*;T;cW|{Z}Buw!729Yg|WbEd0&Oyi`2mB
zvv*T_2anH|HZ=Ftomvbxg>tU6&v}lv-`M>7Qs1O&dcNf$N$#CKnZ4z)scmZUV)E3>
za~~v41iShU+<y1<$sHAEwkD~sHEADw*|TR#qqjYinA(#-0MS5{3Wx=P#1N48ltO6k
ZPZa{Bg{fS=){(6IfgOYk@6F$T=x?}S1!({P

literal 0
HcmV?d00001

diff --git a/F-Droid/res/drawable-xxhdpi/tab_unselected_holo.9.png b/F-Droid/res/drawable-xxhdpi/tab_unselected_holo.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fcecf76c1997917acacb7a5f4065614a9299512
GIT binary patch
literal 1054
zcmbVL&ui0A91oiv+h8i5oG=I}3>BNam!wS_R=YMyUBTAT6|Dz<q{-_Vw&ca+&1So7
zcu_$FJ&5=R=tXz%svsVB_U2WO4ljBTg!$4n)5F-oK=OX%`}usnKOZhOE=^6InPeDd
zs<xmv={io|<KtuWd+O?qXLOk+Mw=|*F6o;AV#+q|Ahzb3%czM=d;QK1nq!#JuG4Ch
zcKxzyVV5^!8$NP<ie{L(QskS~3L<O=EjwP3`~L0&$2xYAyOynky04+0v#=4MrHw|*
z+E}p)HdngH&P6IEa1k-t$X)e9H7argUX||SYk^}2CS;|^?K{=3FR~gA5S!&e#sWFO
z<{%FxSy7Y=tOy_wfG9vQ0~J*gRRGxG!%?-s?y60_I@F@4BG)6tR|TQp@AG|$$HB4y
z3xz_=A&MDlkqOs5Vn!J+OeYLF3a!BLiGw{hW;8o^jTAZR>3#^VU#}k!d*LuqG-X0$
z`U2#E;JR^K1M849(O)+XwGLbBJ`$QJ#A|^?>(NaoV4Az5g<?bMjd~?;Xi>~n9b0QI
z@<>fDa`X>xJGLroRVlBFRl^XaTpq%_0;}a*wrXUxavm63!f_Z@(&UPy=ve?OIS36{
zmc&Y>pj2c<5-CSE!PdNxn4X0aU5DxpvGS2vRSS?waL~edHR*uG9ws>KVV~8OvTWV7
z94|h{<=Kx`M}cz}+0_8M>>$6YbBI2W^8i9c28sxhxC=7Omlatt^18$gvG)JuOrXvP
zadZ6BEXft^z<7Jm`t)!xJjkOH6VTB}PvmClST$;TxfOlx{My?qji%FIHpjkgJxQJ4
zd7ypVoE;n4N^Sorz0AyinjU{KKa+YC%{cFWo_lV--JQO9>-VcS>52PauVd%+)A<u%
a<k)HEZ29C)>an~VPi)O-=-ZXs_x=DA97YZR

literal 0
HcmV?d00001

diff --git a/F-Droid/res/drawable/ic_text_dot.xml b/F-Droid/res/drawable/ic_text_dot.xml
new file mode 100644
index 000000000..f8f396453
--- /dev/null
+++ b/F-Droid/res/drawable/ic_text_dot.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:inset="10dp">
+    <shape android:shape="oval">
+        <solid android:color="?android:attr/textColorSecondary" />
+        <size android:width="4dp" android:height="4dp" />
+    </shape>
+</inset>
diff --git a/F-Droid/res/layout/app_permission_item.xml b/F-Droid/res/layout/app_permission_item.xml
new file mode 100644
index 000000000..b5aab370d
--- /dev/null
+++ b/F-Droid/res/layout/app_permission_item.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!--
+  Defines the layout of a single permission item.
+-->
+
+<view class="org.fdroid.fdroid.installer.AppSecurityPermissions$PermissionItemView"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:background="?android:attr/selectableItemBackground">
+
+    <ImageView
+        android:id="@+id/perm_icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="8dp"
+        android:scaleType="fitCenter" />
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:background="?android:attr/dividerVertical" />
+
+    <TextView
+        android:id="@+id/perm_name"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textSize="16sp"
+        android:layout_marginStart="8dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top|left" />
+
+</view>
diff --git a/F-Droid/res/layout/app_permission_item_money.xml b/F-Droid/res/layout/app_permission_item_money.xml
new file mode 100644
index 000000000..6b29bcd77
--- /dev/null
+++ b/F-Droid/res/layout/app_permission_item_money.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!--
+  Defines the layout of a single permission item that costs money.
+-->
+
+<view class="org.fdroid.fdroid.installer.AppSecurityPermissions$PermissionItemView"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:background="?android:attr/selectableItemBackground">
+
+    <ImageView
+        android:id="@+id/perm_icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="8dp"
+        android:scaleType="fitCenter" />
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:background="?android:attr/dividerVertical" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp">
+        <TextView
+            android:id="@+id/perm_name"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textSize="16sp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true" />
+        <ImageView
+            android:id="@+id/perm_money_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_alignBottom="@+id/perm_money_label"
+            android:scaleType="fitCenter"
+            android:tint="@color/perms_costs_money"
+            android:tintMode="src_in"
+            android:src="@drawable/ic_coins_s" />
+        <TextView
+            android:id="@+id/perm_money_label"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textSize="16sp"
+            android:textColor="@color/perms_costs_money"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toEndOf="@id/perm_money_icon"
+            android:layout_below="@id/perm_name"
+            android:layout_marginStart="8dp"
+            android:text="@string/perm_costs_money" />
+    </RelativeLayout>
+
+</view>
diff --git a/F-Droid/res/layout/app_permission_item_old.xml b/F-Droid/res/layout/app_permission_item_old.xml
new file mode 100644
index 000000000..a5b395ede
--- /dev/null
+++ b/F-Droid/res/layout/app_permission_item_old.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!--
+  Defines the layout of a single permission item.
+  Contains the group name and a list of permission labels under the group.
+-->
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/perm_icon"
+        android:layout_width="24dip"
+        android:layout_height="24dip"
+        android:layout_alignParentStart="true"
+        android:scaleType="fitCenter" />
+
+
+    <TextView
+        android:id="@+id/permission_group"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textStyle="bold"
+        android:paddingStart="6dip"
+        android:layout_toEndOf="@id/perm_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:id="@+id/permission_list"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:layout_marginTop="-4dip"
+        android:paddingBottom="8dip"
+        android:paddingStart="6dip"
+        android:layout_below="@id/permission_group"
+        android:layout_toEndOf="@id/perm_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</RelativeLayout>
diff --git a/F-Droid/res/layout/app_perms_summary.xml b/F-Droid/res/layout/app_perms_summary.xml
new file mode 100644
index 000000000..065dab090
--- /dev/null
+++ b/F-Droid/res/layout/app_perms_summary.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Describes permission item consisting of a group name and the list of permisisons under the group -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/no_permissions"
+        android:text="@string/no_permissions"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <!-- Populated with all permissions. -->
+    <LinearLayout
+        android:id="@+id/perms_list"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
+
diff --git a/F-Droid/res/layout/install_app_details.xml b/F-Droid/res/layout/install_app_details.xml
new file mode 100644
index 000000000..bed2ecfc2
--- /dev/null
+++ b/F-Droid/res/layout/install_app_details.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!--
+Defines the layout of the application snippet that appears on top of the
+installation screens
+-->
+<!-- The snippet about the application - title, icon, description.  -->
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/app_snippet"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="16dip"
+    android:paddingEnd="16dip"
+    android:paddingTop="24dip"
+    >
+    <ImageView android:id="@+id/app_icon"
+        android:layout_width="32dip"
+        android:layout_height="32dip"
+        android:layout_marginStart="8dip"
+        android:background="@color/transparent"
+        android:layout_alignParentStart="true"
+        android:gravity="start"
+        android:scaleType="centerCrop"/>
+    <TextView android:id="@+id/app_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textColor="?android:attr/textColorPrimary"
+        android:shadowColor="@color/shadow"
+        android:shadowRadius="2"
+        android:layout_toEndOf="@id/app_icon"
+        android:singleLine="true"
+        android:layout_centerInParent="true"
+        android:paddingEnd="16dip"
+        android:paddingTop="3dip"
+        android:paddingStart="16dip"
+        android:ellipsize="end"/>
+    <FrameLayout
+        android:id="@+id/top_divider"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="4dip"
+        android:layout_below="@id/app_name">
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </FrameLayout>
+
+</RelativeLayout>
+
diff --git a/F-Droid/res/layout/install_confirm.xml b/F-Droid/res/layout/install_confirm.xml
new file mode 100644
index 000000000..911e8d944
--- /dev/null
+++ b/F-Droid/res/layout/install_confirm.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!--
+
+  Defines the layout of the splash screen that displays the security
+  settings required for an application and requests the confirmation of the
+  user before it is installed.
+-->
+
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    <TextView
+            android:id="@+id/install_confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/install_confirm"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:paddingTop="4dip" />
+
+    <ImageView
+            android:id="@+id/divider"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:background="?android:attr/dividerHorizontal"
+            android:visibility="gone" />
+
+    <FrameLayout
+        android:id="@+id/filler"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:visibility="gone">
+    </FrameLayout>
+
+    <TabHost
+        android:id="@android:id/tabhost"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <HorizontalScrollView android:id="@+id/tabscontainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@drawable/tab_unselected_holo"
+                android:fillViewport="true"
+                android:scrollbars="none">
+                <FrameLayout android:layout_width="match_parent"
+                             android:layout_height="wrap_content">
+                    <TabWidget
+                        android:id="@android:id/tabs"
+                        android:orientation="horizontal"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center" />
+                </FrameLayout>
+            </HorizontalScrollView>
+
+            <FrameLayout
+                android:id="@android:id/tabcontent"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="0"/>
+
+            <android.support.v4.view.ViewPager
+                android:id="@+id/pager"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"/>
+
+        </LinearLayout>
+    </TabHost>
+
+    <!-- OK confirm and cancel buttons.  -->
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:divider="?android:attr/dividerHorizontal"
+            android:showDividers="beginning">
+
+        <LinearLayout
+                style="?android:attr/buttonBarStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:measureWithLargestChild="true">
+
+            <LinearLayout android:id="@+id/leftSpacer"
+                    android:layout_weight="0.25"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:visibility="gone" />
+
+            <Button android:id="@+id/cancel_button"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="start"
+                    android:layout_weight="1"
+                    android:text="@string/cancel"
+                    android:maxLines="2"
+                    style="?android:attr/buttonBarButtonStyle" />
+
+            <Button android:id="@+id/ok_button"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:layout_weight="1"
+                    android:text="@string/next"
+                    android:maxLines="2"
+                    android:filterTouchesWhenObscured="true"
+                    style="?android:attr/buttonBarButtonStyle" />
+
+            <LinearLayout android:id="@+id/rightSpacer"
+                    android:layout_width="0dip"
+                    android:layout_weight="0.25"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:visibility="gone" />
+
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/F-Droid/res/layout/install_start.xml b/F-Droid/res/layout/install_start.xml
new file mode 100644
index 000000000..0fb199f8a
--- /dev/null
+++ b/F-Droid/res/layout/install_start.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include
+        layout="@layout/install_app_details"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/app_snippet"/>
+
+    <include
+        layout="@layout/install_confirm"
+        android:id="@+id/install_confirm_panel"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/app_snippet"
+        android:layout_alignParentBottom="true"/>
+</RelativeLayout>
+
+
diff --git a/F-Droid/res/layout/label.xml b/F-Droid/res/layout/label.xml
new file mode 100644
index 000000000..b9b80e7b3
--- /dev/null
+++ b/F-Droid/res/layout/label.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<TextView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:gravity="center" />
diff --git a/F-Droid/res/layout/permissions_list.xml b/F-Droid/res/layout/permissions_list.xml
new file mode 100644
index 000000000..e660b1608
--- /dev/null
+++ b/F-Droid/res/layout/permissions_list.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!--
+This is the structure for the list of all permissions.
+-->
+<org.fdroid.fdroid.installer.CaffeinatedScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/scrollview"
+    android:fillViewport="true">
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <LinearLayout android:id="@+id/privacylist"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="4dp">
+            <TextView
+                style="?android:attr/listSeparatorTextViewStyle"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:text="@string/privacyPerms" />
+        </LinearLayout>
+        <LinearLayout android:id="@+id/devicelist"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="4dp">
+            <TextView
+                style="?android:attr/listSeparatorTextViewStyle"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:text="@string/devicePerms" />
+        </LinearLayout>
+    </LinearLayout>
+</org.fdroid.fdroid.installer.CaffeinatedScrollView>
diff --git a/F-Droid/res/values/colors.xml b/F-Droid/res/values/colors.xml
index 5157887e3..919c8c261 100644
--- a/F-Droid/res/values/colors.xml
+++ b/F-Droid/res/values/colors.xml
@@ -15,4 +15,9 @@
     <color name="swap_wifi_may_work">#fbb040</color>
     <color name="swap_wifi_likely_to_work">#00a14b</color>
 
-</resources>
\ No newline at end of file
+    <color name="shadow">#cc222222</color>
+    <color name="transparent">#00000000</color>
+
+    <color name="perms_costs_money">#fff4511e</color>
+
+</resources>
diff --git a/F-Droid/res/values/strings.xml b/F-Droid/res/values/strings.xml
index 22c997fdd..48095b879 100644
--- a/F-Droid/res/values/strings.xml
+++ b/F-Droid/res/values/strings.xml
@@ -342,6 +342,33 @@
     <string name="wifi_warning_private">Promising</string>
     <string name="wifi_warning_personal">Best bet</string>
 
+    <string name="install_confirm">Do you want to install this application?
+            It will get access to:</string>
+    <string name="install_confirm_no_perms">Do you want to install this application?
+            It does not require any special access.</string>
+    <string name="install_confirm_update">Do you want to install an update
+            to this existing application?  Your existing data will not
+            be lost.  The updated application will get access to:</string>
+    <string name="install_confirm_update_system">Do you want to install an update
+            to this built-in application?  Your existing data will not
+            be lost.  The updated application will get access to:</string>
+    <string name="install_confirm_update_no_perms">Do you want to install an update
+            to this existing application?  Your existing data will not
+            be lost.  It does not require any special access.</string>
+    <string name="install_confirm_update_system_no_perms">Do you want to install an update
+            to this built-in application?  Your existing data will not
+            be lost.  It does not require any special access.</string>
+    <!--<string name="no_permissions_required">No permissions required</string>-->
+    <string name="newPerms">New</string>
+    <string name="allPerms">All</string>
+    <string name="privacyPerms">Privacy</string>
+    <string name="devicePerms">Device Access</string>
+    <string name="perm_costs_money">this may cost you money</string>
     <string name="uninstall_update_confirm">Do you want to replace this app with the factory version?</string>
-    <string name="uninstall_application_confirm">Do you want to uninstall this app?</string>
+    <string name="uninstall_confirm">Do you want to uninstall this app?</string>
+
+    <string name="no_new_perms">This update requires no new permissions.</string>
+
+    <string name="perms_new_perm_prefix"><font size="12" fgcolor="#ff33b5e5">NEW: </font></string>
+    <string name="perms_description_app">Provided by %1$s.</string>
 </resources>
diff --git a/F-Droid/src/org/fdroid/fdroid/installer/AppSecurityPermissions.java b/F-Droid/src/org/fdroid/fdroid/installer/AppSecurityPermissions.java
new file mode 100644
index 000000000..c11192dc4
--- /dev/null
+++ b/F-Droid/src/org/fdroid/fdroid/installer/AppSecurityPermissions.java
@@ -0,0 +1,525 @@
+/*
+**
+** Copyright 2007, The Android Open Source Project
+** Copyright 2015 Daniel Martí <mvdan@mvdan.cc>
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+package org.fdroid.fdroid.installer;
+
+import android.annotation.TargetApi;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.PermissionGroupInfo;
+import android.content.pm.PermissionInfo;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.Parcel;
+import android.text.SpannableStringBuilder;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import org.fdroid.fdroid.R;
+
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * This class contains the SecurityPermissions view implementation.
+ * Initially the package's advanced or dangerous security permissions
+ * are displayed under categorized
+ * groups. Clicking on the additional permissions presents
+ * extended information consisting of all groups and permissions.
+ * To use this view define a LinearLayout or any ViewGroup and add this
+ * view by instantiating AppSecurityPermissions and invoking getPermissionsView.
+ */
+public class AppSecurityPermissions {
+
+    public static final int WHICH_PERSONAL = 1<<0;
+    public static final int WHICH_DEVICE = 1<<1;
+    public static final int WHICH_NEW = 1<<2;
+
+    private final static String TAG = "AppSecurityPermissions";
+    private final Context mContext;
+    private final LayoutInflater mInflater;
+    private final PackageManager mPm;
+    private final Map<String, MyPermissionGroupInfo> mPermGroups = new HashMap<>();
+    private final List<MyPermissionGroupInfo> mPermGroupsList = new ArrayList<>();
+    private final PermissionGroupInfoComparator mPermGroupComparator = new PermissionGroupInfoComparator();
+    private final PermissionInfoComparator mPermComparator = new PermissionInfoComparator();
+    private final CharSequence mNewPermPrefix;
+    private String mPackageName;
+
+    static class MyPermissionGroupInfo extends PermissionGroupInfo {
+        CharSequence mLabel;
+
+        final List<MyPermissionInfo> mNewPermissions = new ArrayList<>();
+        final List<MyPermissionInfo> mPersonalPermissions = new ArrayList<>();
+        final List<MyPermissionInfo> mDevicePermissions = new ArrayList<>();
+        final List<MyPermissionInfo> mAllPermissions = new ArrayList<>();
+
+        MyPermissionGroupInfo(PermissionInfo perm) {
+            name = perm.packageName;
+            packageName = perm.packageName;
+        }
+
+        MyPermissionGroupInfo(PermissionGroupInfo info) {
+            super(info);
+        }
+
+        public Drawable loadGroupIcon(PackageManager pm) {
+            if (icon != 0) {
+                //return loadUnbadgedIcon(pm);
+                return loadIcon(pm);
+            } else {
+                ApplicationInfo appInfo;
+                try {
+                    appInfo = pm.getApplicationInfo(packageName, 0);
+                    //return appInfo.loadUnbadgedIcon(pm);
+                    return appInfo.loadIcon(pm);
+                } catch (NameNotFoundException e) {
+                    // ignore
+                }
+            }
+            return null;
+        }
+    }
+
+    private static class MyPermissionInfo extends PermissionInfo {
+        CharSequence mLabel;
+
+        /**
+         * PackageInfo.requestedPermissionsFlags for the new package being installed.
+         */
+        int mNewReqFlags;
+
+        /**
+         * PackageInfo.requestedPermissionsFlags for the currently installed
+         * package, if it is installed.
+         */
+        int mExistingReqFlags;
+
+        /**
+         * True if this should be considered a new permission.
+         */
+        boolean mNew;
+
+        MyPermissionInfo(PermissionInfo info) {
+            super(info);
+        }
+    }
+
+    public static class PermissionItemView extends LinearLayout implements View.OnClickListener {
+        MyPermissionGroupInfo mGroup;
+        MyPermissionInfo mPerm;
+        AlertDialog mDialog;
+
+        public PermissionItemView(Context context, AttributeSet attrs) {
+            super(context, attrs);
+            setClickable(true);
+        }
+
+        public void setPermission(MyPermissionGroupInfo grp, MyPermissionInfo perm,
+                boolean first, CharSequence newPermPrefix, String packageName) {
+            mGroup = grp;
+            mPerm = perm;
+
+            ImageView permGrpIcon = (ImageView) findViewById(R.id.perm_icon);
+            TextView permNameView = (TextView) findViewById(R.id.perm_name);
+
+            PackageManager pm = getContext().getPackageManager();
+            Drawable icon = null;
+            if (first) {
+                icon = grp.loadGroupIcon(pm);
+            }
+            CharSequence label = perm.mLabel;
+            if (perm.mNew && newPermPrefix != null) {
+                // If this is a new permission, format it appropriately.
+                SpannableStringBuilder builder = new SpannableStringBuilder();
+                Parcel parcel = Parcel.obtain();
+                TextUtils.writeToParcel(newPermPrefix, parcel, 0);
+                parcel.setDataPosition(0);
+                CharSequence newStr = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(parcel);
+                parcel.recycle();
+                builder.append(newStr);
+                builder.append(label);
+                label = builder;
+            }
+
+            permGrpIcon.setImageDrawable(icon);
+            permNameView.setText(label);
+            setOnClickListener(this);
+        }
+
+        @Override
+        public void onClick(View v) {
+            if (mGroup != null && mPerm != null) {
+                if (mDialog != null) {
+                    mDialog.dismiss();
+                }
+                PackageManager pm = getContext().getPackageManager();
+                AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+                builder.setTitle(mGroup.mLabel);
+                if (mPerm.descriptionRes != 0) {
+                    builder.setMessage(mPerm.loadDescription(pm));
+                } else {
+                    CharSequence appName;
+                    try {
+                        ApplicationInfo app = pm.getApplicationInfo(mPerm.packageName, 0);
+                        appName = app.loadLabel(pm);
+                    } catch (NameNotFoundException e) {
+                        appName = mPerm.packageName;
+                    }
+                    builder.setMessage(getContext().getString(
+                            R.string.perms_description_app, appName) + "\n\n" + mPerm.name);
+                }
+                builder.setCancelable(true);
+                builder.setIcon(mGroup.loadGroupIcon(pm));
+                //addRevokeUIIfNecessary(builder);
+                mDialog = builder.show();
+                mDialog.setCanceledOnTouchOutside(true);
+            }
+        }
+
+        @Override
+        protected void onDetachedFromWindow() {
+            super.onDetachedFromWindow();
+            if (mDialog != null) {
+                mDialog.dismiss();
+            }
+        }
+
+    }
+
+    private AppSecurityPermissions(Context context) {
+        mContext = context;
+        mInflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        mPm = mContext.getPackageManager();
+        // Pick up from framework resources instead.
+        mNewPermPrefix = mContext.getText(R.string.perms_new_perm_prefix);
+    }
+
+    public AppSecurityPermissions(Context context, PackageInfo info) {
+        this(context);
+        if (info == null) {
+            return;
+        }
+        mPackageName = info.packageName;
+
+        final Set<MyPermissionInfo> permSet = new HashSet<>();
+        PackageInfo installedPkgInfo = null;
+        if (info.requestedPermissions != null) {
+            try {
+                installedPkgInfo = mPm.getPackageInfo(info.packageName,
+                        PackageManager.GET_PERMISSIONS);
+            } catch (NameNotFoundException e) {
+                // ignore
+            }
+            extractPerms(info, permSet, installedPkgInfo);
+        }
+        setPermissions(new ArrayList<>(permSet));
+    }
+
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
+    private int[] getRequestedPermissionFlags(PackageInfo info) {
+        if (Build.VERSION.SDK_INT < 16) {
+            return new int[info.requestedPermissions.length];
+        }
+        return info.requestedPermissionsFlags;
+    }
+
+    private void extractPerms(PackageInfo info, Set<MyPermissionInfo> permSet,
+            PackageInfo installedPkgInfo) {
+
+        final String[] strList = info.requestedPermissions;
+        if (strList == null || strList.length == 0) {
+            return;
+        }
+        final int[] flagsList = getRequestedPermissionFlags(info);
+
+        for (int i=0; i<strList.length; i++) {
+            String permName = strList[i];
+            // If we are only looking at an existing app, then we only
+            // care about permissions that have actually been granted to it.
+            if (installedPkgInfo != null && info == installedPkgInfo) {
+                if ((flagsList[i]&PackageInfo.REQUESTED_PERMISSION_GRANTED) == 0) {
+                    continue;
+                }
+            }
+            try {
+                PermissionInfo tmpPermInfo = mPm.getPermissionInfo(permName, 0);
+                if (tmpPermInfo == null) {
+                    continue;
+                }
+                int existingIndex = -1;
+                if (installedPkgInfo != null && installedPkgInfo.requestedPermissions != null) {
+                    for (int j=0; j<installedPkgInfo.requestedPermissions.length; j++) {
+                        if (permName.equals(installedPkgInfo.requestedPermissions[j])) {
+                            existingIndex = j;
+                            break;
+                        }
+                    }
+                }
+                int existingFlags = 0;
+                if (existingIndex >= 0) {
+                    final int[] instFlagsList = getRequestedPermissionFlags(installedPkgInfo);
+                    existingFlags = instFlagsList[existingIndex];
+                }
+                if (!isDisplayablePermission(tmpPermInfo, flagsList[i], existingFlags)) {
+                    // This is not a permission that is interesting for the user
+                    // to see, so skip it.
+                    continue;
+                }
+                final String origGroupName = tmpPermInfo.group;
+                String groupName = origGroupName;
+                if (groupName == null) {
+                    groupName = tmpPermInfo.packageName;
+                    tmpPermInfo.group = groupName;
+                }
+                MyPermissionGroupInfo group = mPermGroups.get(groupName);
+                if (group == null) {
+                    PermissionGroupInfo grp = null;
+                    if (origGroupName != null) {
+                        grp = mPm.getPermissionGroupInfo(origGroupName, 0);
+                    }
+                    if (grp != null) {
+                        group = new MyPermissionGroupInfo(grp);
+                    } else {
+                        // We could be here either because the permission
+                        // didn't originally specify a group or the group it
+                        // gave couldn't be found.  In either case, we consider
+                        // its group to be the permission's package name.
+                        tmpPermInfo.group = tmpPermInfo.packageName;
+                        group = mPermGroups.get(tmpPermInfo.group);
+                        if (group == null) {
+                            group = new MyPermissionGroupInfo(tmpPermInfo);
+                        }
+                        group = new MyPermissionGroupInfo(tmpPermInfo);
+                    }
+                    mPermGroups.put(tmpPermInfo.group, group);
+                }
+                final boolean newPerm = installedPkgInfo != null
+                        && (existingFlags&PackageInfo.REQUESTED_PERMISSION_GRANTED) == 0;
+                MyPermissionInfo myPerm = new MyPermissionInfo(tmpPermInfo);
+                myPerm.mNewReqFlags = flagsList[i];
+                myPerm.mExistingReqFlags = existingFlags;
+                // This is a new permission if the app is already installed and
+                // doesn't currently hold this permission.
+                myPerm.mNew = newPerm;
+                permSet.add(myPerm);
+            } catch (NameNotFoundException e) {
+                Log.i(TAG, "Ignoring unknown permission:"+permName);
+            }
+        }
+    }
+
+    private List<MyPermissionInfo> getPermissionList(MyPermissionGroupInfo grp, int which) {
+        switch (which) {
+        case WHICH_NEW:
+            return grp.mNewPermissions;
+        case WHICH_PERSONAL:
+            return grp.mPersonalPermissions;
+        case WHICH_DEVICE:
+            return grp.mDevicePermissions;
+        default:
+            return grp.mAllPermissions;
+        }
+    }
+
+    public int getPermissionCount(int which) {
+        int N = 0;
+        for (int i=0; i<mPermGroupsList.size(); i++) {
+            N += getPermissionList(mPermGroupsList.get(i), which).size();
+        }
+        return N;
+    }
+
+    public View getPermissionsView(int which) {
+        LinearLayout permsView = (LinearLayout) mInflater.inflate(R.layout.app_perms_summary, null);
+        LinearLayout displayList = (LinearLayout) permsView.findViewById(R.id.perms_list);
+        View noPermsView = permsView.findViewById(R.id.no_permissions);
+
+        displayPermissions(mPermGroupsList, displayList, which);
+        if (displayList.getChildCount() <= 0) {
+            noPermsView.setVisibility(View.VISIBLE);
+        }
+
+        return permsView;
+    }
+
+    /**
+     * Utility method that displays permissions from a map containing group name and
+     * list of permission descriptions.
+     */
+    private void displayPermissions(List<MyPermissionGroupInfo> groups,
+            LinearLayout permListView, int which) {
+        permListView.removeAllViews();
+
+        int spacing = (int) (8*mContext.getResources().getDisplayMetrics().density);
+
+        for (int i=0; i<groups.size(); i++) {
+            MyPermissionGroupInfo grp = groups.get(i);
+            final List<MyPermissionInfo> perms = getPermissionList(grp, which);
+            for (int j=0; j<perms.size(); j++) {
+                MyPermissionInfo perm = perms.get(j);
+                View view = getPermissionItemView(grp, perm, j == 0,
+                        which != WHICH_NEW ? mNewPermPrefix : null);
+                LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        ViewGroup.LayoutParams.WRAP_CONTENT);
+                if (j == 0) {
+                    lp.topMargin = spacing;
+                }
+                if (j == grp.mAllPermissions.size()-1) {
+                    lp.bottomMargin = spacing;
+                }
+                if (permListView.getChildCount() == 0) {
+                    lp.topMargin *= 2;
+                }
+                permListView.addView(view, lp);
+            }
+        }
+    }
+
+    private PermissionItemView getPermissionItemView(MyPermissionGroupInfo grp,
+            MyPermissionInfo perm, boolean first, CharSequence newPermPrefix) {
+        PermissionItemView permView = (PermissionItemView) mInflater.inflate(
+                (perm.flags & PermissionInfo.FLAG_COSTS_MONEY) != 0
+                ? R.layout.app_permission_item_money : R.layout.app_permission_item,
+                null);
+        permView.setPermission(grp, perm, first, newPermPrefix, mPackageName);
+        return permView;
+    }
+
+    private boolean isDisplayablePermission(PermissionInfo pInfo, int newReqFlags,
+            int existingReqFlags) {
+        final int base = pInfo.protectionLevel & PermissionInfo.PROTECTION_MASK_BASE;
+        final boolean isNormal = (base == PermissionInfo.PROTECTION_NORMAL);
+        final boolean isDangerous = (base == PermissionInfo.PROTECTION_DANGEROUS);
+        final boolean isRequired =
+                ((newReqFlags&PackageInfo.REQUESTED_PERMISSION_REQUIRED) != 0);
+        final boolean isDevelopment =
+                ((pInfo.protectionLevel&PermissionInfo.PROTECTION_FLAG_DEVELOPMENT) != 0);
+        final boolean wasGranted =
+                ((existingReqFlags&PackageInfo.REQUESTED_PERMISSION_GRANTED) != 0);
+        final boolean isGranted =
+                ((newReqFlags&PackageInfo.REQUESTED_PERMISSION_GRANTED) != 0);
+
+        // Dangerous and normal permissions are always shown to the user if the permission
+        // is required, or it was previously granted
+        if ((isNormal || isDangerous) && (isRequired || wasGranted || isGranted)) {
+            return true;
+        }
+
+        // Development permissions are only shown to the user if they are already
+        // granted to the app -- if we are installing an app and they are not
+        // already granted, they will not be granted as part of the install.
+        if (isDevelopment && wasGranted) {
+            return true;
+        }
+        return false;
+    }
+
+    private static class PermissionGroupInfoComparator implements Comparator<MyPermissionGroupInfo> {
+        private final Collator sCollator = Collator.getInstance();
+        PermissionGroupInfoComparator() {
+        }
+        public final int compare(MyPermissionGroupInfo a, MyPermissionGroupInfo b) {
+            if (((a.flags^b.flags)&PermissionGroupInfo.FLAG_PERSONAL_INFO) != 0) {
+                return ((a.flags&PermissionGroupInfo.FLAG_PERSONAL_INFO) != 0) ? -1 : 1;
+            }
+            if (a.priority != b.priority) {
+                return a.priority > b.priority ? -1 : 1;
+            }
+            return sCollator.compare(a.mLabel, b.mLabel);
+        }
+    }
+
+    private static class PermissionInfoComparator implements Comparator<MyPermissionInfo> {
+        private final Collator sCollator = Collator.getInstance();
+        PermissionInfoComparator() {
+        }
+        public final int compare(MyPermissionInfo a, MyPermissionInfo b) {
+            return sCollator.compare(a.mLabel, b.mLabel);
+        }
+    }
+
+    private void addPermToList(List<MyPermissionInfo> permList,
+            MyPermissionInfo pInfo) {
+        if (pInfo.mLabel == null) {
+            pInfo.mLabel = pInfo.loadLabel(mPm);
+        }
+        int idx = Collections.binarySearch(permList, pInfo, mPermComparator);
+        if (idx < 0) {
+            idx = -idx-1;
+            permList.add(idx, pInfo);
+        }
+    }
+
+    private void setPermissions(List<MyPermissionInfo> permList) {
+        if (permList != null) {
+            // First pass to group permissions
+            for (MyPermissionInfo pInfo : permList) {
+                if (!isDisplayablePermission(pInfo, pInfo.mNewReqFlags, pInfo.mExistingReqFlags)) {
+                    continue;
+                }
+                MyPermissionGroupInfo group = mPermGroups.get(pInfo.group);
+                if (group != null) {
+                    pInfo.mLabel = pInfo.loadLabel(mPm);
+                    addPermToList(group.mAllPermissions, pInfo);
+                    if (pInfo.mNew) {
+                        addPermToList(group.mNewPermissions, pInfo);
+                    }
+                    if ((group.flags&PermissionGroupInfo.FLAG_PERSONAL_INFO) != 0) {
+                        addPermToList(group.mPersonalPermissions, pInfo);
+                    } else {
+                        addPermToList(group.mDevicePermissions, pInfo);
+                    }
+                }
+            }
+        }
+
+        for (MyPermissionGroupInfo pgrp : mPermGroups.values()) {
+            if (pgrp.labelRes != 0 || pgrp.nonLocalizedLabel != null) {
+                pgrp.mLabel = pgrp.loadLabel(mPm);
+            } else {
+                try {
+                    ApplicationInfo app = mPm.getApplicationInfo(pgrp.packageName, 0);
+                    pgrp.mLabel = app.loadLabel(mPm);
+                } catch (NameNotFoundException e) {
+                    pgrp.mLabel = pgrp.loadLabel(mPm);
+                }
+            }
+            mPermGroupsList.add(pgrp);
+        }
+        Collections.sort(mPermGroupsList, mPermGroupComparator);
+    }
+}
diff --git a/F-Droid/src/org/fdroid/fdroid/installer/CaffeinatedScrollView.java b/F-Droid/src/org/fdroid/fdroid/installer/CaffeinatedScrollView.java
new file mode 100644
index 000000000..37b96b419
--- /dev/null
+++ b/F-Droid/src/org/fdroid/fdroid/installer/CaffeinatedScrollView.java
@@ -0,0 +1,75 @@
+/*
+**
+** Copyright 2012, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+
+package org.fdroid.fdroid.installer;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.util.AttributeSet;
+import android.widget.ScrollView;
+
+/**
+ * It's a ScrollView that knows how to stay awake.
+ */
+public class CaffeinatedScrollView extends ScrollView {
+    private Runnable mFullScrollAction;
+    private int mBottomSlop;
+
+    public CaffeinatedScrollView(Context context) {
+        super(context);
+    }
+
+    public CaffeinatedScrollView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    /**
+     * Make this visible so we can call it
+     */
+    @Override
+    public boolean awakenScrollBars() {
+        return super.awakenScrollBars();
+    }
+
+    public void setFullScrollAction(Runnable action) {
+        mFullScrollAction = action;
+        mBottomSlop = (int) (4 * getResources().getDisplayMetrics().density);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        checkFullScrollAction();
+    }
+
+    @Override
+    protected void onScrollChanged(int l, int t, int oldl, int oldt) {
+        super.onScrollChanged(l, t, oldl, oldt);
+        checkFullScrollAction();
+    }
+
+    private void checkFullScrollAction() {
+        if (mFullScrollAction != null) {
+            int daBottom = getChildAt(0).getBottom();
+            int screenBottom = getScrollY() + getHeight() - getPaddingBottom();
+            if ((daBottom - screenBottom) < mBottomSlop) {
+                mFullScrollAction.run();
+                mFullScrollAction = null;
+            }
+        }
+    }
+}
diff --git a/F-Droid/src/org/fdroid/fdroid/installer/InstallConfirmActivity.java b/F-Droid/src/org/fdroid/fdroid/installer/InstallConfirmActivity.java
new file mode 100644
index 000000000..87f3adff6
--- /dev/null
+++ b/F-Droid/src/org/fdroid/fdroid/installer/InstallConfirmActivity.java
@@ -0,0 +1,251 @@
+/*
+**
+** Copyright 2007, The Android Open Source Project
+** Copyright 2015 Daniel Martí <mvdan@mvdan.cc>
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+package org.fdroid.fdroid.installer;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnCancelListener;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v4.view.ViewPager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TabHost;
+import android.widget.TextView;
+
+import org.fdroid.fdroid.R;
+
+public class InstallConfirmActivity extends Activity implements OnCancelListener, OnClickListener {
+
+    private Intent intent;
+
+    PackageManager mPm;
+    PackageInfo mPkgInfo;
+
+    private ApplicationInfo mAppInfo = null;
+
+    // View for install progress
+    View mInstallConfirm;
+    // Buttons to indicate user acceptance
+    private Button mOk;
+    private Button mCancel;
+    CaffeinatedScrollView mScrollView = null;
+    private boolean mOkCanInstall = false;
+
+    private static final String TAB_ID_ALL = "all";
+    private static final String TAB_ID_NEW = "new";
+
+    private void startInstallConfirm() {
+
+        final Drawable appIcon = mPkgInfo.applicationInfo.loadIcon(mPm);
+        final String appLabel = (String) mPkgInfo.applicationInfo.loadLabel(mPm);
+
+        View appSnippet = findViewById(R.id.app_snippet);
+        ((ImageView) appSnippet.findViewById(R.id.app_icon)).setImageDrawable(appIcon);
+        ((TextView) appSnippet.findViewById(R.id.app_name)).setText(appLabel);
+
+        TabHost tabHost = (TabHost) findViewById(android.R.id.tabhost);
+        tabHost.setup();
+        ViewPager viewPager = (ViewPager) findViewById(R.id.pager);
+        TabsAdapter adapter = new TabsAdapter(this, tabHost, viewPager);
+        adapter.setOnTabChangedListener(new TabHost.OnTabChangeListener() {
+            @Override
+            public void onTabChanged(String tabId) {
+            }
+        });
+
+        boolean permVisible = false;
+        mScrollView = null;
+        mOkCanInstall = false;
+        int msg = 0;
+        if (mPkgInfo != null) {
+            AppSecurityPermissions perms = new AppSecurityPermissions(this, mPkgInfo);
+            final int NP = perms.getPermissionCount(AppSecurityPermissions.WHICH_PERSONAL);
+            final int ND = perms.getPermissionCount(AppSecurityPermissions.WHICH_DEVICE);
+            if (mAppInfo != null) {
+                msg = (mAppInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0
+                        ? R.string.install_confirm_update_system
+                        : R.string.install_confirm_update;
+                mScrollView = new CaffeinatedScrollView(this);
+                mScrollView.setFillViewport(true);
+                final boolean newPermissionsFound =
+                        (perms.getPermissionCount(AppSecurityPermissions.WHICH_NEW) > 0);
+                if (newPermissionsFound) {
+                    permVisible = true;
+                    mScrollView.addView(perms.getPermissionsView(
+                            AppSecurityPermissions.WHICH_NEW));
+                } else {
+                    LayoutInflater inflater = (LayoutInflater) getSystemService(
+                            Context.LAYOUT_INFLATER_SERVICE);
+                    TextView label = (TextView) inflater.inflate(R.layout.label, null);
+                    label.setText(R.string.no_new_perms);
+                    mScrollView.addView(label);
+                }
+                adapter.addTab(tabHost.newTabSpec(TAB_ID_NEW).setIndicator(
+                        getText(R.string.newPerms)), mScrollView);
+            } else  {
+                findViewById(R.id.tabscontainer).setVisibility(View.GONE);
+                findViewById(R.id.divider).setVisibility(View.VISIBLE);
+            }
+            if (NP > 0 || ND > 0) {
+                permVisible = true;
+                LayoutInflater inflater = (LayoutInflater) getSystemService(
+                        Context.LAYOUT_INFLATER_SERVICE);
+                View root = inflater.inflate(R.layout.permissions_list, null);
+                if (mScrollView == null) {
+                    mScrollView = (CaffeinatedScrollView) root.findViewById(R.id.scrollview);
+                }
+                final ViewGroup privacyList = (ViewGroup) root.findViewById(R.id.privacylist);
+                if (NP > 0) {
+                    privacyList.addView(perms.getPermissionsView(AppSecurityPermissions.WHICH_PERSONAL));
+                } else {
+                    privacyList.setVisibility(View.GONE);
+                }
+                final ViewGroup deviceList = (ViewGroup) root.findViewById(R.id.devicelist);
+                if (ND > 0) {
+                    deviceList.addView(perms.getPermissionsView(AppSecurityPermissions.WHICH_DEVICE));
+                } else {
+                    root.findViewById(R.id.devicelist).setVisibility(View.GONE);
+                }
+                adapter.addTab(tabHost.newTabSpec(TAB_ID_ALL).setIndicator(
+                        getText(R.string.allPerms)), root);
+            }
+        }
+        if (!permVisible) {
+            if (mAppInfo != null) {
+                // This is an update to an application, but there are no
+                // permissions at all.
+                msg = (mAppInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0
+                        ? R.string.install_confirm_update_system_no_perms
+                        : R.string.install_confirm_update_no_perms;
+            } else {
+                // This is a new application with no permissions.
+                msg = R.string.install_confirm_no_perms;
+            }
+            tabHost.setVisibility(View.GONE);
+            findViewById(R.id.filler).setVisibility(View.VISIBLE);
+            findViewById(R.id.divider).setVisibility(View.GONE);
+            mScrollView = null;
+        }
+        if (msg != 0) {
+            ((TextView) findViewById(R.id.install_confirm)).setText(msg);
+        }
+        mInstallConfirm.setVisibility(View.VISIBLE);
+        mOk = (Button) findViewById(R.id.ok_button);
+        mCancel = (Button) findViewById(R.id.cancel_button);
+        mOk.setOnClickListener(this);
+        mCancel.setOnClickListener(this);
+        if (mScrollView == null) {
+            // There is nothing to scroll view, so the ok button is immediately
+            // set to install.
+            mOk.setText(R.string.menu_install);
+            mOkCanInstall = true;
+        } else {
+            mScrollView.setFullScrollAction(new Runnable() {
+                @Override
+                public void run() {
+                    mOk.setText(R.string.menu_install);
+                    mOkCanInstall = true;
+                }
+            });
+        }
+    }
+
+    private void initiateInstall() {
+        String pkgName = mPkgInfo.packageName;
+        // Check if there is already a package on the device with this name
+        // but it has been renamed to something else.
+        final String[] oldName = mPm.canonicalToCurrentPackageNames(new String[] { pkgName });
+        if (oldName != null && oldName.length > 0 && oldName[0] != null) {
+            pkgName = oldName[0];
+            mPkgInfo.packageName = pkgName;
+            mPkgInfo.applicationInfo.packageName = pkgName;
+        }
+        // Check if package is already installed. display confirmation dialog if replacing pkg
+        try {
+            // This is a little convoluted because we want to get all uninstalled
+            // apps, but this may include apps with just data, and if it is just
+            // data we still want to count it as "installed".
+            mAppInfo = mPm.getApplicationInfo(pkgName,
+                    PackageManager.GET_UNINSTALLED_PACKAGES);
+            if ((mAppInfo.flags&ApplicationInfo.FLAG_INSTALLED) == 0) {
+                mAppInfo = null;
+            }
+        } catch (NameNotFoundException e) {
+            mAppInfo = null;
+        }
+
+        startInstallConfirm();
+    }
+
+    @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mPm = getPackageManager();
+
+        intent = getIntent();
+        Uri mPackageURI = intent.getData();
+        final String pkgPath = mPackageURI.getPath();
+
+        mPkgInfo = mPm.getPackageArchiveInfo(pkgPath, PackageManager.GET_PERMISSIONS);
+        mPkgInfo.applicationInfo.sourceDir = pkgPath;
+        mPkgInfo.applicationInfo.publicSourceDir = pkgPath;
+
+        setContentView(R.layout.install_start);
+        mInstallConfirm = findViewById(R.id.install_confirm_panel);
+        mInstallConfirm.setVisibility(View.INVISIBLE);
+
+        initiateInstall();
+    }
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+    }
+
+    // Generic handling when pressing back key
+    public void onCancel(DialogInterface dialog) {
+        finish();
+    }
+
+    public void onClick(View v) {
+        if (v == mOk) {
+            if (mOkCanInstall || mScrollView == null) {
+                setResult(RESULT_OK, intent);
+                finish();
+            } else {
+                mScrollView.pageScroll(View.FOCUS_DOWN);
+            }
+        } else if (v == mCancel) {
+            setResult(RESULT_CANCELED, intent);
+            finish();
+        }
+    }
+}
diff --git a/F-Droid/src/org/fdroid/fdroid/installer/Installer.java b/F-Droid/src/org/fdroid/fdroid/installer/Installer.java
index 0d42f1a19..b1610cef3 100644
--- a/F-Droid/src/org/fdroid/fdroid/installer/Installer.java
+++ b/F-Droid/src/org/fdroid/fdroid/installer/Installer.java
@@ -140,18 +140,6 @@ abstract public class Installer {
         return null;
     }
 
-    public static Installer getUnattendedInstaller(Context context, PackageManager pm,
-            InstallerCallback callback) throws AndroidNotCompatibleException {
-
-        if (hasSystemPermissions(context, pm)) {
-            // we have system permissions!
-            return new SystemInstaller(context, pm, callback);
-        } else {
-            // nope!
-            throw new AndroidNotCompatibleException();
-        }
-    }
-
     public static boolean hasSystemPermissions(Context context, PackageManager pm) {
         boolean hasInstallPermission =
                 (pm.checkPermission(permission.INSTALL_PACKAGES, context.getPackageName())
diff --git a/F-Droid/src/org/fdroid/fdroid/installer/SystemInstaller.java b/F-Droid/src/org/fdroid/fdroid/installer/SystemInstaller.java
index 719756d29..925f2e8ee 100644
--- a/F-Droid/src/org/fdroid/fdroid/installer/SystemInstaller.java
+++ b/F-Droid/src/org/fdroid/fdroid/installer/SystemInstaller.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
+ * Copyright (C) 2015 Daniel Martí <mvdan@mvdan.cc>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -19,8 +20,8 @@
 
 package org.fdroid.fdroid.installer;
 
+import android.app.Activity;
 import android.app.AlertDialog;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
@@ -31,12 +32,12 @@ import android.net.Uri;
 import android.os.RemoteException;
 import android.util.Log;
 
+import org.fdroid.fdroid.R;
+
 import java.io.File;
 import java.lang.reflect.Method;
 import java.util.List;
 
-import org.fdroid.fdroid.R;
-
 /**
  * Installer based on using internal hidden APIs of the Android OS, which are
  * protected by the permissions
@@ -65,14 +66,18 @@ public class SystemInstaller extends Installer {
 
     private static final String TAG = "SystemInstaller";
 
+    private Activity mActivity;
     private final PackageInstallObserver mInstallObserver;
     private final PackageDeleteObserver mDeleteObserver;
     private Method mInstallMethod;
     private Method mDeleteMethod;
 
-    public SystemInstaller(Context context, PackageManager pm,
+    public static final int REQUEST_CONFIRM_PERMS = 0;
+
+    public SystemInstaller(Activity activity, PackageManager pm,
             InstallerCallback callback) throws AndroidNotCompatibleException {
-        super(context, pm, callback);
+        super(activity, pm, callback);
+        this.mActivity = activity;
 
         // create internal callbacks
         mInstallObserver = new PackageInstallObserver();
@@ -133,7 +138,12 @@ public class SystemInstaller extends Installer {
 
     @Override
     protected void installPackageInternal(File apkFile) throws AndroidNotCompatibleException {
-        Uri packageURI = Uri.fromFile(apkFile);
+        Intent intent = new Intent(mContext, InstallConfirmActivity.class);
+        intent.setData(Uri.fromFile(apkFile));
+        mActivity.startActivityForResult(intent, REQUEST_CONFIRM_PERMS);
+    }
+
+    private void doInstallPackageInternal(Uri packageURI) throws AndroidNotCompatibleException {
         try {
             mInstallMethod.invoke(mPm, packageURI, mInstallObserver,
                     INSTALL_REPLACE_EXISTING, null);
@@ -165,7 +175,7 @@ public class SystemInstaller extends Installer {
         if (isUpdate) {
             messageId = R.string.uninstall_update_confirm;
         } else {
-            messageId = R.string.uninstall_application_confirm;
+            messageId = R.string.uninstall_confirm;
         }
 
         final AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
@@ -207,8 +217,24 @@ public class SystemInstaller extends Installer {
 
     @Override
     public boolean handleOnActivityResult(int requestCode, int resultCode, Intent data) {
-        // no need to handle onActivityResult
-        return false;
+        switch (requestCode) {
+        case REQUEST_CONFIRM_PERMS:
+            if (resultCode == Activity.RESULT_OK) {
+                final Uri packageURI = data.getData();
+                try {
+                    doInstallPackageInternal(packageURI);
+                } catch (AndroidNotCompatibleException e) {
+                    mCallback.onError(InstallerCallback.OPERATION_INSTALL,
+                            InstallerCallback.ERROR_CODE_OTHER);
+                }
+            } else {
+                mCallback.onError(InstallerCallback.OPERATION_INSTALL,
+                        InstallerCallback.ERROR_CODE_CANCELED);
+            }
+            return true;
+        default:
+            return false;
+        }
     }
 
     @Override
diff --git a/F-Droid/src/org/fdroid/fdroid/installer/TabsAdapter.java b/F-Droid/src/org/fdroid/fdroid/installer/TabsAdapter.java
new file mode 100644
index 000000000..8e211f8c5
--- /dev/null
+++ b/F-Droid/src/org/fdroid/fdroid/installer/TabsAdapter.java
@@ -0,0 +1,163 @@
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+package org.fdroid.fdroid.installer;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Rect;
+import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TabHost;
+import android.widget.TabWidget;
+
+import java.util.ArrayList;
+
+/**
+ * This is a helper class that implements the management of tabs and all
+ * details of connecting a ViewPager with associated TabHost.  It relies on a
+ * trick.  Normally a tab host has a simple API for supplying a View or
+ * Intent that each tab will show.  This is not sufficient for switching
+ * between pages.  So instead we make the content part of the tab host
+ * 0dp high (it is not shown) and the TabsAdapter supplies its own dummy
+ * view to show as the tab content.  It listens to changes in tabs, and takes
+ * care of switch to the correct paged in the ViewPager whenever the selected
+ * tab changes.
+ */
+public class TabsAdapter extends PagerAdapter
+        implements TabHost.OnTabChangeListener, ViewPager.OnPageChangeListener {
+    private final Context mContext;
+    private final TabHost mTabHost;
+    private final ViewPager mViewPager;
+    private final ArrayList<TabInfo> mTabs = new ArrayList<>();
+    private final Rect mTempRect = new Rect();
+    private TabHost.OnTabChangeListener mOnTabChangeListener;
+
+    static final class TabInfo {
+        private final String tag;
+        private final View view;
+
+        TabInfo(String _tag, View _view) {
+            tag = _tag;
+            view = _view;
+        }
+    }
+
+    static class DummyTabFactory implements TabHost.TabContentFactory {
+        private final Context mContext;
+
+        public DummyTabFactory(Context context) {
+            mContext = context;
+        }
+
+        @Override
+        public View createTabContent(String tag) {
+            View v = new View(mContext);
+            v.setMinimumWidth(0);
+            v.setMinimumHeight(0);
+            return v;
+        }
+    }
+
+    public TabsAdapter(Activity activity, TabHost tabHost, ViewPager pager) {
+        mContext = activity;
+        mTabHost = tabHost;
+        mViewPager = pager;
+        mTabHost.setOnTabChangedListener(this);
+        mViewPager.setAdapter(this);
+        mViewPager.setOnPageChangeListener(this);
+    }
+
+    public void addTab(TabHost.TabSpec tabSpec, View view) {
+        tabSpec.setContent(new DummyTabFactory(mContext));
+        String tag = tabSpec.getTag();
+
+        TabInfo info = new TabInfo(tag, view);
+        mTabs.add(info);
+        mTabHost.addTab(tabSpec);
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public int getCount() {
+        return mTabs.size();
+    }
+
+    @Override
+    public Object instantiateItem(ViewGroup container, int position) {
+        View view = mTabs.get(position).view;
+        container.addView(view);
+        return view;
+    }
+
+    @Override
+    public void destroyItem(ViewGroup container, int position, Object object) {
+        container.removeView((View)object);
+    }
+
+    @Override
+    public boolean isViewFromObject(View view, Object object) {
+        return view == object;
+    }
+
+    public void setOnTabChangedListener(TabHost.OnTabChangeListener listener) {
+        mOnTabChangeListener = listener;
+    }
+
+    @Override
+    public void onTabChanged(String tabId) {
+        int position = mTabHost.getCurrentTab();
+        mViewPager.setCurrentItem(position);
+        if (mOnTabChangeListener != null) {
+            mOnTabChangeListener.onTabChanged(tabId);
+        }
+    }
+
+    @Override
+    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+    }
+
+    @Override
+    public void onPageSelected(int position) {
+        // Unfortunately when TabHost changes the current tab, it kindly
+        // also takes care of putting focus on it when not in touch mode.
+        // The jerk.
+        // This hack tries to prevent this from pulling focus out of our
+        // ViewPager.
+        TabWidget widget = mTabHost.getTabWidget();
+        int oldFocusability = widget.getDescendantFocusability();
+        widget.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
+        mTabHost.setCurrentTab(position);
+        widget.setDescendantFocusability(oldFocusability);
+
+        // Scroll the current tab into visibility if needed.
+        View tab = widget.getChildTabViewAt(position);
+        mTempRect.set(tab.getLeft(), tab.getTop(), tab.getRight(), tab.getBottom());
+        widget.requestRectangleOnScreen(mTempRect, false);
+
+        // Make sure the scrollbars are visible for a moment after selection
+        final View contentView = mTabs.get(position).view;
+        if (contentView instanceof CaffeinatedScrollView) {
+            ((CaffeinatedScrollView) contentView).awakenScrollBars();
+        }
+    }
+
+    @Override
+    public void onPageScrollStateChanged(int state) {
+    }
+}
diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoService.java b/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoService.java
index 8e835e2b6..308cc951e 100644
--- a/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoService.java
+++ b/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoService.java
@@ -44,7 +44,6 @@ public class LocalRepoService extends Service {
     public static final String STOPPED = "org.fdroid.fdroid.category.LOCAL_REPO_STOPPED";
 
     private NotificationManager notificationManager;
-    private Notification notification;
     // Unique Identification Number for the Notification.
     // We use it on Notification start, and to cancel it.
     private final int NOTIFICATION = R.string.local_repo_running;
@@ -139,7 +138,7 @@ public class LocalRepoService extends Service {
         Intent intent = new Intent(this, SwapActivity.class);
         intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
         PendingIntent contentIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT);
-        notification = new NotificationCompat.Builder(this)
+        Notification notification = new NotificationCompat.Builder(this)
                 .setContentTitle(getText(R.string.local_repo_running))
                 .setContentText(getText(R.string.touch_to_configure_local_repo))
                 .setSmallIcon(R.drawable.ic_swap)
diff --git a/F-Droid/test/src/org/fdroid/fdroid/RepoUpdaterTest.java b/F-Droid/test/src/org/fdroid/fdroid/RepoUpdaterTest.java
index bb802743a..96b2ae6f5 100644
--- a/F-Droid/test/src/org/fdroid/fdroid/RepoUpdaterTest.java
+++ b/F-Droid/test/src/org/fdroid/fdroid/RepoUpdaterTest.java
@@ -6,8 +6,8 @@ import android.content.Context;
 import android.test.InstrumentationTestCase;
 
 import org.apache.commons.io.FileUtils;
-import org.fdroid.fdroid.data.Repo;
 import org.fdroid.fdroid.RepoUpdater.UpdateException;
+import org.fdroid.fdroid.data.Repo;
 
 import java.io.File;
 import java.io.IOException;