diff options
author | Tarun Nainani <tnainani@codeaurora.org> | 2015-03-24 13:16:29 -0700 |
---|---|---|
committer | WebTech Code Review <code-review@localhost> | 2015-03-25 11:48:55 -0700 |
commit | 5229d6a27be9ac8a704a49ba65d0500104cd4ccb (patch) | |
tree | e9aa1925d725e9457be095c6cf466edc879e491d | |
parent | e23050271f10e77f93581b2ffe0311a1aaaf4753 (diff) | |
download | android_packages_apps_Gello-5229d6a27be9ac8a704a49ba65d0500104cd4ccb.tar.gz android_packages_apps_Gello-5229d6a27be9ac8a704a49ba65d0500104cd4ccb.tar.bz2 android_packages_apps_Gello-5229d6a27be9ac8a704a49ba65d0500104cd4ccb.zip |
Change package name to 'org.codeaurora.swe.browser.beta'
-Add new icon 'ic_launcher_browser_swe_beta'.
-Change versioning scheme to "%04d%04d" where first number is
branch number and later is buildid/patch number. Previously
scheme was "%d%02d%06d%05d" which was generating very large
number which when converted to int via aapt was getting into
overflow situation due to which random version code string
was generated.
Change-Id: Ib63d1490fee6124a64c3f73bd75ab9e45912ef9b
-rw-r--r-- | AndroidManifest.xml | 26 | ||||
-rw-r--r-- | VERSION | 9 | ||||
-rw-r--r-- | res/mipmap-hdpi/ic_launcher_browser_swe_beta.png | bin | 0 -> 4439 bytes | |||
-rw-r--r-- | res/mipmap-mdpi/ic_launcher_browser_swe_beta.png | bin | 0 -> 2834 bytes | |||
-rw-r--r-- | res/mipmap-xhdpi/ic_launcher_browser_swe_beta.png | bin | 0 -> 6002 bytes | |||
-rw-r--r-- | res/mipmap-xxhdpi/ic_launcher_browser_swe_beta.png | bin | 0 -> 9132 bytes | |||
-rw-r--r-- | src_standalone/com/android/browser/BrowserConfig.java | 2 | ||||
-rw-r--r-- | swe_android_browser.gypi | 2 | ||||
-rwxr-xr-x | tools/generate_about.sh | 40 |
9 files changed, 32 insertions, 47 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7a775060..98b0a580 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -18,10 +18,10 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.browser"> - <permission android:name="com.android.swe.browser.permission.PRELOAD" + <permission android:name="org.codeaurora.swe.browser.beta.permission.PRELOAD" android:label="@string/permission_preload_label" android:protectionLevel="signatureOrSystem" /> - <permission android:name="com.android.swe.browser.permission.INITIALIZE_DATABASE" + <permission android:name="org.codeaurora.swe.browser.beta.permission.INITIALIZE_DATABASE" android:protectionLevel="signatureOrSystem" /> <permission android:name="org.chromium.swe.browser.permission.SANDBOX" android:protectionLevel="signatureOrSystem" /> @@ -48,9 +48,9 @@ <uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"/> <uses-permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"/> <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/> - <uses-permission android:name="com.android.swe.browser.permission.READ_HOMEPAGE" /> - <uses-permission android:name="com.android.swe.browser.permission.WRITE_HOMEPAGE" /> - <uses-permission android:name="com.android.swe.browser.permission.INITIALIZE_DATABASE"/> + <uses-permission android:name="org.codeaurora.swe.browser.beta.permission.READ_HOMEPAGE" /> + <uses-permission android:name="org.codeaurora.swe.browser.beta.permission.WRITE_HOMEPAGE" /> + <uses-permission android:name="org.codeaurora.swe.browser.beta.permission.INITIALIZE_DATABASE"/> <uses-permission android:name="android.permission.VIBRATE"/> <uses-permission android:name="android.permission.RECORD_AUDIO"/> <uses-permission android:name="android.permission.READ_PHONE_STATE"/> @@ -58,7 +58,7 @@ <application android:name="Browser" android:label="@string/application_name_swe" - android:icon="@mipmap/ic_launcher_browser_swe" + android:icon="@mipmap/ic_launcher_browser_swe_beta" android:backupAgent=".BrowserBackupAgent" android:hardwareAccelerated="true" android:taskAffinity="android.task.swe.browser" @@ -68,7 +68,7 @@ android:required="false" /> <provider android:name=".provider.BrowserProvider2" - android:authorities="com.android.swe.browser;swe.browser" + android:authorities="org.codeaurora.swe.browser.beta;swe.browser.beta" android:multiprocess="false" android:exported="true" android:readPermission="com.android.browser.permission.READ_HISTORY_BOOKMARKS" @@ -76,8 +76,8 @@ <path-permission android:path="/bookmarks/search_suggest_query" android:readPermission="android.permission.GLOBAL_SEARCH" /> <path-permission android:path="/homepage" - android:readPermission="com.android.swe.browser.permission.READ_HOMEPAGE" - android:writePermission="com.android.swe.browser.permission.WRITE_HOMEPAGE" /> + android:readPermission="org.codeaurora.swe.browser.beta.permission.READ_HOMEPAGE" + android:writePermission="org.codeaurora.swe.browser.beta.permission.WRITE_HOMEPAGE" /> </provider> <activity android:name="BrowserLauncher" @@ -288,7 +288,7 @@ <!-- For custom home pages (like most visited) --> <provider android:name=".homepages.HomeProvider" - android:authorities="com.android.swe.browser.home" + android:authorities="org.codeaurora.swe.browser.beta.home" android:grantUriPermissions="true" android:readPermission="com.android.browser.permission.READ_HISTORY_BOOKMARKS" android:exported="false" /> @@ -306,7 +306,7 @@ </receiver> <receiver android:name=".PreloadRequestReceiver" - android:permission="com.android.swe.browser.permission.PRELOAD" > + android:permission="org.codeaurora.swe.browser.beta.permission.PRELOAD" > <intent-filter> <action android:name="android.intent.action.PRELOAD"/> <data android:scheme="http" /> @@ -314,11 +314,11 @@ </receiver> <provider android:name=".provider.SnapshotProvider" - android:authorities="com.android.swe.browser.snapshots" + android:authorities="org.codeaurora.swe.browser.beta.snapshots" android:exported="false" /> <provider android:name=".provider.MyNavigationProvider" - android:authorities="com.android.swe.browser.mynavigation" + android:authorities="org.codeaurora.swe.browser.beta.mynavigation" android:exported="false" android:grantUriPermissions="true"/> @@ -1,6 +1,7 @@ -1.0 -# base version, needs to be on first line of this file -# if you need to change that, please also fix -# tools/generate_about.sh +base=1.0; +branch=2311; +# chromium base and branch version, needs to be on +# top of the file. If you need to change that, please +# also fix tools/generate_about.sh. diff --git a/res/mipmap-hdpi/ic_launcher_browser_swe_beta.png b/res/mipmap-hdpi/ic_launcher_browser_swe_beta.png Binary files differnew file mode 100644 index 00000000..895022a6 --- /dev/null +++ b/res/mipmap-hdpi/ic_launcher_browser_swe_beta.png diff --git a/res/mipmap-mdpi/ic_launcher_browser_swe_beta.png b/res/mipmap-mdpi/ic_launcher_browser_swe_beta.png Binary files differnew file mode 100644 index 00000000..b4a5f2fc --- /dev/null +++ b/res/mipmap-mdpi/ic_launcher_browser_swe_beta.png diff --git a/res/mipmap-xhdpi/ic_launcher_browser_swe_beta.png b/res/mipmap-xhdpi/ic_launcher_browser_swe_beta.png Binary files differnew file mode 100644 index 00000000..7447103b --- /dev/null +++ b/res/mipmap-xhdpi/ic_launcher_browser_swe_beta.png diff --git a/res/mipmap-xxhdpi/ic_launcher_browser_swe_beta.png b/res/mipmap-xxhdpi/ic_launcher_browser_swe_beta.png Binary files differnew file mode 100644 index 00000000..37df800d --- /dev/null +++ b/res/mipmap-xxhdpi/ic_launcher_browser_swe_beta.png diff --git a/src_standalone/com/android/browser/BrowserConfig.java b/src_standalone/com/android/browser/BrowserConfig.java index 4b8b0958..c4176850 100644 --- a/src_standalone/com/android/browser/BrowserConfig.java +++ b/src_standalone/com/android/browser/BrowserConfig.java @@ -36,7 +36,7 @@ import android.content.Context; public class BrowserConfig extends BrowserConfigBase { //Authority string used by different providers - public final static String AUTHORITY = "com.android.swe.browser"; + public final static String AUTHORITY = "org.codeaurora.swe.browser.beta"; private static BrowserConfig sBrowserConfig; diff --git a/swe_android_browser.gypi b/swe_android_browser.gypi index 6bf96c95..b04534a4 100644 --- a/swe_android_browser.gypi +++ b/swe_android_browser.gypi @@ -31,7 +31,7 @@ 'additional_input_paths': [ '<@(chrome_android_pak_output_resources)', ], - 'override_package_name': 'com.android.swe.browser', + 'override_package_name': 'org.codeaurora.swe.browser.beta', 'android_manifest_path': '../../swe/browser/AndroidManifest.xml', 'additional_src_dirs': ['<(DEPTH)/swe/browser/src_standalone/com/android/browser'], }, diff --git a/tools/generate_about.sh b/tools/generate_about.sh index 9e04e95f..185ce116 100755 --- a/tools/generate_about.sh +++ b/tools/generate_about.sh @@ -74,12 +74,16 @@ function error() exit ${retval} } +VERSIONINFO=$(cat ${VERSIONFILE}) || error 1 "couldn't read \"${VERSIONFILE}\"" +VERSIONINFO=( ${VERSIONINFO//;/ } ) -BASEVERSION=$(cat ${VERSIONFILE}) || error 1 "couldn't read \"${VERSIONFILE}\"" -BASEVERSION=( ${BASEVERSION//./ } ) -MAJOR=${BASEVERSION[0]} -MINOR=${BASEVERSION[1]} -BRANCH=unknown +BASE_STRING=( ${VERSIONINFO[0]//=/ } ) +BASE_STRING=( ${BASE_STRING[1]//./ } ) +MAJOR=${BASE_STRING[0]} +MINOR=${BASE_STRING[1]} + +BRANCH=( ${VERSIONINFO[1]//=/ } ) +BRANCH=${BRANCH[1]} BUILDID=unknown VERSION=${MAJOR}.${MINOR} @@ -102,26 +106,6 @@ do fi # collect branch and clean it up - BRANCH=$(git branch | awk '/^\*/') - BRANCH=${BRANCH#\* } - - # try to get the best form of the branch, to - # catch detached HEADs, etc. - while read - do - REPLY=${REPLY// /} - [[ ${REPLY:0:1} == "(" ]] && continue - REPLY=${REPLY%->*} - git log -1 --oneline ${REPLY} | grep "${HASH}" &>/dev/null && BRANCH=${REPLY} && break; - done < <(git branch -a | grep -Ev "\*" 2>/dev/null) - - if [[ ${BRANCH//(/} == ${BRANCH} ]] - then - # trim branch to a num, or a smaller name - BRANCH=${BRANCH##*/} - fi - #SWE-FIXME - BRANCH=2125 # tack on branch VERSION=${VERSION}.${BRANCH} @@ -132,8 +116,6 @@ do if [[ -n ${MERGE_BASE} ]] then BUILDID=$(git log --oneline ${MERGE_BASE}.. | wc -l) - #SWE-FIXME - BUILDID=1200 VERSION=${VERSION}.${BUILDID} else warning "using version ${VERSION}.. merge-base:\"${MERGE_BASE}\" branch: \"${BRANCH}\"" @@ -175,6 +157,8 @@ fi [[ -n ${BRANCH//[0-9]/} ]] && BRANCH=0 [[ -n ${BUILDID//[0-9]/} ]] && BUILDID=0 -(( ${CODE} )) && printf "%d%02d%06d%05d\n" $((${MAJOR})) $((${MINOR})) $((${BRANCH})) $((${BUILDID})) +# This value should always be less than MAX int value "2147483647" +(( ${CODE} )) && printf "%4d%04d\n" $((${BRANCH})) $((${BUILDID})) + exit 0 |