901 Commits

Author SHA1 Message Date
Deepanshu Gupta
929eea6bc1 Add overflow menu popup for Action Bar in Layoutlib
Change-Id: Ib7cc314079099c010f7d53849e204db36c410357
2014-04-14 15:26:56 -07:00
Dan Sandler
352e108259 Merge "Merge remote-tracking branch 'goog/master-lockscreen-dev'" 2014-04-14 17:54:22 +00:00
Jeff Brown
dc800e8513 am eaa8a6b7: am a5c8d586: Fix build break due to layout lib.
* commit 'eaa8a6b7feb4a520f48654b087223ccaf49b6a2f':
  Fix build break due to layout lib.
2014-04-12 08:45:06 +00:00
Jeff Brown
eaa8a6b7fe am a5c8d586: Fix build break due to layout lib.
* commit 'a5c8d586f6ceff252336f72c6e15efbf4785e794':
  Fix build break due to layout lib.
2014-04-12 08:22:06 +00:00
Jeff Brown
a5c8d586f6 Fix build break due to layout lib.
Change-Id: I87b40125adad0a799214f6ebf0dc04ec7903efbf
2014-04-11 22:09:06 -07:00
Narayan Kamath
7caa77e3ab am 79d88d13: am 73e78c75: am af42a91c: Fix another build breakage.
* commit '79d88d138c07835d349f7c74f380eaeb7cac8d0b':
  Fix another build breakage.
2014-04-11 11:41:42 +00:00
Narayan Kamath
79d88d138c am 73e78c75: am af42a91c: Fix another build breakage.
* commit '73e78c75b770b3af0d48acac9c8565f7b4d035ff':
  Fix another build breakage.
2014-04-11 11:37:40 +00:00
Narayan Kamath
73e78c75b7 am af42a91c: Fix another build breakage.
* commit 'af42a91c118941d463b474574bf34bf05822350d':
  Fix another build breakage.
2014-04-11 11:35:19 +00:00
Narayan Kamath
af42a91c11 Fix another build breakage.
Caused by 037c33eae74bee2774897d969d48947f9abe254f, which
was submitted without a checkbuild.

Change-Id: I0d48f6b941cc98a30904cdfbd7bcb56ed509734e
2014-04-11 11:31:07 +00:00
Colin Cross
d4d4658766 resolved conflicts for merge of 90b39aba to master-lockscreen-dev
Change-Id: I2871a1e49c3b443cc7479f2352c652be3b0fb85b
2014-04-10 22:41:05 -07:00
Colin Cross
0b65c56eb0 fix build
Fix make checkbuild.

Change-Id: Ie9335a9e8afe4dc13ec47b2e84ab433b19ff315f
2014-04-10 22:05:57 -07:00
Svetoslav
dd137a85d3 resolved conflicts for merge of 6be2f952 to master-lockscreen-dev
Conflicts:
	core/java/android/view/IWindowManager.aidl
	tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java

Change-Id: Idcbc581294cc52b53eabefd61e5c20cbcea611db
2014-04-10 12:48:07 -07:00
Svetoslav
6be2f95202 Merge "Adding render stats APIs to UiAutomation (framework)." 2014-04-10 19:32:59 +00:00
Deepanshu Gupta
14bf0cef7e Action bar rendering in layoutlib
This also makes a couple of changes to the framework:
1. ShareActionProvider - Use edit mode to execute activity chooser code.
2. WindowDecorActionBar - 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
2014-04-10 10:44:45 -07:00
Ying Wang
1c9d93dcb0 am 30f05c29: Merge "Fix sdk build."
* commit '30f05c29c56a04f8d8ab2851d0c20a2b66406cfa':
  Fix sdk build.
2014-04-08 19:20:26 +00:00
Ying Wang
ff0bb30752 Fix sdk build.
Change-Id: I3e620315e082b46ba5fcd4511b9c258bf610ddf5
2014-04-08 12:14:50 -07:00
Svetoslav
1376d600d8 Adding render stats APIs to UiAutomation (framework).
bug:12927198

Change-Id: Iae21481c75ae58dcdab3731bf5f1e2844e29d434
2014-04-07 17:01:42 -07:00
Deepanshu Gupta
d94d1fbecd am e9abc279: Merge "Fix theme/style resolution in Layoutlib"
* commit 'e9abc279fd0e1cd3a7c0bfb878c9b5ae22840b9b':
  Fix theme/style resolution in Layoutlib
2014-04-07 22:29:57 +00:00
Deepanshu Gupta
e9abc279fd Merge "Fix theme/style resolution in Layoutlib" 2014-04-07 22:27:01 +00:00
Deepanshu Gupta
ce00b81c41 am 1cb3e814: Merge "Fix sdk build"
* commit '1cb3e81421ada146b35515942299fb867b82048d':
  Fix sdk build
2014-04-05 01:09:22 +00:00
Deepanshu Gupta
ddf286282d Fix sdk build
Change-Id: Ic08b57fdf2a653071a403bcc2c6b239a19363f72
2014-04-04 18:02:57 -07:00
Deepanshu Gupta
bfec73c2db Fix theme/style resolution in Layoutlib
Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
2014-04-04 13:44:22 -07:00
Deepanshu Gupta
c07a48bed2 Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev 2014-04-04 00:45:45 +00:00
Deepanshu Gupta
b6588c5224 Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 2014-04-04 00:44:02 +00:00
Deepanshu Gupta
3bc5b23f8d Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev 2014-04-04 00:43:48 +00:00
Jorim Jaggi
ae6ffcc3c7 Merge "Wait for Keyguard to be drawn after boot." into master-lockscreen-dev 2014-04-02 21:22:59 +00:00
Jorim Jaggi
cff0acb6b1 Wait for Keyguard to be drawn after boot.
The old logic with waiting for the Keyguard to be drawn assumed that
it is in an own window, and just checked for the visibility. This is
no longer possible as the Keyguard is in the status bar, and the status
bar might have been drawn without the Keyguard. So we have to wait
explicitely until Keyguard told PhoneWindowManager that it has now been
drawn and we can turn on the screen.

In addition, the starting logic of SystemUI is moved into
SystemUIApplication such the we can make sure that the status bar
already exists when the callbacks from PhoneWindowManager reach
KeyguardService. This simplifies the logic a lot.

Bug: 13635952
Change-Id: Ifd6ba795647edcf3501641e39052e4d04bc826fb
2014-04-02 22:11:19 +02:00
Deepanshu Gupta
831f3ce9b5 Add stub getThemeAttributeId() to BridgeTypedArray
The method is used to obtain theme attribute IDs for drawables for
caching.

The changeset also fixes some minor style issues found by code
inspection.

Change-Id: Ib5fe05511397b5ec7cb8e64f6b2769ec2c355f41
2014-04-01 10:17:31 -07:00
Deepanshu Gupta
c63e87d53d Set default text style in layoutlib as NORMAL [DO NOT MERGE]
If a style doesn't specify text style (normal/bold/italic/bold-italic)
then default to normal instead of throwing an error.

Bug: http://b.android.com/61358
Change-Id: I0138c73807a5ff6e4d938a99ece3044333110aa1
(cherry-picked from 0acfb16dcd95468fe032204f54618e86becfd1eb)
2014-03-28 15:00:25 -07:00
Deepanshu Gupta
5fb41528a6 Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
For these font families, text was always rendered as italic. This
changeset fixes the issue.

Bug: http://b.android.com/57221
Change-Id: Ic8a299bd1e555f5bb914cd3d2fe72917ec7f471a
(cherry-picked from e327212adde1136807bbdf052e8cc3861f8a6aba)
2014-03-28 14:55:03 -07:00
Deepanshu Gupta
88301948c9 Improve text rendering and measurement. [DO NOT MERGE]
1. Fix a bug where baseline of the run was modified while rendering
resulting in crooked text in some cases.

2. Use GlyphVector.getLogicalBounds() for text measurement which is more
accurate than getVisualBounds().

3. This change also optimizes text rendering by not computing the advances
for individual glyphs when not needed.

Change-Id: I66792c4d8f50eaf29afa70bccca1e6c812a3fa28
(cherry-picked from 45dbfcc781a3926d22571b6ccfa3f27ec896f119)
2014-03-28 14:46:51 -07:00
Deepanshu Gupta
ddb7f3273c Add methods for Time_Delegate [DO NOT MERGE]
Bug: http://b.android.com/65359
Change-Id: I7c2d09286d6bcd9899444aaa5a4a5a342e39d923
(cherry-picked from eb3c5459eb893061779b102236a81069efdbef73)
2014-03-28 14:44:50 -07:00
Deepanshu Gupta
9e5e993c79 Optimize layout rendering in layoutlib [DO NOT MERGE]
The height of a layout should be zero if it is assigned a layout_weight.
This way, the layout is measured only once and prevents spurious errors.

Bug: https://code.google.com/p/android/issues/detail?id=58398
Change-Id: If49a7480e5eb82cb86780e00f2f5b65ee053fc2a
(cherry-picked from 35d56c0d67537e56fafebd8edf790026644fe8de)
2014-03-28 14:21:10 -07:00
Deepanshu Gupta
eb1fae940d Fix the measurement of text bounds. [DO NOT MERGE]
Bug: 12366230
Change-Id: I203b678363dc7b688c744503ee10216baca658a9
(cherry-picked from 5ad7c183f39df43562c69aba21ea422ad69bdae0)
2014-03-28 14:08:02 -07:00
Deepanshu Gupta
ee1187a94f Fix a bug in Nine Patch library. [DO NOT MERGE]
The nine patches were not drawn correctly if they were not positioned at
the top left corner of the canvas.

Bug: http://b.android.com/29959
Change-Id: Icfed522ea07322a3ee9f3955067d3da26c4b0b5b
(cherry-picked from 8a892279bd1b212311f4200f306a317985463918)
2014-03-27 19:00:28 -07:00
Deepanshu Gupta
80c55109b6 Fix NPE in layoutlib. [DO NOT MERGE]
Change-Id: I36623304d83b344ea078044001577b8005a63c02
(cherry-picked from d0581d271e814670d81a6550aa7b1e86864d5710)
2014-03-27 16:02:52 -07:00
Deepanshu Gupta
28873c1f00 Fix layoutlib [DO NOT MERGE]
Fix a NPE, and update an ICU method to return the right value as
required by DatePicker widget.

The cherry-pick differs slightly from the original to remove changes not
relevant to the current branch.

Bug: 11140701
Change-Id: Id92fc5359acf6dde1bcdbc781aaf637fdb6eecbf
(cherry-picked from 39e75835399f4d979cf82069dae2bd1ec496fb81)
2014-03-27 15:25:04 -07:00
Deepanshu Gupta
0b7d80765c Fix text size in Fake Action Bar. [DO NOT MERGE]
The density multiplier was being applied twice to the title text in
the fake action bar.

Bug: 11436018
Change-Id: Id74c11037cb43d01f6cd79126623c84edfc37aaf
(cherry-picked from f4800bc3b122828d61a34caecbf782eee170ae59)
2014-03-27 15:09:45 -07:00
Adam Lesinski
776abc24cd Uses VMRuntime.newUnpaddedArray for ideal array sizes
Bug:13028925

Change-Id: I0a9301248b10a339afbdc5e4ffe3310ac4fa1fb7
2014-03-27 11:42:10 -07:00
Dianne Hackborn
852472d9aa Fix build.
Change-Id: I1dd79e932a551bd537d2c71e8fca29a299c9312f
2014-03-24 14:53:39 -07:00
Svetoslav
1a5255d547 Fixing yet another build breackage
Change-Id: I83597d5433fc6cc380d5ec1dd6f78e115e76db5b
2014-03-20 14:54:08 -07:00
Deepanshu Gupta
a72da3aec6 Merge "Add native method delegates to layoutlib" 2014-03-14 21:16:22 +00:00
Deepanshu Gupta
103d40960d Add native method delegates to layoutlib
Add delegates for Path.native_isConvex and ICU.getCurrencyNumericCode.
The original methods were added in
5be83edd15e11420287cc0af93a95d5a6dfae68f and
d627bd4525e41b0503f94c2887c3e01618c73105 respectively.

TODO: Implement Path_Delegate.native_isConvex

Change-Id: If1046467d3950ab6955c6b81383a60fd6bd03fd2
2014-03-14 13:31:12 -07:00
Narayan Kamath
ceb2e0a605 am 1abb7e0f: am 63938750: am c0232642: am 629daddd: Merge "Fix layoutlib build."
* commit '1abb7e0f3920b31cf216b99fc83231d80dfa7ca4':
  Fix layoutlib build.
2014-03-14 17:53:05 +00:00
Narayan Kamath
6393875024 am c0232642: am 629daddd: Merge "Fix layoutlib build."
* commit 'c0232642b74517aa2717673f0811ba65c620f491':
  Fix layoutlib build.
2014-03-14 14:22:30 +00:00
Narayan Kamath
c73991bda0 Fix layoutlib build.
Was using private data structures from libcore.

Change-Id: I5bd43190081891659e18b5c871686e6078efcc81
2014-03-14 14:10:30 +00:00
Deepanshu Gupta
f978f16e50 resolved conflicts for merge of c76345a3 to klp-modular-dev-plus-aosp
Change-Id: Id0aae224e17651bc07aa3f5b1a06923603d025b8
2014-03-11 16:39:13 -07:00
Deepanshu Gupta
0d7ebc51ff Fix the delegate method signatures in LayoutLib
Change-Id: I262c285c1047958afdb024724959d5afb3552802
2014-03-05 19:23:48 -08:00
Xavier Ducrohet
5ea4be5214 am b2334254: am ec84ada6: am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock"
* commit 'b2334254ef497e0dcda68d257c096516c77679a4':
  Update layoutlib method for SystemClock
2014-02-27 23:41:38 +00:00
Xavier Ducrohet
ec84ada6e8 am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock"
* commit '5e5602da5fa9cd2e1d135b2310af2a8352f65e8d':
  Update layoutlib method for SystemClock
2014-02-27 23:34:34 +00:00