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

1792 Commits

Author SHA1 Message Date
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
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
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
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
Deepanshu Gupta
def26cb43b am 8aa7a967: Merge "Support custom views using TimePickerDialog in layoutlib" 
* commit '8aa7a9677af8f235ade204602014a5e2e9f9188e':
  Support custom views using TimePickerDialog in layoutlib
 2014-04-10 00:02:34 +00:00
Deepanshu Gupta
86e5218220 Support custom views using TimePickerDialog in layoutlib 
Bug: http://b.android/com/61515

Change-Id: I0dc3357be0c058adde9d3ea5b6796004b786fd34
 2014-04-09 15:15:49 -07:00
Deepanshu Gupta
7a2333631e am 733217e6: Merge "Update layoutlib create README" 
* commit '733217e6768757c50e1ac38644c2ecdbe522e8f5':
  Update layoutlib create README
 2014-04-09 00:45:33 +00:00
Deepanshu Gupta
a4ce30fd86 am 6e5e160f: Merge "Make layoutlib load on Java 7 VM" 
* commit '6e5e160f19c404c272e70f7f0ade5b27850ebd05':
  Make layoutlib load on Java 7 VM
 2014-04-09 00:45:27 +00:00
Deepanshu Gupta
733217e676 Merge "Update layoutlib create README" 2014-04-08 23:37:34 +00:00
Deepanshu Gupta
88585f404c Update layoutlib create README 
Update the doc to reflect the current state of the tool and use a
consistent 100 char column limit.

Change-Id: I64fb58cc46abbc2f3759cb1f99d42b5090c1409f
 2014-04-08 16:30:45 -07:00
Deepanshu Gupta
6e5e160f19 Merge "Make layoutlib load on Java 7 VM" 2014-04-08 22:47:45 +00:00
Deepanshu Gupta
6a08225cee Make layoutlib load on Java 7 VM 
Prevent Java 7 VM from verifying the StackMapTable for methods by lying
about the class version.

The changeset also fixes the eclipse project by using the right asm
library in the checkout.

Change-Id: Idabf165380fb75fcc2d5c8fbd72388f52887a5df
 2014-04-08 15:07:49 -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
John Spurlock
83398922ba am 0a0454fd: am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 
* commit '0a0454fdcc7aeac6e57f9466da8f39bcf5f3f6ec':
  Introduce new UI_MODE_TYPE_WATCH and qualifier.
 2014-04-04 19:40:10 +00:00
John Spurlock
0a0454fdcc am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 
* commit '642421aa7f284817cc1a972a7f9c7a64696a0116':
  Introduce new UI_MODE_TYPE_WATCH and qualifier.
 2014-04-04 19:34:11 +00: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
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
779b0eea30 Merge "Fix visitFieldInsn in layoutlib_create." 2014-04-01 05:37:23 +00:00
Deepanshu Gupta
4a0f93bd32 Fix visitFieldInsn in layoutlib_create. 
The bug caused some classes to be missed when computing the dependencies
of the existing classes.

Change-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa
 2014-03-31 19:06:53 -07: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
Deepanshu Gupta
411b9691e3 Add missing dependency in layoutlib build file 
Add missing dependency on built_ext_data

Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4
 2014-03-31 16:11:13 -07: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
776abc24cd Uses VMRuntime.newUnpaddedArray for ideal array sizes 
Bug:13028925

Change-Id: I0a9301248b10a339afbdc5e4ffe3310ac4fa1fb7
 2014-03-27 11:42:10 -07:00
Adam Lesinski
de898ff429 Shared library resource support 
Shared libraries can now export resources for applications
to use.

Exporting resources works the same way the framework exports
resources, by defining the public symbols in res/values/public.xml.

Building a shared library requires aapt to be invoked with the
--shared-lib option. Shared libraries will be assigned a package
ID of 0x00 at build-time. At runtime, all loaded shared libraries
will be assigned a new package ID.

Currently, shared libraries should not import other shared libraries,
as those dependencies will not be loaded at runtime.

At runtime, reflection is used to update the package ID of resource
symbols in the shared library's R class file. The package name of
the R class file is assumed to be the same as the shared library's
package name declared in its manifest. This will be customizable in
a future commit.

See /tests/SharedLibrary/ for examples of a shared library and its
client.

Bug:12724178
Change-Id: I60c0cb8ab87849f8f8a1a13431562fe8603020a7
 2014-03-25 12:09:56 -07:00
Dianne Hackborn
852472d9aa Fix build. 
Change-Id: I1dd79e932a551bd537d2c71e8fca29a299c9312f
 2014-03-24 14:53:39 -07: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