drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,789 Commits 1 Branch 0 Tags
Commit Graph

1703 Commits

Author SHA1 Message Date
Deepanshu Gupta
8f9d92c4ca am 7406e4b8: am 7947ec71: am b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev 
* commit '7406e4b8102ffd71affd55a9f453c0ecce13a097':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-04-24 01:36:22 +00:00
Deepanshu Gupta
057dca97d9 am 1668ae8d: am a019e772: am 6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev 
* commit '1668ae8d2a29b491c3ae421c5b0eca101fb10824':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-04-24 01:36:18 +00:00
Deepanshu Gupta
5dee1a093a am e17ed922: am 126f4057: am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE] 
* commit 'e17ed922001cf70c48969eb7b10ee2e2557b41f9':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-04-24 01:36:14 +00:00
Deepanshu Gupta
7406e4b810 am 7947ec71: am b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev 
* commit '7947ec715d8b4a0c82135553abb4947b61bf802b':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-04-24 01:31:24 +00:00
Deepanshu Gupta
1668ae8d2a am a019e772: am 6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev 
* commit 'a019e77252f86962b9803042c01b897f7f1aa89f':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-04-24 01:31:20 +00:00
Deepanshu Gupta
e17ed92200 am 126f4057: am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE] 
* commit '126f4057a06756fbb1c194b5d9d40f9f922d14ee':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-04-24 01:31:15 +00:00
Deepanshu Gupta
b64732d977 Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev 2014-04-24 01:21:55 +00:00
Deepanshu Gupta
6aaea1bd4a Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev 2014-04-24 01:21:46 +00:00
Deepanshu Gupta
1ea1b21acd Fix style warnings in RenderSessionImpl [DO NOT MERGE] 
Change-Id: I9d3cb23e4ea692f737a3e3d6c18cc8de18b66a3c
(cherry-picked from commit fbfeb1a90b6f8f3966c60a69d50ce8f608d9d861)
 2014-04-23 18:04:26 -07:00
Deepanshu Gupta
5ba2f230fa Add view cookies for action bar menus. [DO NOT MERGE] 
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 1001961f904bac5294aaf73a47c2497aa764bf7f)
 2014-04-23 18:04:21 -07:00
Deepanshu Gupta
6f9baea477 Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE] 
The bug caused some classes to be missed when computing the dependencies
of the existing classes.

Change-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa
(cherry-picked from 4a0f93bd32b8dd9b3c351680ad82e461d5111f38)
 2014-04-23 16:11:57 -07:00
Deepanshu Gupta
be06a4182b am cf5c3fc7: am 53b7df19: Merge "Add missing ICU_Delegate methods." 
* commit 'cf5c3fc70d4dcd5dc3c6054d0f7415ded0070e4f':
  Add missing ICU_Delegate methods.
 2014-04-22 23:15:05 +00:00
Deepanshu Gupta
e2b67777ad Add missing ICU_Delegate methods. 
Update the ICU_Delegate to add methods originally added in
I5de58be7e8a701f2c40182ea54bceff85ec1aad2

Change-Id: I536834fe76cbc7dae05580182fee1bea956e3e77
 2014-04-21 14:33:33 -07:00
Elliott Hughes
36e64ab902 am cf4d85e4: am 90840ec2: Merge "Fix warning introduced by recent psuedolocalizer change." 
* commit 'cf4d85e4786beb98743eac68b71d67e36f76c058':
  Fix warning introduced by recent psuedolocalizer change.
 2014-04-18 23:26:16 +00:00
Elliott Hughes
0a1eed394f Fix warning introduced by recent psuedolocalizer change. 
Change-Id: I577caf6ca4261b3d044b18bc8c5915012168031d
 2014-04-18 16:15:27 -07:00
Elliott Hughes
56ca821912 resolved conflicts for merge of ec42199a to klp-modular-dev-plus-aosp 
Change-Id: I9ecd5d51be4d073ab93dbb0bd60097735e76bf94
 2014-04-18 15:56:46 -07:00
Deepanshu Gupta
59dfbb91ca Fix build [DO NOT MERGE] 
The branch is missing some CLs for 64-bit support. So, until they are
added, this change will fix the build.

Change-Id: Ia838caf60ca49b406101a3fb48a96afdcfb30c66
 2014-04-17 00:14:28 -07:00
Deepanshu Gupta
492090a55e am 16191f8c: resolved conflicts for merge of 0e2049cd to klp-modular-dev 
* commit '16191f8c4fe92036c8ff2eecd4e57b4642068b99':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-04-16 19:20:01 +00:00
Deepanshu Gupta
35d46778f4 resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp 
Change-Id: I2fec735ba65f56da7d17022074f8924a259b4bbf
 2014-04-16 12:14:34 -07:00
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
82d5f137ed am e5d0fce7: am 685b7d41: am 1b87390c: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] 
* commit 'e5d0fce7aeb60c44849cd09815ccecda702422ef':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-04-16 18:43:23 +00: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
f2d085e867 am d023360a: am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE] 
* commit 'd023360aa03db1a7831a5697d49faa2575e4a9c3':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-04-16 18:39:25 +00:00
Deepanshu Gupta
110a05c6bd am 2aee0712: am e75477cb: am acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE] 
* commit '2aee07124cad720587a8c51de5650b6b93ae9150':
  Support custom views using TimePickerDialog [DO NOT MERGE]
 2014-04-16 18:39:21 +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
2aee07124c am e75477cb: am acf0bce0: Support custom views using TimePickerDialog [DO NOT MERGE] 
* commit 'e75477cb3bf0f2e18c1f0bb743a6189fbc07c2a2':
  Support custom views using TimePickerDialog [DO NOT MERGE]
 2014-04-16 18:36:40 +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
Deepanshu Gupta
acf0bce09f Support custom views using TimePickerDialog [DO NOT MERGE] 
Bug: http://b.android/com/61515

Change-Id: I0dc3357be0c058adde9d3ea5b6796004b786fd34
(cherry picked from commit 86e5218220a0e01f7eb574a2480bd91f9ebfae35)
 2014-04-15 19:53:54 -07: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
Deepanshu Gupta
c76faca60e am e2dc6985: am f1334ccc: am 849a8208: Add DatePickerDialog to layoutlib [DO NOT MERGE] 
* commit 'e2dc69856879d41798545b2c113098195bf04fa6':
  Add DatePickerDialog to layoutlib [DO NOT MERGE]
 2014-04-12 02:30:31 +00:00
Deepanshu Gupta
e2dc698568 am f1334ccc: am 849a8208: Add DatePickerDialog to layoutlib [DO NOT MERGE] 
* commit 'f1334ccc1522241c0efc2449ed8bf472a5b01204':
  Add DatePickerDialog to layoutlib [DO NOT MERGE]
 2014-04-12 02:26:09 +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
Deepanshu Gupta
849a8208c8 Add DatePickerDialog to layoutlib [DO NOT MERGE] 
Includes android.app.DatePickerDialog in the layoutlib.jar

Bug: http://b.android.com/28318
Change-Id: I583dde4a8b88204bf98bfca8d91470e1aa4719ce
(cherry picked from commit c2016d4073c61e87439d4fa14837b397a3c1630a)
 2014-04-10 00:21:57 +00:00
Anton Krumin
a2ef5c0d4f Pseudolocalizer improvements. 
Fixes accented pseudolocalization and adds RTL pseudolocale.

This change contains following modifications in the pseudolocalization logic:
1) zz_ZZ pseudolocale was removed;
2) en_XA pseudolocale was added for pseudo-accented;
3) ar_XB pseudolocale was added for pseudo-rtl;
4) Pseudo RTL localization functionality was implemented;
5) Text expansion functionality was implemented;
6) Text bracketing was implemented;
7) Couple of issues of previous implementation were fixed.

Change-Id: I9f7f27bed717e39e82717d15c398decffc8bec3c
Signed-off-by: Anton Krumin <antkrumin@google.com>
 2014-04-09 16:59:48 -07:00
John Spurlock
642421aa7f am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 
* commit '5c31e487c4577e1c47ee7c949325d6a13f0d462e':
  Introduce new UI_MODE_TYPE_WATCH and qualifier.
 2014-04-04 19:28:09 +00:00
John Spurlock
5c31e487c4 Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 2014-04-04 19:24:09 +00:00
John Spurlock
6c191299a7 Introduce new UI_MODE_TYPE_WATCH and qualifier. 
Default ui mode to watch if we have FEATURE_WATCH.

Bug:13395758
Change-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd
 2014-04-04 15:21:53 -04:00
Xavier Ducrohet
72b2f53690 am 76c484de: am d93b0b67: am e448bcf7: Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into klp-dev 
* commit '76c484de88317fbadc8a070fc333d4fb14355335':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-04-03 22:24:47 +00:00
Xavier Ducrohet
76c484de88 am d93b0b67: am e448bcf7: Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into klp-dev 
* commit 'd93b0b67754f6d06407086278298f44156458216':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-04-03 22:17:10 +00:00
Deepanshu Gupta
e345507ca4 Add missing dependency in layoutlib build file [DO NOT MERGE] 
Add missing dependency on built_ext_data

Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4
(cherry picked from commit 411b9691e39c0bdd0dafdda7db2737b99b45769e)
 2014-03-31 23:15:52 +00:00
Adam Lesinski
587e420ea9 am 004ceaaa: am 55a65509: Merge "Reduce warning verbosity in aapt" 
* commit '004ceaaa4d3ddfc66ba3f3635e987c2ddc7f2d09':
  Reduce warning verbosity in aapt
 2014-03-27 21:05:06 +00:00
Adam Lesinski
e119b22146 Reduce warning verbosity in aapt 
- Attributed source of problems to the correct file.
- Only verify string localizations against valid
  locales.
Bug:13140015
Change-Id: I9dabc5efa0510649caee8af0c8ebb803d6f48269
 2014-03-24 10:50:34 -07: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