Merge branch 'master' of github.com:shadowsocks/shadowsocks-android

src/main/AndroidManifest.xml

@@ -56,7 +56,6 @@
 
         <activity
                 android:name=".ShadowsocksRunnerActivity"
-                android:process=":bg"
                 android:theme="@android:style/Theme.NoDisplay"
                 android:excludeFromRecents="true"
                 android:launchMode="singleTask">
@@ -100,7 +99,6 @@
                 android:launchMode="singleTask"/>
 
         <activity android:name=".TaskerActivity"
-                  android:process=":bg"
                   android:icon="@drawable/ic_launcher">
             <intent-filter>
                 <action android:name="com.twofortyfouram.locale.intent.action.EDIT_SETTING" />
@@ -108,7 +106,6 @@
         </activity>
 
         <activity android:name=".ShadowsocksQuickSwitchActivity"
-                  android:process=":bg"
                   android:launchMode="singleInstance"
                   android:excludeFromRecents="true"
                   android:taskAffinity=""
@@ -121,7 +118,6 @@
 
         <service
                 android:name=".ShadowsocksRunnerService"
-                android:process=":bg"
                 android:exported="false">
         </service>
 
@@ -151,13 +147,13 @@
             </intent-filter>
         </service>
 
-        <receiver android:name=".BootReceiver" android:enabled="false" android:process=":bg">
+        <receiver android:name=".BootReceiver" android:enabled="false">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".TaskerReceiver" tools:ignore="ExportedReceiver" android:process=":bg">
+        <receiver android:name=".TaskerReceiver" tools:ignore="ExportedReceiver">
             <intent-filter>
                 <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING"/>
             </intent-filter>

src/main/scala/com/github/shadowsocks/Shadowsocks.scala

@@ -363,6 +363,8 @@ class Shadowsocks extends AppCompatActivity with ServiceBoundContext {
     field.setAccessible(true)
     val title = field.get(toolbar).asInstanceOf[TextView]
     title.setFocusable(true)
+    title.setGravity(0x10)
+    title.getLayoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT;
     title.setOnClickListener(_ => startActivity(new Intent(this, classOf[ProfileManagerActivity])))
     val typedArray = obtainStyledAttributes(Array(R.attr.selectableItemBackgroundBorderless))
     title.setBackgroundResource(typedArray.getResourceId(0, 0))