131497 Commits

Author SHA1 Message Date
Deepanshu Gupta
effef17297 am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]
* commit 'e3b43270e87fd85a6281c91f2897233aac6b6397':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
2014-05-13 16:36:48 +00:00
Deepanshu Gupta
c3a0c9f679 am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit '45ca5ba7dc3b70dd39991217894eed114eefb1b8':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
2014-05-13 16:36:45 +00:00
Deepanshu Gupta
835cbaa192 am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]
* commit '9f9652587dd08e5a4f7c8195eb904cd0f0c3f6c4':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
2014-05-13 16:36:42 +00:00
Deepanshu Gupta
ce9e87f743 am 8c5c2410: am 7bb8de58: am a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE]
* commit '8c5c2410ae9df60d9462784370965a0417e06fa4':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
2014-05-13 16:36:39 +00:00
Deepanshu Gupta
40b5456374 am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev
* commit '07f8da65e231142e6915d9aa7853dd4d772112a0':
  Fix layoutlib [DO NOT MERGE]
2014-05-13 16:36:38 +00:00
Deepanshu Gupta
8a4f39351f am 48bf7b49: am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE]
* commit '48bf7b49bb361a4084e5fb4c6d0ae497a606c700':
  Add methods for Time_Delegate [DO NOT MERGE]
2014-05-13 16:36:36 +00:00
Deepanshu Gupta
838e54826b am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]
* commit '94d33cfce1f32af4480f941fdd6c9942bb203d2c':
  Fix NPE in layoutlib. [DO NOT MERGE]
2014-05-13 16:36:33 +00:00
Deepanshu Gupta
df8a15b31e am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]
* commit 'd4e6727d02f7507fdfd6cbbabd03d6e922127e4b':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
2014-05-13 16:36:30 +00:00
Deepanshu Gupta
5f61e9b4ef am ed98abec: am 8a70bcef: resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp
* commit 'ed98abecad359ab1765ac1f698c8ba06dbd00745':
  Remove references to non-std Java classes. [DO NOT MERGE]
2014-05-13 16:36:28 +00:00
Deepanshu Gupta
520f585bc6 am 2cbe100a: am 40fea8b1: am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
* commit '2cbe100a9bc6d2b3bf828432a1527f0ac239e575':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
2014-05-13 16:36:25 +00:00
Deepanshu Gupta
2c167d0f6a am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
* commit '632c9e2dabc44b24f04c3418e4a3540b22db792b':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
2014-05-13 16:36:22 +00:00
Deepanshu Gupta
9053261a54 am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '052e0c589e5cf714ca71bc8d7b3ce8b3f6c4cb96':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
2014-05-13 16:32:02 +00:00
Deepanshu Gupta
5594616c4f am 9602fc1c: am 87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
* commit '9602fc1c00e5e5cdf26cdc3fe22022ffcd115361':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
2014-05-13 16:31:59 +00:00
Deepanshu Gupta
45693e50ec am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]
* commit 'c9a4badb54320f8c52d2da06a762b5e6eef00ee0':
  Layoutlib tests now check methods return value [DO NOT MERGE]
2014-05-13 16:31:53 +00:00
Deepanshu Gupta
e3b43270e8 am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]
* commit 'bdd8fbf6eae886dc3b2cd716745ede918773a2c4':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
2014-05-13 16:31:50 +00:00
Deepanshu Gupta
45ca5ba7dc am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit '01cdd3123f408dc41a2bd4786f3a943157ab6c69':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
2014-05-13 16:31:47 +00:00
Deepanshu Gupta
9f9652587d am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]
* commit 'd094742d2e19371291409886bb80f070df099533':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
2014-05-13 16:31:44 +00:00
Deepanshu Gupta
8c5c2410ae am 7bb8de58: am a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE]
* commit '7bb8de580a451621480913d7839fd7eb784ab689':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
2014-05-13 16:31:41 +00:00
Deepanshu Gupta
48bf7b49bb am 69b3115e: am e183855c: Add methods for Time_Delegate [DO NOT MERGE]
* commit '69b3115e1c02f2b22165b93bd9bcc5c90ec69b12':
  Add methods for Time_Delegate [DO NOT MERGE]
2014-05-13 16:31:38 +00:00
Deepanshu Gupta
94d33cfce1 am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]
* commit '82d5bd98b77a9955e375b075e262639625c40232':
  Fix NPE in layoutlib. [DO NOT MERGE]
2014-05-13 16:31:35 +00:00
Deepanshu Gupta
d4e6727d02 am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]
* commit 'd5de1bd6305dc8885027504996602755b1e79099':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
2014-05-13 16:31:31 +00:00
Deepanshu Gupta
ed98abecad am 8a70bcef: resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp
* commit '8a70bcef5a724906e3c35c58cb2266ee9c9e1b78':
  Remove references to non-std Java classes. [DO NOT MERGE]
2014-05-13 16:31:28 +00:00
Deepanshu Gupta
2cbe100a9b am 40fea8b1: am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
* commit '40fea8b1bf689933e63941b5fa5e3379f82c88b5':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
2014-05-13 16:31:23 +00:00
Deepanshu Gupta
632c9e2dab am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
* commit '065ce2e8b3e11ff8bb1699748edbd23d272bc8a6':
  Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
2014-05-13 16:31:20 +00:00
Deepanshu Gupta
9c00e6739c am 2fb139e0: resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev
* commit '2fb139e02c1e9d2d7c92acf813445a063e73d94f':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
2014-05-13 16:31:05 +00:00
Deepanshu Gupta
07f8da65e2 am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev
* commit '888461c801b531f31b2ef34617d333d781d93010':
  Fix layoutlib [DO NOT MERGE]
2014-05-13 16:31:02 +00:00
George Mount
5d1be53644 Disallow makeSceneTransitionAnimation without FEATURE_CONTENT_TRANSITIONS
Bug 14655908

Change-Id: I60c38aca4a00410b792e2f7ce617ea78c162db55
2014-05-13 09:25:31 -07:00
John Reck
515396a6b5 Merge "More native interpolators" 2014-05-13 16:17:03 +00:00
Selim Cinek
b657deaf47 Merge "Adapted the minimum velocity amount needed to perform an overscroll" 2014-05-13 15:56:55 +00:00
Selim Cinek
ba81962802 Adapted the minimum velocity amount needed to perform an overscroll
Change-Id: I4dfe36e0eae3647631e21782f2b2ece56260a82a
2014-05-13 17:55:53 +02:00
Baligh Uddin
c4b1baadab am feee9e57: (-s ours) am a8e18c81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'feee9e57abcb139f455e4e0043fe94365af3b1fd':
  Import translations. DO NOT MERGE
2014-05-13 15:50:30 +00:00
Baligh Uddin
feee9e57ab am a8e18c81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'a8e18c81528fce0041deb3419a26a9c438c0a03b':
  Import translations. DO NOT MERGE
2014-05-13 15:46:07 +00:00
Selim Cinek
2f675acdb2 Merge "Introduced overscrolling for the new notifications" 2014-05-13 15:45:22 +00:00
Selim Cinek
8d9ff9c2c6 Introduced overscrolling for the new notifications
Implemented basic support for overscrolling of the new
notifications.

Change-Id: Ie1c43a4f5efbd025614c33bcb8c03a4238fada75
2014-05-13 17:42:13 +02:00
Baligh Uddin
d2cd3bcff4 Merge "Import translations. DO NOT MERGE" 2014-05-13 15:41:10 +00:00
Baligh Uddin
d7315b1742 Merge "Import translations. DO NOT MERGE" 2014-05-13 15:41:06 +00:00
Baligh Uddin
a8e18c8152 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-05-13 15:41:05 +00:00
Baligh Uddin
9bb29710a0 Merge "Import translations. DO NOT MERGE" 2014-05-13 15:41:01 +00:00
Baligh Uddin
c8d33affe9 Merge "Import translations. DO NOT MERGE" 2014-05-13 15:40:55 +00:00
Baligh Uddin
e818557260 Merge "Import translations. DO NOT MERGE" 2014-05-13 15:40:49 +00:00
Jorim Jaggi
a4d3399278 Merge "Fix weird state when flinging with open quick settings." 2014-05-13 15:28:54 +00:00
Jorim Jaggi
c9a52ab01f Fix weird state when flinging with open quick settings.
Change-Id: Ib590eb091f8b5cae218824cf1d4c4ee78377b016
2014-05-13 17:28:31 +02:00
Jorim Jaggi
54424bc17c Merge "Improve quick settings fling/expand animation." 2014-05-13 15:28:21 +00:00
Jorim Jaggi
87cd5e71ec Improve quick settings fling/expand animation.
Change-Id: I507970ad2d22712a140f2107b62e689c2f3d7d6e
2014-05-13 17:27:22 +02:00
Jason Monk
b01c6855c0 Merge "Switch PacUrl storage from String to Uri" 2014-05-13 15:14:50 +00:00
Jason Monk
590afb8bbd Merge "Don't show switcher button when IME switcher shown" 2014-05-13 15:12:01 +00:00
Jason Monk
807ef76e23 Don't show switcher button when IME switcher shown
This keeps track of when the switcher is being shown and disables
the IME switcher button/notification when it is up.

Bug: 14631536
Change-Id: I4adf24bc5fa6377645915419583d60596b3bdde0
2014-05-13 10:42:19 -04:00
Robert Greenwalt
6dbae58973 Merge "Comment out some new netd calls to fix networking." 2014-05-13 14:09:17 +00:00
Yohei Yukawa
36b3424820 Merge "Do not send duplicate CursorAnchorInfo to IME" 2014-05-13 14:06:51 +00:00
Nicolas Prevot
d85fc72fb8 Resolving resources across users.
When an intent is sent to another profile:
For content uris contained in this intent:
The userId of the source user is added to the userInfo part.
The ActivityManagerService has been modified to resolve resources in the user specified by the uri.
The user id to which the uri belongs to is stored in the UriPermission.

Change-Id: I43dc76895aba692bf148d276253aeaf9c75fce34
2014-05-13 14:59:52 +01:00