552 Commits

Author SHA1 Message Date
Deepanshu Gupta
16191f8c4f resolved conflicts for merge of 0e2049cd to klp-modular-dev
Change-Id: I518e18d0c769a4cb5d325fc22165a8ead36e11de
2014-04-16 11:58:32 -07:00
Deepanshu Gupta
ec6676ddf6 am 86384880: am f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '863848808d005fe1d2fd84a2982adfc02a3fbb9f':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
2014-04-16 18:40:55 +00:00
Deepanshu Gupta
e5d0fce7ae am 685b7d41: am 1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
* commit '685b7d4165c417ce20b1f6c49190eabcfda09940':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
2014-04-16 18:40:51 +00:00
Deepanshu Gupta
d023360aa0 am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE]
* commit '484c88c3655991759dc64276404d0cf7e33b455f':
  Action bar rendering in layoutlib [DO NOT MERGE]
2014-04-16 18:36:46 +00:00
Deepanshu Gupta
bdd0ad79b9 Layoutlib tests now check methods return value [DO NOT MERGE]
The change is a cherry-pick of relevant fixes from the following
commits on master branch:
the followning commits:
9be03c4e980d3058aeb3fd730da5f7d4a4a4f8a8 and
e05bb956ce429618fd4f971a9dc708b9313c59ea

Change-Id: I87cef323c4eaee4e9f60475f01156b276593fa50
2014-04-15 20:03:20 -07:00
Deepanshu Gupta
f1e7187645 Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
(cherry picked from commit bfec73c2db5a34ced248213edf5519c80727a65f)

Conflicts:
	core/java/android/content/res/Resources.java
	tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
2014-04-15 20:03:19 -07:00
Deepanshu Gupta
1b87390c94 Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Adds MenuBuilderAccessor in addition to the cherry-picked changes.

Change-Id: Ib7cc314079099c010f7d53849e204db36c410357
(cherry-picked from commit 929eea6bc1824bf98d244550c0984ecf8ea98811)
2014-04-15 20:02:49 -07:00
Deepanshu Gupta
4ccc4bd54f Action bar rendering in layoutlib [DO NOT MERGE]
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 14bf0cef7eeed572a67c29a328581afac4decc20)
2014-04-15 20:02:48 -07:00
Jeff Brown
a5c8d586f6 Fix build break due to layout lib.
Change-Id: I87b40125adad0a799214f6ebf0dc04ec7903efbf
2014-04-11 22:09:06 -07: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
Xavier Ducrohet
2cb9147fc4 am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev
* commit '55542ee6449bd580f61bc005726b5c87773fbe25':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
2014-02-20 17:46:05 +00:00
Deepanshu Gupta
ca4b9a77e7 am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit 'e92c8542a5cf1160a1b701b9f176af64ba46d68d':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
2014-02-20 17:46:02 +00:00
Xavier Ducrohet
3e6370425e Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev 2014-02-20 17:41:08 +00:00
Deepanshu Gupta
01825b7aa3 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 commit e327212adde1136807bbdf052e8cc3861f8a6aba)
2014-02-19 20:17:47 +00:00
Deepanshu Gupta
13aea18b34 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 commit 0acfb16dcd95468fe032204f54618e86becfd1eb)
2014-02-19 20:17:00 +00:00
Deepanshu Gupta
56b86debcf am 1c91b1f7: am 45dbfcc7: Improve text rendering and measurement.
* commit '1c91b1f7a2da5e5b1996217228399ef958c2be0c':
  Improve text rendering and measurement.
2014-02-10 19:50:58 +00:00
Deepanshu Gupta
45dbfcc781 Improve text rendering and measurement.
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
2014-02-06 16:27:14 -08:00
Deepanshu Gupta
3adb34ee07 am 9fcfbfe2: am 3bf38b41: Merge "Add methods for Time_Delegate" into klp-dev
* commit '9fcfbfe296d7033ee031171f61b3a33044abee42':
  Add methods for Time_Delegate
2014-02-06 02:59:51 +00:00
Deepanshu Gupta
23de8dc262 am 28e049ef: am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev
* commit '28e049ef73f5d9301a198ac53535442b697b7ef4':
  Optimize layout rendering in layoutlib
2014-02-06 02:59:48 +00:00
Deepanshu Gupta
5800b19a7a am 50b0ce4e: am fd8cba3a: Merge "Fix the measurement of text bounds." into klp-dev
* commit '50b0ce4e8ed353ed841782aeb58963bc084f2e16':
  Fix the measurement of text bounds.
2014-02-06 02:59:41 +00:00
Deepanshu Gupta
b156c0197d am d5129e75: am 8a892279: Fix a bug in Nine Patch library.
* commit 'd5129e75968030620a1372e39fcfbc17fe584e17':
  Fix a bug in Nine Patch library.
2014-02-06 02:59:38 +00:00
Deepanshu Gupta
3bf38b4165 Merge "Add methods for Time_Delegate" into klp-dev 2014-02-06 02:06:02 +00:00
Deepanshu Gupta
0db6e6a567 Merge "Optimize layout rendering in layoutlib" into klp-dev 2014-02-06 02:05:42 +00:00
Deepanshu Gupta
fd8cba3ab8 Merge "Fix the measurement of text bounds." into klp-dev 2014-02-06 02:04:49 +00:00
Deepanshu Gupta
8a892279bd Fix a bug in Nine Patch library.
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
2014-02-05 17:16:35 -08:00
Deepanshu Gupta
eb3c5459eb Add methods for Time_Delegate
Bug: http://b.android.com/65359
Change-Id: I7c2d09286d6bcd9899444aaa5a4a5a342e39d923
2014-01-31 19:24:06 -08:00
Narayan Kamath
8773d51eae resolved conflicts for merge of b82b2f98 to klp-dev-plus-aosp
Change-Id: Ia110056e5fdd2387c207748b17c5c17d1a18ac5b
2014-01-28 19:47:58 +00:00
Narayan Kamath
84151432e7 Track 64bit changes to android/graphics.
All pointers are now 64bits wide, so should be
represented as java longs and not ints.

Also changed DelegateManager and SparseWeakArray to
reflect the new world order.

(cherry picked from commit 88a8364c386c694f7ad56662ef89713dbf7c9d63)

Change-Id: Ic2f55dd6235751169c5014f9d2ccf3f544259a87
2014-01-28 17:56:12 +00:00
Deepanshu Gupta
35d56c0d67 Optimize layout rendering in layoutlib
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
2014-01-20 17:02:37 -08:00
Deepanshu Gupta
5ad7c183f3 Fix the measurement of text bounds.
Bug: 12366230
Change-Id: I203b678363dc7b688c744503ee10216baca658a9
2014-01-07 12:07:45 -08:00
Deepanshu Gupta
24541255c3 Update delegate methods in layoutlib.
Change-Id: I1f0fc274b6a74dbcf0ed46175c4a2fa4c2dd9a63
2013-11-25 19:59:54 -08:00
Deepanshu Gupta
0baec410c2 Update ICU_Delegate methods. DO NOT MERGE
Bug: 11435966
Change-Id: Ib8ed2011fe62b2496795075b33b9ca7d5907b87a
2013-11-18 10:20:37 -08:00
Deepanshu Gupta
d0581d271e Fix NPE in layoutlib. DO NOT MERGE
Change-Id: I36623304d83b344ea078044001577b8005a63c02
2013-11-13 18:15:51 +05:30
Deepanshu Gupta
78cfdf31b7 Update changed delegate method in Bitmap_Delegate. DO NOT MERGE
Issue: https://code.google.com/p/android/issues/detail?id=60167
Change-Id: I3e1d6b9d52ca899889ba758b0ea91bd742cf5005
2013-11-13 18:15:51 +05:30
Craig Mautner
5d9f547720 Relayout windows that handle their own config change.
If a window claims to handle its own configuration change then we
won't destroy and recreate its window on a configuration change.
Normally that recreation triggers the first layout following
orientation change because mHaveFrame is false. Windows that handle
their own configuration changes never got a relayout pass following a
change in orientation.

This change passes the configuration changes that an application
handles into the AppWindowToken. If the app says it handles
orientation or screen size changes then a relayout will occur when the
configuration has changed.

Fixes bug 11647107.

Change-Id: Ie8d49fd050442ebbdcf0b805087894e3a2fc4be9
2013-11-12 14:02:52 -08:00
Deepanshu Gupta
f4800bc3b1 Fix text size in Fake Action Bar
The density multiplier was being applied twice to the title text in
the fake action bar.

Bug: 11436018
Change-Id: Id74c11037cb43d01f6cd79126623c84edfc37aaf
2013-11-08 16:43:07 +05:30
Marco Nelissen
738ffdc9da Add a method to set a list of uids for a wake lock
Cherrypicked from master.

b/9464621

Change-Id: Ia6a9d36d55129ae87d3ec070fbf10dc02f4b6cb4
2013-10-25 12:49:55 -07:00
Deepanshu Gupta
6c3a638dd8 Merge "Fix layoutlib for KK" into klp-dev 2013-10-18 02:07:30 +00:00
Deepanshu Gupta
272d1bce79 Layoutlib: Add DateIntervalFormat_Delegate required by CalendarView
Change-Id: Ica79267a4eb231db833cb0232cfacf419fe73de3
2013-10-17 11:28:48 -07:00
Deepanshu Gupta
4fc655dd03 am 873c76d0: am fb1ee08c: am a49c3585: Merge "Fix CalendarView to show the right month and year label." into jb-mr2-dev
* commit '873c76d0475def6f89fe02458828a549a7a7b5a2':
  Fix CalendarView to show the right month and year label.
2013-10-17 09:09:19 -07:00
Deepanshu Gupta
38d097b6d1 am 92a80b18: am 9b827a7d: am ec555902: Merge "Layoutlib: Update the wifi icon in the status bar." into jb-mr2-dev
* commit '92a80b1830082d109be4902c357424535305130d':
  Layoutlib: Update the wifi icon in the status bar.
2013-10-17 09:09:16 -07:00
Deepanshu Gupta
ca429e08fe am 9568ad39: am 94e5ada7: am 81f74f4b: Fix DatePicker and Calendar widget in layoutlib.
* commit '9568ad393194cbd42866e64dada88207b44462a6':
  Fix DatePicker and Calendar widget in layoutlib.
2013-10-17 09:09:12 -07:00
Deepanshu Gupta
a49c358576 Merge "Fix CalendarView to show the right month and year label." into jb-mr2-dev 2013-10-17 16:01:08 +00:00
Deepanshu Gupta
ec55590216 Merge "Layoutlib: Update the wifi icon in the status bar." into jb-mr2-dev 2013-10-17 16:00:57 +00:00
Deepanshu Gupta
39e7583539 Fix layoutlib for KK
Fix a NPE, update the native methods for NinePatch and update an ICU
method to return the right value as required by DatePicker widget.

Bug: 11140701
Change-Id: Id92fc5359acf6dde1bcdbc781aaf637fdb6eecbf
2013-10-16 21:49:02 -07:00
Deepanshu Gupta
81f74f4bc9 Fix DatePicker and Calendar widget in layoutlib.
Issue: https://code.google.com/p/android/issues/detail?id=59732
Change-Id: I281b3fdad88c591281a3645592c84f3e2cb61d09
2013-10-16 15:09:52 -07:00
Deepanshu Gupta
083e3caf66 Fix CalendarView to show the right month and year label.
Change-Id: I95431f1054678d4192bd1621c1f69b29268f55e9
2013-10-16 15:09:52 -07:00
Deepanshu Gupta
9cb5f5b523 Layoutlib: Update the wifi icon in the status bar.
Issue: https://code.google.com/p/android/issues/detail?id=60993

Change-Id: Ia43ed40b42c79f67dcd5809b827d4fecbc823c25
2013-10-14 10:35:46 -07:00
Alan Viverette
5a0f4eccfb Ignore certain WindowManager flags when touch exploration is enabled
Specifically, ignore any flags that alter the visibility of the navigation
bar and transparency.

BUG: 11082573
Change-Id: I17264dc55a1c6c3cb9b9cf92d5121799cecee5b8
2013-10-07 15:12:57 -07:00
Marco Nelissen
fb45a2e9cd Merge "Fix layoutlib build" into klp-dev 2013-10-03 20:51:36 +00:00