OSDN Git Service
Zhijun He [Sat, 8 Feb 2014 00:38:33 +0000 (16:38 -0800)]
am
8954f6f0: Merge "Camera2: Add OFF_KEEP_STATE mode"
* commit '
8954f6f0b2187f1d8269718df022fc618b581720':
Camera2: Add OFF_KEEP_STATE mode
Zhijun He [Sat, 8 Feb 2014 00:36:17 +0000 (00:36 +0000)]
Merge "Camera2: Add OFF_KEEP_STATE mode"
Ruben Brunk [Sat, 8 Feb 2014 00:15:18 +0000 (16:15 -0800)]
am
aa1567f9: Merge "camera3: Make blackLevelPattern optional."
* commit '
aa1567f9ba3611647968ab7786fd3a51abeffb32':
camera3: Make blackLevelPattern optional.
Zhijun He [Sat, 8 Feb 2014 00:13:46 +0000 (16:13 -0800)]
Camera2: Add OFF_KEEP_STATE mode
Change-Id: I8802339a6b6d8a009f3ba790ffad23c0fcbbfa94
Ruben Brunk [Sat, 8 Feb 2014 00:12:46 +0000 (00:12 +0000)]
Merge "camera3: Make blackLevelPattern optional."
Ruben Brunk [Sat, 8 Feb 2014 00:08:38 +0000 (16:08 -0800)]
camera3: Make blackLevelPattern optional.
Change-Id: Ic7b115e9f6361e158e7af13442bb781bbf351cbf
Zhijun He [Sat, 8 Feb 2014 00:02:58 +0000 (16:02 -0800)]
am
12b805bb: Merge "Camera2: Update focus distance related tags"
* commit '
12b805bb5a0bb186e1756b28cece9eb64ff6d598':
Camera2: Update focus distance related tags
Zhijun He [Fri, 7 Feb 2014 23:59:42 +0000 (23:59 +0000)]
Merge "Camera2: Update focus distance related tags"
Zhijun He [Fri, 7 Feb 2014 23:44:30 +0000 (15:44 -0800)]
Camera2: Update focus distance related tags
Change-Id: Ib94311c3168802aea2193a282185e0cd70a547cb
Ruben Brunk [Fri, 7 Feb 2014 23:54:50 +0000 (15:54 -0800)]
am
3759ec9b: Merge "camera3: Add camera neutral tag."
* commit '
3759ec9b2e8aea4301dd0398e5da203bdbc6f833':
camera3: Add camera neutral tag.
Ruben Brunk [Fri, 7 Feb 2014 23:52:45 +0000 (23:52 +0000)]
Merge "camera3: Add camera neutral tag."
Ruben Brunk [Fri, 7 Feb 2014 23:47:10 +0000 (15:47 -0800)]
camera3: Add camera neutral tag.
Change-Id: Ia7e8c444256ce2a587ce708c2e6e951dec9bbdc8
Ruben Brunk [Fri, 7 Feb 2014 23:42:23 +0000 (15:42 -0800)]
am
97f0ed03: Merge "camera3: Update blackLevelPattern tag."
* commit '
97f0ed03ec0d9a7d06064c0018feb8d7a45e0c52':
camera3: Update blackLevelPattern tag.
Ruben Brunk [Fri, 7 Feb 2014 23:39:43 +0000 (23:39 +0000)]
Merge "camera3: Update blackLevelPattern tag."
Ruben Brunk [Fri, 7 Feb 2014 23:26:29 +0000 (15:26 -0800)]
camera3: Update blackLevelPattern tag.
Change-Id: Iee29d475c92bec1688de96e7cae54dfaf1eec69d
ztenghui [Fri, 7 Feb 2014 22:10:52 +0000 (14:10 -0800)]
am
82946aae: Merge "Add the clipToOutline by just using the clipPathOp"
* commit '
82946aae3cae9bdfe01f96cfc5e8d1efcefeba7c':
Add the clipToOutline by just using the clipPathOp
ztenghui [Fri, 7 Feb 2014 22:09:39 +0000 (22:09 +0000)]
Merge "Add the clipToOutline by just using the clipPathOp"
Dianne Hackborn [Fri, 7 Feb 2014 21:58:39 +0000 (13:58 -0800)]
am
68ac5cef: Merge "Battery stats: more events, fixes."
* commit '
68ac5cef63a9fef595a0cd6b7d8f9170994672ad':
Battery stats: more events, fixes.
Dianne Hackborn [Fri, 7 Feb 2014 21:56:45 +0000 (21:56 +0000)]
Merge "Battery stats: more events, fixes."
Dianne Hackborn [Fri, 7 Feb 2014 21:01:07 +0000 (13:01 -0800)]
Battery stats: more events, fixes.
Add new history events for top application package and
foreground application packages.
Doing this involved a fair amount of improvement to history
events. The event code is now separated out to have "start"
and "finish" identifies, and we use that to now keep track
of which events are active. With that, when resetting the
stats, we can spit out all of the currently active events at
the front of the new history.
Also fixed some problems when I re-arranged the history delta
int bits that were conflicting with the packing of the battery
status bits. These packing structures are changed to work
together correctly.
Change-Id: Ic8b815060dd8a50ff4a0a209efc2e1044215cd88
ztenghui [Thu, 6 Feb 2014 18:33:58 +0000 (10:33 -0800)]
Add the clipToOutline by just using the clipPathOp
Change-Id: I6ba23b589e579599d018600d0744be0efe2028c1
Derek Sollenberger [Fri, 7 Feb 2014 20:54:03 +0000 (12:54 -0800)]
am
8852ab43: Merge "Keep the SkPaint used when creating a layer."
* commit '
8852ab4357ffb653bafb36f3b9272866834f7a72':
Keep the SkPaint used when creating a layer.
Derek Sollenberger [Fri, 7 Feb 2014 20:52:22 +0000 (20:52 +0000)]
Merge "Keep the SkPaint used when creating a layer."
John Spurlock [Fri, 7 Feb 2014 19:26:57 +0000 (11:26 -0800)]
am
876e359b: Merge "Make QS battery composite color match others."
* commit '
876e359b4863ea41f08fe0e49551ad4ac3fa98af':
Make QS battery composite color match others.
John Spurlock [Fri, 7 Feb 2014 19:25:19 +0000 (19:25 +0000)]
Merge "Make QS battery composite color match others."
Chris Craik [Fri, 7 Feb 2014 18:51:10 +0000 (10:51 -0800)]
am
27bfb245: Merge "Rework and clean up DisplayList projection"
* commit '
27bfb24518934f0344c79a1d655ea8d1208d2446':
Rework and clean up DisplayList projection
Chris Craik [Fri, 7 Feb 2014 18:47:57 +0000 (18:47 +0000)]
Merge "Rework and clean up DisplayList projection"
Derek Sollenberger [Wed, 5 Feb 2014 21:47:00 +0000 (16:47 -0500)]
Keep the SkPaint used when creating a layer.
This will allow us to inspect the paint for thing other than
color and xfermode, such as SkColorFilters and SkShaders.
bug:
10650594
Change-Id: I2c3ddd07a3966e1e77af34136307e2b59b2898c1
Kenny Root [Fri, 7 Feb 2014 17:54:46 +0000 (09:54 -0800)]
am
1a88d834: KeyChain: add explicit package for getPrivateKey
* commit '
1a88d834e8f7d21e714121c011fec82369a2e9f1':
KeyChain: add explicit package for getPrivateKey
Kenny Root [Fri, 7 Feb 2014 17:12:48 +0000 (09:12 -0800)]
KeyChain: add explicit package for getPrivateKey
Bug:
9964538
Change-Id: If67c1938e9506d4fa81b241bcbce2193d1b194ef
Narayan Kamath [Fri, 7 Feb 2014 11:37:01 +0000 (03:37 -0800)]
am
8f52fee0: Merge "Fix several bad function definitions."
* commit '
8f52fee0609a4f273f87f4178865b0713c8114aa':
Fix several bad function definitions.
Narayan Kamath [Fri, 7 Feb 2014 11:34:18 +0000 (11:34 +0000)]
Merge "Fix several bad function definitions."
Jim Miller [Fri, 7 Feb 2014 01:11:02 +0000 (17:11 -0800)]
am
ba7d94b8: Fix problem where input wasn\'t being requested
* commit '
ba7d94b8f3c41fd5b933b185e7463a56589e04d2':
Fix problem where input wasn't being requested
Jim Miller [Fri, 7 Feb 2014 01:10:59 +0000 (17:10 -0800)]
am
5e612cf0: Add KeyguardSimpleHostView and make it the default
* commit '
5e612cf07872dc0989a4b9f09e2a38a2ee12186d':
Add KeyguardSimpleHostView and make it the default
Jim Miller [Fri, 7 Feb 2014 01:10:56 +0000 (17:10 -0800)]
am
3eb4971b: Move launch, verification and menu logic to base class - Add simplified KeyguardHostView - Move common functions to KeyguardViewBase.java - Create new KeyguardSimpleHostView class for simplified view implementation.
* commit '
3eb4971b679464e206cb666de1cf0e5a538c8d7d':
Move launch, verification and menu logic to base class - Add simplified KeyguardHostView - Move common functions to KeyguardViewBase.java - Create new KeyguardSimpleHostView class for simplified view implementation.
Jim Miller [Thu, 6 Feb 2014 01:30:50 +0000 (17:30 -0800)]
Fix problem where input wasn't being requested
This fixes a bug where input wasn't being enabled when the security
method changed. The solution is to propagate changes back to the parent
Add missing copyright header to simplified keyguard view.
Bugs
12135931,
12879769
Change-Id: I0fc6cf8ef3b628c96a045797a5b9cdecd3a1007a
Jim Miller [Tue, 4 Feb 2014 01:57:23 +0000 (17:57 -0800)]
Add KeyguardSimpleHostView and make it the default
This adds a simplified KeyguardHostView that's intended to
be used as an overlay or dialog for asking the user's
credentials.
Bug
12135931
Change-Id: Iecede0715d671e88024e7bb77e7432cd1c7ec356
Jim Miller [Wed, 29 Jan 2014 02:22:42 +0000 (18:22 -0800)]
Move launch, verification and menu logic to base class
- Add simplified KeyguardHostView
- Move common functions to KeyguardViewBase.java
- Create new KeyguardSimpleHostView class for simplified view
implementation.
Bug
12135931
Change-Id: I8d6b0a61c36a0c7ceb87da4da54b1dfbed0054ff
Chris Craik [Thu, 6 Feb 2014 00:50:41 +0000 (16:50 -0800)]
Rework and clean up DisplayList projection
Move the projection surface to be a property of a DisplayList,
set to true for every background drawable.
Additionally, handle a projecting view background such that it doesn't
try to project onto itself (which is undesirable).
Change-Id: Ic70b17474bd87340e80767f8518f73b233419c7a
Chris Craik [Thu, 6 Feb 2014 23:24:05 +0000 (15:24 -0800)]
am
fdace4e2: Merge "Simplify DisplayList matrices"
* commit '
fdace4e238afa9f2409c6397a78498b00f765ab0':
Simplify DisplayList matrices
Chris Craik [Thu, 6 Feb 2014 23:22:27 +0000 (23:22 +0000)]
Merge "Simplify DisplayList matrices"
Adam Powell [Thu, 6 Feb 2014 22:43:27 +0000 (14:43 -0800)]
am
6250c59e: Merge "Refactoring of fitSystemWindows to applyWindowInsets for views"
* commit '
6250c59e0d917fb3641ac499ca69b011aa50a4bd':
Refactoring of fitSystemWindows to applyWindowInsets for views
Adam Powell [Thu, 6 Feb 2014 22:41:14 +0000 (22:41 +0000)]
Merge "Refactoring of fitSystemWindows to applyWindowInsets for views"
Ricardo Cervera [Thu, 6 Feb 2014 22:17:33 +0000 (14:17 -0800)]
am
1d2b0c00: am
adb94013: am
8ff1f285: am
b7d456d4: am
8d65fc2c: am
8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug:
10303533" into klp-docs
* commit '
1d2b0c008bfedfa4d6ef231c393f848cda662e03':
docs: Updated the retaining an object during conf change. Bug:
10303533
Ricardo Cervera [Thu, 6 Feb 2014 22:17:30 +0000 (14:17 -0800)]
am
6232c3ca: am
a5e35cb0: am
6ed26862: am
74d290fd: am
d057fa6d: am
531939d1: Merge "docs: Fixed links to Proguard manual. Bug:
12713887" into klp-docs
* commit '
6232c3caf580d805ef26648c645181ac37ab00ff':
docs: Fixed links to Proguard manual. Bug:
12713887
Craig Mautner [Thu, 6 Feb 2014 22:17:28 +0000 (14:17 -0800)]
am
c667f054: am
43ef013c: (-s ours) am
38f7dcd7: DO NOT MERGE. Test for Configuration differences before changing.
* commit '
c667f054d5b5a87247cd84d78d483dc1c97af41a':
DO NOT MERGE. Test for Configuration differences before changing.
John Reck [Thu, 6 Feb 2014 22:17:25 +0000 (14:17 -0800)]
am
393fdbec: Merge "Remove overdraw counter"
* commit '
393fdbec9f3f11d277e1631c2e36362e408cbbdc':
Remove overdraw counter
Adam Lesinski [Thu, 6 Feb 2014 22:17:22 +0000 (14:17 -0800)]
am
9f97de13: am
a5a93f55: am
7f416631: Merge "Check feature bits before loading optional services" into klp-modular-dev
* commit '
9f97de13359662c2709eed227b3fab2ce7d5dabc':
Check feature bits before loading optional services
Jeff Sharkey [Thu, 6 Feb 2014 22:17:18 +0000 (14:17 -0800)]
am
2b1252dd: Merge "Update DrmOutputStream to use raw FileDescriptor."
* commit '
2b1252ddd2650cb38918cb85d2a3711b2cfa8db5':
Update DrmOutputStream to use raw FileDescriptor.
Craig Mautner [Thu, 6 Feb 2014 22:17:15 +0000 (14:17 -0800)]
am
d1c2c542: Test for Configuration differences before changing.
* commit '
d1c2c5421181b988f09fd12d9633e2a7c2a8ab60':
Test for Configuration differences before changing.
Ricardo Cervera [Thu, 6 Feb 2014 21:29:59 +0000 (21:29 +0000)]
am
adb94013: am
8ff1f285: am
b7d456d4: am
8d65fc2c: am
8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug:
10303533" into klp-docs
* commit '
adb940131adf137023006fcd86663fd048fa6a54':
docs: Updated the retaining an object during conf change. Bug:
10303533
Ricardo Cervera [Thu, 6 Feb 2014 21:26:03 +0000 (21:26 +0000)]
am
a5e35cb0: am
6ed26862: am
74d290fd: am
d057fa6d: am
531939d1: Merge "docs: Fixed links to Proguard manual. Bug:
12713887" into klp-docs
* commit '
a5e35cb002936291b79ff422c94eb2caabedfb3a':
docs: Fixed links to Proguard manual. Bug:
12713887
Ricardo Cervera [Thu, 6 Feb 2014 21:23:40 +0000 (21:23 +0000)]
am
8ff1f285: am
b7d456d4: am
8d65fc2c: am
8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug:
10303533" into klp-docs
* commit '
8ff1f285c93a1a44a7419ab216bee2f92518387a':
docs: Updated the retaining an object during conf change. Bug:
10303533
Ricardo Cervera [Thu, 6 Feb 2014 21:20:28 +0000 (21:20 +0000)]
am
b7d456d4: am
8d65fc2c: am
8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug:
10303533" into klp-docs
* commit '
b7d456d4a410d1a17933ed0256fecd2144160615':
docs: Updated the retaining an object during conf change. Bug:
10303533
Ricardo Cervera [Thu, 6 Feb 2014 21:19:50 +0000 (21:19 +0000)]
am
6ed26862: am
74d290fd: am
d057fa6d: am
531939d1: Merge "docs: Fixed links to Proguard manual. Bug:
12713887" into klp-docs
* commit '
6ed268623b9e4a10a080e15d64340c16d2dd8a28':
docs: Fixed links to Proguard manual. Bug:
12713887
Ricardo Cervera [Thu, 6 Feb 2014 21:17:12 +0000 (21:17 +0000)]
am
8d65fc2c: am
8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug:
10303533" into klp-docs
* commit '
8d65fc2c698ca1e91c669c3e04b45bf0d1c9dffc':
docs: Updated the retaining an object during conf change. Bug:
10303533
Ricardo Cervera [Thu, 6 Feb 2014 21:16:28 +0000 (21:16 +0000)]
am
74d290fd: am
d057fa6d: am
531939d1: Merge "docs: Fixed links to Proguard manual. Bug:
12713887" into klp-docs
* commit '
74d290fd62dfec09708664f354805c548b3dc5eb':
docs: Fixed links to Proguard manual. Bug:
12713887
Ricardo Cervera [Thu, 6 Feb 2014 21:13:29 +0000 (21:13 +0000)]
am
8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug:
10303533" into klp-docs
* commit '
8756b0c3cea50d47ba7191d8a493f774b23a1631':
docs: Updated the retaining an object during conf change. Bug:
10303533
Ricardo Cervera [Thu, 6 Feb 2014 21:13:21 +0000 (21:13 +0000)]
am
d057fa6d: am
531939d1: Merge "docs: Fixed links to Proguard manual. Bug:
12713887" into klp-docs
* commit '
d057fa6d40198e07844f702608b7959bad3bd48b':
docs: Fixed links to Proguard manual. Bug:
12713887
Ricardo Cervera [Thu, 6 Feb 2014 21:09:36 +0000 (21:09 +0000)]
am
531939d1: Merge "docs: Fixed links to Proguard manual. Bug:
12713887" into klp-docs
* commit '
531939d151167e56b3106205f4c3d859a9f509ce':
docs: Fixed links to Proguard manual. Bug:
12713887
Ricardo Cervera [Thu, 6 Feb 2014 21:09:12 +0000 (21:09 +0000)]
Merge "docs: Updated the retaining an object during conf change. Bug:
10303533" into klp-docs
Ricardo Cervera [Thu, 6 Feb 2014 21:07:09 +0000 (21:07 +0000)]
Merge "docs: Fixed links to Proguard manual. Bug:
12713887" into klp-docs
Craig Mautner [Thu, 6 Feb 2014 20:36:56 +0000 (20:36 +0000)]
am
43ef013c: (-s ours) am
38f7dcd7: DO NOT MERGE. Test for Configuration differences before changing.
* commit '
43ef013cbd769533737135af5a338898cc619602':
DO NOT MERGE. Test for Configuration differences before changing.
Craig Mautner [Thu, 6 Feb 2014 20:29:49 +0000 (20:29 +0000)]
am
38f7dcd7: DO NOT MERGE. Test for Configuration differences before changing.
* commit '
38f7dcd7dcb5d98d86f19f3c4725aea89f9792ff':
DO NOT MERGE. Test for Configuration differences before changing.
Craig Mautner [Thu, 6 Feb 2014 18:31:41 +0000 (10:31 -0800)]
DO NOT MERGE. Test for Configuration differences before changing.
Changing Configuration first and then testing for changes yields a
result indicating no change.
Fixes bug
12904769.
Change-Id: If7e39e843f15b1143d9877497d595511afabd020
John Reck [Thu, 6 Feb 2014 20:26:36 +0000 (20:26 +0000)]
Merge "Remove overdraw counter"
Adam Lesinski [Thu, 6 Feb 2014 20:25:51 +0000 (20:25 +0000)]
am
a5a93f55: am
7f416631: Merge "Check feature bits before loading optional services" into klp-modular-dev
* commit '
a5a93f559d337ad5b79716b05ea43707eb779dc8':
Check feature bits before loading optional services
Adam Lesinski [Thu, 6 Feb 2014 20:16:30 +0000 (20:16 +0000)]
am
7f416631: Merge "Check feature bits before loading optional services" into klp-modular-dev
* commit '
7f416631413e75a1756bd316a2e1906725d72f24':
Check feature bits before loading optional services
Adam Lesinski [Thu, 6 Feb 2014 20:13:20 +0000 (20:13 +0000)]
Merge "Check feature bits before loading optional services" into klp-modular-dev
John Reck [Thu, 6 Feb 2014 00:53:34 +0000 (16:53 -0800)]
Remove overdraw counter
Change-Id: Iee05362b9080b28714a4cca5a571f19ce81eadfd
Ricardo Cervera [Tue, 28 Jan 2014 01:47:39 +0000 (17:47 -0800)]
docs: Updated the retaining an object during conf change. Bug:
10303533
Replaced use of deprecated methods with retained fragments.
Change-Id: I0f0a045da88f9817077070729ef0af283bea93e4
Review: http://quixote.mtv.corp.google.com:8007/guide/topics/resources/runtime-changes.html
Jeff Sharkey [Thu, 6 Feb 2014 18:50:05 +0000 (18:50 +0000)]
Merge "Update DrmOutputStream to use raw FileDescriptor."
Craig Mautner [Thu, 6 Feb 2014 18:31:41 +0000 (10:31 -0800)]
Test for Configuration differences before changing.
Changing Configuration first and then testing for changes yields a
result indicating no change.
Fixes bug
12904769.
Change-Id: If7e39e843f15b1143d9877497d595511afabd020
Ricardo Cervera [Mon, 27 Jan 2014 19:02:39 +0000 (11:02 -0800)]
docs: Fixed links to Proguard manual. Bug:
12713887
The SourceForge manual cannot be linked to sections directly because
of JavaScript and HTML frames. I used the MIT links from the bug
report instead.
Review: http://quixote.mtv.corp.google.com:8001/tools/help/proguard.html
Change-Id: I1be210d392d78a7560a89f421074ba6d99499da0
Jeff Sharkey [Thu, 30 Jan 2014 23:01:22 +0000 (15:01 -0800)]
Update DrmOutputStream to use raw FileDescriptor.
This allows DownloadManager to use FDs, paving the way for downloading
directly to content:// Uris.
Also return flag indicating if deleteOlderFiles() actually deleted
anything. Update tests to verify.
Bug:
5287571
Change-Id: I2579e5e2113f31b2860d7b021bd61c91b6310963
Andreas Huber [Thu, 6 Feb 2014 17:13:10 +0000 (09:13 -0800)]
am
b341a24b: Merge "Remove no longer needed http proxy handling code, it\'s obsolete now"
* commit '
b341a24b2adbb67cdc34ade0a19570ee37f0cb82':
Remove no longer needed http proxy handling code, it's obsolete now
Andreas Huber [Thu, 6 Feb 2014 17:10:30 +0000 (17:10 +0000)]
Merge "Remove no longer needed http proxy handling code, it's obsolete now"
Narayan Kamath [Thu, 6 Feb 2014 11:50:31 +0000 (11:50 +0000)]
Fix several bad function definitions.
We claim these functions want jlong as input (8 bytes wide)
but the definitions use pointer types or jints
(4 bytes wide for 32 bit).
bug:
12890271
Change-Id: I6a167a4f3aac1e22ddea33d067caaef6a11b418c
Jessica Hummel [Thu, 6 Feb 2014 10:25:23 +0000 (02:25 -0800)]
am
e33e2ca3: Merge "Extend DeviceOwner concept to accommodate ProfileOwners"
* commit '
e33e2ca3460c0e5a898e5b0406d86b16b96f735a':
Extend DeviceOwner concept to accommodate ProfileOwners
Jessica Hummel [Thu, 6 Feb 2014 10:23:00 +0000 (10:23 +0000)]
Merge "Extend DeviceOwner concept to accommodate ProfileOwners"
Adam Connors [Thu, 9 Jan 2014 10:42:56 +0000 (10:42 +0000)]
Extend DeviceOwner concept to accommodate ProfileOwners
ProfileOwners, like DeviceOwners, are Device Admins that have
additional priviledges. ProfileOwners however are scoped per
user.
Change-Id: I1e22c85878e0672121e6ebbe97fca38591f992b2
Deepanshu Gupta [Thu, 6 Feb 2014 03:18:30 +0000 (19:18 -0800)]
am
6886e3ac: am
7bd287b7: am
ea2ec77f: am
3adb34ee: am
9fcfbfe2: am
3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev
* commit '
6886e3ac185b4ee2d5e2cf054b4beb0d9c55b18f':
Add methods for Time_Delegate
Deepanshu Gupta [Thu, 6 Feb 2014 03:18:27 +0000 (19:18 -0800)]
am
f7994e89: am
6a9cbd5a: am
a0023027: am
23de8dc2: am
28e049ef: am
0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev
* commit '
f7994e89e94d55998e63e9ebe74a8f10c05ccb3a':
Optimize layout rendering in layoutlib
Deepanshu Gupta [Thu, 6 Feb 2014 03:18:24 +0000 (19:18 -0800)]
am
a859670d: am
f9021e48: am
bd762373: am
096e4359: am
f2f108fe: am
a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
* commit '
a859670d0a135d9a33b57fcc450fafa09d9c5a7f':
Add missing files to fix libphonenumber for layoutlib.
Deepanshu Gupta [Thu, 6 Feb 2014 03:18:21 +0000 (19:18 -0800)]
am
3a9d89e2: am
1bcc286d: am
db0427a0: am
5800b19a: am
50b0ce4e: am
fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev
* commit '
3a9d89e28885d5d92423b9d28a1a2430b65e1559':
Fix the measurement of text bounds.
Deepanshu Gupta [Thu, 6 Feb 2014 03:18:18 +0000 (19:18 -0800)]
am
1c064691: am
1bceb982: am
650d30c5: am
b156c019: am
d5129e75: am
8a892279: Fix a bug in Nine Patch library.
* commit '
1c06469101464c147058c01bc25c9e4b3c1aa16b':
Fix a bug in Nine Patch library.
Deepanshu Gupta [Thu, 6 Feb 2014 03:15:37 +0000 (03:15 +0000)]
am
7bd287b7: am
ea2ec77f: am
3adb34ee: am
9fcfbfe2: am
3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev
* commit '
7bd287b70a1c95c96663a6028e9809fd3844f55a':
Add methods for Time_Delegate
Deepanshu Gupta [Thu, 6 Feb 2014 03:15:33 +0000 (03:15 +0000)]
am
6a9cbd5a: am
a0023027: am
23de8dc2: am
28e049ef: am
0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev
* commit '
6a9cbd5a2d56782e94b870735df51d32314684d8':
Optimize layout rendering in layoutlib
Deepanshu Gupta [Thu, 6 Feb 2014 03:15:30 +0000 (03:15 +0000)]
am
f9021e48: am
bd762373: am
096e4359: am
f2f108fe: am
a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
* commit '
f9021e48bedc9fda9bff4e33244e689fb06e8ecb':
Add missing files to fix libphonenumber for layoutlib.
Deepanshu Gupta [Thu, 6 Feb 2014 03:15:26 +0000 (03:15 +0000)]
am
1bcc286d: am
db0427a0: am
5800b19a: am
50b0ce4e: am
fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev
* commit '
1bcc286def646f98747bce2c4dedb0737d5fcf9d':
Fix the measurement of text bounds.
Deepanshu Gupta [Thu, 6 Feb 2014 03:15:22 +0000 (03:15 +0000)]
am
1bceb982: am
650d30c5: am
b156c019: am
d5129e75: am
8a892279: Fix a bug in Nine Patch library.
* commit '
1bceb9823f7af258489c91fa201214805744fa4a':
Fix a bug in Nine Patch library.
Deepanshu Gupta [Thu, 6 Feb 2014 03:06:38 +0000 (03:06 +0000)]
am
ea2ec77f: am
3adb34ee: am
9fcfbfe2: am
3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev
* commit '
ea2ec77f9538de2ea795d3e257f19e8cff659665':
Add methods for Time_Delegate
Deepanshu Gupta [Thu, 6 Feb 2014 03:06:35 +0000 (03:06 +0000)]
am
a0023027: am
23de8dc2: am
28e049ef: am
0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev
* commit '
a0023027e5b7245e2cef304d96826a7ae1c361aa':
Optimize layout rendering in layoutlib
Deepanshu Gupta [Thu, 6 Feb 2014 03:06:32 +0000 (03:06 +0000)]
am
bd762373: am
096e4359: am
f2f108fe: am
a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
* commit '
bd762373964eb3cb71bdd79cbf82c27faa22699d':
Add missing files to fix libphonenumber for layoutlib.
Deepanshu Gupta [Thu, 6 Feb 2014 03:06:29 +0000 (03:06 +0000)]
am
db0427a0: am
5800b19a: am
50b0ce4e: am
fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev
* commit '
db0427a0ac986e0823e7bbe9b7c12a97aabe133e':
Fix the measurement of text bounds.
Deepanshu Gupta [Thu, 6 Feb 2014 03:06:26 +0000 (03:06 +0000)]
am
650d30c5: am
b156c019: am
d5129e75: am
8a892279: Fix a bug in Nine Patch library.
* commit '
650d30c5ec3c0b345651a56c45eb334fabf51b17':
Fix a bug in Nine Patch library.
Deepanshu Gupta [Thu, 6 Feb 2014 03:03:54 +0000 (03:03 +0000)]
am
3adb34ee: am
9fcfbfe2: am
3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev
* commit '
3adb34ee079504b5854d23bc7a38dafc0a985219':
Add methods for Time_Delegate
Deepanshu Gupta [Thu, 6 Feb 2014 03:03:50 +0000 (03:03 +0000)]
am
23de8dc2: am
28e049ef: am
0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev
* commit '
23de8dc2625d4aeb4dc9085c5865ed571f96261a':
Optimize layout rendering in layoutlib
Deepanshu Gupta [Thu, 6 Feb 2014 03:03:45 +0000 (03:03 +0000)]
am
096e4359: am
f2f108fe: am
a955314d: Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev
* commit '
096e43590381b218cec88adeac4261427c19e139':
Add missing files to fix libphonenumber for layoutlib.
Deepanshu Gupta [Thu, 6 Feb 2014 03:03:41 +0000 (03:03 +0000)]
am
5800b19a: am
50b0ce4e: am
fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev
* commit '
5800b19a7a3422620cb28e2327a96bf824f5cc9c':
Fix the measurement of text bounds.