summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib/create
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | | | | * am 505c675c: Fix SystemProperties in LayoutLib.Deepanshu Gupta2014-08-061-1/+1
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '505c675c3a536ac7c6ad264eb62542537532119c': Fix SystemProperties in LayoutLib.
| | | | | | | | | * Fix SystemProperties in LayoutLib.Deepanshu Gupta2014-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all System Properties were used via Build class. Also, properties like SDK_INT which called SystemProperties directly were not initialized properly. This change is essentially cherry picking of the relevant parts from the following commits: 984749bf75c9ce9d3401b8410ea7d6276544b6ee 167bc25bceea9280bbe4858db4cb8233f86ce325 Bug: http://b.android.com/73046 Change-Id: Ia0fb467ee6d5fdedda500d57d02be20006f115df
| | | | | | * | | | am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 ↵Deepanshu Gupta2014-05-131-1/+1
| | | | | | |\ \ \ \ | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correctly" into jb-dev-plus-aosp * commit 'bd5a3e6510e83b161a0e40c191d349524ae4a8e6': resolve conflicts for merge 5a7b3b65 correctly
| | | | | | | * | | am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into ↵Deepanshu Gupta2014-05-131-1/+1
| | | | | | | |\ \ \ | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev-plus-aosp * commit '1677a9bdeba3961625236925e754920fca1b7e89': resolve conflicts for merge 5a7b3b65 correctly
| | | | | | | | * | Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aospDeepanshu Gupta2014-05-131-1/+1
| | | | | | | | |\ \
| | | | | | | | | * | resolve conflicts for merge 5a7b3b65 correctlyDeepanshu Gupta2014-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I832b7ee50002bcd1429bf431cc91f12e60d19f84
| | | | | | * | | | | am 5280c911: am 0df5ae65: am 0f209967: Add view cookies for action bar ↵Deepanshu Gupta2014-05-131-0/+2
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | menus. [DO NOT MERGE] * commit '5280c911d81a7db5ec8854850bef60d8b0951358': Add view cookies for action bar menus. [DO NOT MERGE]
| | | | | | | * | | | am 0df5ae65: am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE]Deepanshu Gupta2014-05-131-0/+2
| | | | | | | |\ \ \ \ | | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0df5ae65a91174c99d1af633b45b3a1a7861cd1c': Add view cookies for action bar menus. [DO NOT MERGE]
| | | | | | | | * | | am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE]Deepanshu Gupta2014-05-131-0/+2
| | | | | | | | |\ \ \ | | | | | | | | | | |/ | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | * commit '0f209967bfc4a6f1eec46cc34a39cfe8af9f8af9': Add view cookies for action bar menus. [DO NOT MERGE]
| | | | | | | | | * | Add view cookies for action bar menus. [DO NOT MERGE]Deepanshu Gupta2014-05-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change adds the view cookies for the menus rendered in the action bar. This enables the IDE to map the menu to the relevant XML Tag in the menu xml and show the highlighting accordingly. The change also contains a bugfix where a method wasn't renamed properly. Change-Id: Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca (cherry-picked from commit 094fd8ecb6f4b666be6c9e7332679bce28fdc3ca)
| | | | | | * | | | | am a5461ebf: resolved conflicts for merge of 6d3c4ab2 to jb-mr1-devDeepanshu Gupta2014-05-131-0/+1
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a5461ebfaebf3337a0cf1c752334f23de145a6d1': Action bar rendering in layoutlib [DO NOT MERGE]
| | | | | | | * | | | resolved conflicts for merge of 6d3c4ab2 to jb-mr1-devDeepanshu Gupta2014-05-131-0/+1
| | | | | | | |\ \ \ \ | | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5c4634897882deb663f32d8148202d7c9189521d
| | | | | | | | * | | am 43b15371: Action bar rendering in layoutlib [DO NOT MERGE]Deepanshu Gupta2014-05-131-0/+1
| | | | | | | | |\ \ \ | | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '43b15371f9f1da7d97fe0500eb1536d981097e31': Action bar rendering in layoutlib [DO NOT MERGE]
| | | | | | | | | * | Action bar rendering in layoutlib [DO NOT MERGE]Deepanshu Gupta2014-05-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also makes a couple of changes to the framework: 1. ShareActionProvider - Use edit mode to execute activity chooser code. 2. ActionBarImpl - add a new constructor for use by layoutlib. This also relies on some changes to the plugin to pass the correct params. Change-Id: Ia30fef816afd91ec1e439734d56b59b1323bfee2 (cherry-picked from fe38489f6734fefd0a216e9cfe12f8f978ff371f)
| | | | | | * | | | | am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in ↵Deepanshu Gupta2014-05-131-0/+3
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Layoutlib [DO NOT MERGE] * commit '9053261a5413f401168d25fa4a9749723b232949': Fix theme/style resolution in Layoutlib [DO NOT MERGE]
| | | | | | | * | | | am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]Deepanshu Gupta2014-05-131-0/+3
| | | | | | | |\ \ \ \ | | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '052e0c589e5cf714ca71bc8d7b3ce8b3f6c4cb96': Fix theme/style resolution in Layoutlib [DO NOT MERGE]
| | | | | | | | * | | am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]Deepanshu Gupta2014-05-131-0/+3
| | | | | | | | |\ \ \ | | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '770e40f839f059e1e3a15a2b14157c7cbb3b0553': Fix theme/style resolution in Layoutlib [DO NOT MERGE]
| | | | | | | | | * | Fix theme/style resolution in Layoutlib [DO NOT MERGE]Deepanshu Gupta2014-05-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d (cherry picked from commit 76dccb7f436565136ff5e15b1ca57530940f5642)
| | | | | | * | | | | am 5594616c: am 9602fc1c: am 87665388: Fix visitFieldInsn in ↵Deepanshu Gupta2014-05-135-6/+34
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layoutlib_create. [DO NOT MERGE] * commit '5594616c4f4513dc97b08d6cabb6fd7127dde131': Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
| | | | | | | * | | | am 9602fc1c: am 87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]Deepanshu Gupta2014-05-135-6/+34
| | | | | | | |\ \ \ \ | | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9602fc1c00e5e5cdf26cdc3fe22022ffcd115361': Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
| | | | | | | | * | | am 87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]Deepanshu Gupta2014-05-135-6/+34
| | | | | | | | |\ \ \ | | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '87665388466812897e888680c0b2a1d7db1b9cbd': Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
| | | | | | | | | * | Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]Deepanshu Gupta2014-05-065-6/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug caused some classes to be missed when computing the dependencies of the existing classes. This change includes the new mock_android.jar compiled from the mock sources again. Change-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa (cherry-picked from 6136af326e64037184a7a2a3ae60c399f04d631f)
| | | | | | * | | | | am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT ↵Deepanshu Gupta2014-05-131-1/+1
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE] * commit '48bf7b49bb361a4084e5fb4c6d0ae497a606c700': Add methods for Time_Delegate [DO NOT MERGE]
| | | | | | | * | | | am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE]Deepanshu Gupta2014-05-131-1/+1
| | | | | | | |\ \ \ \ | | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '69b3115e1c02f2b22165b93bd9bcc5c90ec69b12': Add methods for Time_Delegate [DO NOT MERGE]
| | | | | | | | * | | am e183855c: Add methods for Time_Delegate [DO NOT MERGE]Deepanshu Gupta2014-05-131-1/+1
| | | | | | | | |\ \ \ | | | | | | | | | |/ / | | | | | | | | | | / | | | | | | | | | |/ | | | | | | | | |/| * commit 'e183855c1eb7baf750c67bb20e70fb887eba7af6': Add methods for Time_Delegate [DO NOT MERGE]
| | | | | | | | | * Add methods for Time_Delegate [DO NOT MERGE]Deepanshu Gupta2014-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b.android.com/65359 Change-Id: I7c2d09286d6bcd9899444aaa5a4a5a342e39d923 (cherry-picked from 02cde9ceeb4c052ee273a5d809816dfd355ebb56)
| | | | | | * | | | am ed98abec: am 8a70bcef: resolved conflicts for merge 5a7b3b65 to ↵Deepanshu Gupta2014-05-1327-443/+1820
| | | | | | |\ \ \ \ | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev-plus-aosp * commit 'ed98abecad359ab1765ac1f698c8ba06dbd00745': Remove references to non-std Java classes. [DO NOT MERGE]
| | | | | | | * | | am 8a70bcef: resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aospDeepanshu Gupta2014-05-1327-443/+1820
| | | | | | | |\ \ \ | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8a70bcef5a724906e3c35c58cb2266ee9c9e1b78': Remove references to non-std Java classes. [DO NOT MERGE]
| | | | | | | | * | resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aospDeepanshu Gupta2014-05-1227-443/+1820
| | | | | | | | |\ \ | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | Change-Id: I6bafdb9c6a8dfc6f55a4d9adf67f447661137eb8
| | | | | | | | | * Remove references to non-std Java classes. [DO NOT MERGE]Deepanshu Gupta2014-05-0627-443/+1820
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not add the non-standard Java classes. Updates the references to all non-standard classes to new classes in com.android.tools.layoulib.create package. This also treats java.lang.AutoCloseable which is part of Java 7 similarly so that we can still run on Java 6. This also adapts the cherrypick for this branch by updating references to the non-standard Java classes present in this branch. This also includes the following change that includes some changes that the original cherrypick missed. Change-Id: I76c87c74ee088778b37d1a7a7d531e0fde5c758f commit: 1ed75bde09275c9f2bd1f81830e381ea864ac7f5 Change-Id: Iac5b272652e2780c9bb72d19f415d150948ca589 (cherry picked from 80c668f2a076e91d887dbf77776cd503ff88b0b4)
| * | | | | | | | | LayoutLib: Fix EditText rendering [DO NOT MERGE]Deepanshu Gupta2014-07-215-35/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Framework has overloaded java.lang.System.arraycopy() for char[]. The method is not present on the Desktop VMs. This change replaces the calls to this method by its more general alternative - the one using Objects. TODO: Make it more configurable and flexible to allow rewrite of any such methods in the future. Change-Id: I6823b13e52b1c555eb257d02b79707d84e73236f (cherry picked from commit fc3e93300733b4a161adb9cceebea6cda353d085)
| * | | | | | | | | Update layoutlib create README [DO NOT MERGE]Deepanshu Gupta2014-07-211-138/+128
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the doc to reflect the current state of the tool and use a consistent 100 char column limit. Change-Id: I64fb58cc46abbc2f3759cb1f99d42b5090c1409f (cherry picked from commit 88585f404cb493129847e4487b628062674a4ede)
* | | | | | | | | Build layoutlib create tests as part of sdk build.Deepanshu Gupta2014-09-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LayoutLib Create tests are now built whenever LayoutLib create is built. Change-Id: Id215e8690e435019579dba1734090a0d585f37e1
* | | | | | | | | Add layoutlib tests to DIST_DIRDeepanshu Gupta2014-09-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the layoutlib and layoutlib-create tests to DIST_DIR for sdk targets. These can be used for continuous testing on the build server. Change-Id: I747dddcddfd8009937668bec4d75cb99bf63235f
* | | | | | | | | Build layoutlib_create tests.Deepanshu Gupta2014-09-031-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia13a090f8ec29b2b2a107825b6a13d7db77e6d61
* | | | | | | | | Add SystemProperties native method implementations.Deepanshu Gupta2014-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b.android.com/73046 Change-Id: Ia695e7beb81f426509b646cfd929201f7e0a4ade
* | | | | | | | | LayoutLib: Use ICU's line break algo.Deepanshu Gupta2014-08-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7e5b0ab7423a72f5a4b0e1163d0a537f0b03ba07
* | | | | | | | | Replace more Locale methods.Deepanshu Gupta2014-08-042-35/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change replaces some methods of java.util.Locale. Some of them were added in 1.7 and some are not present in the Desktop VM. Change-Id: Ifdf8451bb2acf55e01dce8b5e15c40c8160107cc
* | | | | | | | | Fix LayoutLib Create tests.Deepanshu Gupta2014-08-048-32/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ica3efe417d54da7dc74b21d28215199d37600744
* | | | | | | | | Add testing framework to LayoutLib.Deepanshu Gupta2014-08-041-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds an end to end test which loads the framework resources and a test app and ensures that no exceptions or warnings are thrown. The change also adds project configuration for intelliJ. Change-Id: I7b67c0f1a2af2dac95df7f3231cab537b9826d7d
* | | | | | | | | Fix classpath for AndroidLocaleDeepanshu Gupta2014-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9af9ac05ec26f12529d51e566bf38789a2579390
* | | | | | | | | Support Locale.toLanguageTag on Java 6Deepanshu Gupta2014-07-154-14/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I255e79e2c288cd24b350b7c26128bbbb0b2cb9a3
* | | | | | | | | Style improvements to LayoutLib create.Deepanshu Gupta2014-07-117-89/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change doesn't change the functionality but removes dead code and simplifies various places to remove warnings. Change-Id: I371e06bfbd587dbf0eeafc69787b9805f7008f62
* | | | | | | | | LayoutLib: Fix System.arraycopy()Deepanshu Gupta2014-07-113-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Framework has specialized versions of java.lang.System.arraycopy() for all primitive data types. These versions are not present on the Desktop VM. This change replaces calls to any of the specialized versions with the more general alternative - the one using Objects. Note that this was already being done for char. Change-Id: If1584125fea8ecc080fb39a5ee6cdb4d922d0c98
* | | | | | | | | Add VMRuntime_DelegateDeepanshu Gupta2014-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Framework now uses libart which moved the implementation of newUnpaddedArray() to native. This copies over the implementation of the method from libdvm to restore the old behaviour. Change-Id: Ic062aeb01f9ea52b6ed35517f742058d0ba8c804
* | | | | | | | | LayoutLib: Fix EditText renderingDeepanshu Gupta2014-06-105-35/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Framework has overloaded java.lang.System.arraycopy() for char[]. The method is not present on the Desktop VMs. This change replaces the calls to this method by its more general alternative - the one using Objects. TODO: Make it more configurable and flexible to allow rewrite of any such methods in the future. Change-Id: I6823b13e52b1c555eb257d02b79707d84e73236f
* | | | | | | | | Layoutlib fixes for L [DO NOT MERGE]Deepanshu Gupta2014-05-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the new delegates that were missing. This starts the work on changes related to Minikin Fonts. There are some changes related to TypedArray that still need to be fixed. Change-Id: Ic2397b64aa3f1f48926e849b14689c47d9ee7f8c (cherry picked from commit 7ca3612094270183243938e79337c84effea7ad0)
* | | | | | | | | Layoutlib: Update delegates for LDeepanshu Gupta2014-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update delegate method signatures for L. Change-Id: Ie607293bcae60b2d3a61d1cad3ac5f04bda2a238
* | | | | | | | | am 567f948b: am 872a5a1a: am 01fefec9: am 5fc8f945: am b0f2ded5: am ↵Deepanshu Gupta2014-05-131-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev * commit '567f948b60e9a647610454745b0629c136d492db': Fix CalendarView to show the right labels. [DO NOT MERGE]
| * | | | | | | | am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am ↵Deepanshu Gupta2014-05-131-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev * commit 'b0f2ded5e9e84fb51ec5b2cb6b419b040b008276': Fix CalendarView to show the right labels. [DO NOT MERGE]