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

2715 Commits

Author SHA1 Message Date
Adam Lesinski
ab83c04201 am ac4aee2f: am a196e203: am 98e858b1: am 581dfee1: am 0a6c5ea4: Merge "AAPT: Fix issue with synthesized resource not actually showing up" into lmp-dev 
* commit 'ac4aee2f339047e472ffb653c0d0a8254ed209b3':
  AAPT: Fix issue with synthesized resource not actually showing up
 2014-09-26 15:28:12 +00:00
Adam Lesinski
61b8bfa5d3 am a196e203: am 98e858b1: am 581dfee1: am 0a6c5ea4: Merge "AAPT: Fix issue with synthesized resource not actually showing up" into lmp-dev 
* commit 'a196e203076cb810a21a702b41f6a1d82d029318':
  AAPT: Fix issue with synthesized resource not actually showing up
 2014-09-26 05:03:49 +00:00
Adam Lesinski
978ab9d929 AAPT: Fix issue with synthesized resource not actually showing up 
AAPT keeps around a few pieces of state that are disjoint, so
simply adding to a collection won't add the resource to the final
flattened output. Instead, we create the resource from the top
and then copy over the values into the newly created resource.

Bug:17647890
Change-Id: I214263e84c18f9370c6e6a5aa53aa2d833fc842d
 2014-09-24 19:02:52 -07:00
Adam Lesinski
9e07072360 am 78ab98fa: am d4e5b601: am 37e3df38: am 1aa4db07: am 81745c51: Merge "AAPT: Continuation of public/private attribute fix" into lmp-dev 
* commit '78ab98faff4e1a3c32a5f6abeaf6027094c76637':
  AAPT: Continuation of public/private attribute fix
 2014-09-23 16:16:50 +00:00
Adam Lesinski
dc03c9f292 am d4e5b601: am 37e3df38: am 1aa4db07: am 81745c51: Merge "AAPT: Continuation of public/private attribute fix" into lmp-dev 
* commit 'd4e5b601c7da5c662d8cf9c46177810fdeeed23f':
  AAPT: Continuation of public/private attribute fix
 2014-09-22 19:45:27 +00:00
Adam Lesinski
2b7ee9a18e Merge "AAPT: Continuation of public/private attribute fix" into lmp-dev 2014-09-22 18:00:31 +00:00
Adam Lesinski
e572c011fe AAPT: Continuation of public/private attribute fix 
XML files like layouts are now scanned and checked
for v21 attributes. If those kinds of attributes
are found, then we remove them in the original
version and synthesize a new xml file under the
v21 configuration.

Bug:17520380
Change-Id: Icf984cb96134180a2e35349c1dbf2cef9a8f0bda
 2014-09-22 10:51:20 -07:00
Dan Albert
f9974e9aaa am 6746b74d: resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aosp 
* commit '6746b74de540f2899f886cd25827f3ca9901de32':
  Clean up makefile cruft.
 2014-09-19 23:31:21 +00:00
Adam Lesinski
3ae4ac218c am 60040044: am 9ee3ba23: am e7e9ad6d: am 863b1a90: am 19f9d54f: Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev 
* commit '6004004428a93a03657b513d62eeaab660db0896':
  Fix backwards compat problem with AAPT public attrs
 2014-09-19 23:28:24 +00:00
Dan Albert
8ab25d82b5 resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aosp 
Change-Id: If649bd9ef98181a1e1e341cc5b73d237586fb72c
 2014-09-19 16:13:49 -07:00
Dan Albert
1a4527ce94 am 799812cd: Merge "Clean up makefile cruft." 
* commit '799812cd6f7f9aa4a87d81dafd273d51ac5ba992':
  Clean up makefile cruft.
 2014-09-19 22:14:42 +00:00
Adam Lesinski
0fa7511db2 am 9ee3ba23: am e7e9ad6d: am 863b1a90: am 19f9d54f: Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev 
* commit '9ee3ba23395bd1a13bbfd3fe523ee611a5ca001b':
  Fix backwards compat problem with AAPT public attrs
 2014-09-19 19:08:50 +00:00
Adam Lesinski
b6812b64c4 Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev 2014-09-19 18:19:58 +00:00
Adam Lesinski
82a2dd8efe Fix backwards compat problem with AAPT public attrs 
AAPT has traditionally assigned resource IDs to public attributes,
and then followed those public definitions with private attributes.

--- PUBLIC ---
| 0x01010234 | attr/color
| 0x01010235 | attr/background

--- PRIVATE ---
| 0x01010236 | attr/secret
| 0x01010237 | attr/shhh

Each release, when attributes are added, they take the place of the private
attributes and the private attributes are shifted down again.

--- PUBLIC ---
| 0x01010234 | attr/color
| 0x01010235 | attr/background
| 0x01010236 | attr/shinyNewAttr
| 0x01010237 | attr/highlyValuedFeature

--- PRIVATE ---
| 0x01010238 | attr/secret
| 0x01010239 | attr/shhh

Platform code may look for private attributes set in a theme. If an app
compiled against a newer version of the platform uses a new public
attribute that happens to have the same ID as the private attribute
the older platform is expecting, then the behavior is undefined.

We get around this by detecting any newly defined attributes (in L),
copy the resource into a -v21 qualified resource, and delete the
attribute from the original resource. This ensures that older platforms
don't see the new attribute, but when running on L+ platforms, the
attribute will be respected.

We still need to address this problem in the platform moving forward,
as this will only help us in the transition from pre L to L.

Bug:17520380
Change-Id: Ia2a985798b50006c21c7c3431d30d9598f27cd91
 2014-09-18 14:05:24 -07:00
Deepanshu Gupta
626b46de74 am f2525aa9: am 885f91f7: am 820d90e2: am 69f09fe8: Merge "Build LayoutLib tests with Java 6" into lmp-dev 
* commit 'f2525aa9f8baa8662904ee1b027a0018460baf21':
  Build LayoutLib tests with Java 6
 2014-09-17 05:15:00 +00:00
Deepanshu Gupta
651890a807 am 1ab02add: am 8bdd408b: am 69f09fe8: Merge "Build LayoutLib tests with Java 6" into lmp-dev 
* commit '1ab02add81ea0c7de73bf55f7940ba478f37ef87':
  Build LayoutLib tests with Java 6
 2014-09-16 18:52:25 +00:00
Deepanshu Gupta
2c00fb9e58 am 8bdd408b: am 69f09fe8: Merge "Build LayoutLib tests with Java 6" into lmp-dev 
* commit '8bdd408bace65f854eac0972f2fb636306aae854':
  Build LayoutLib tests with Java 6
 2014-09-16 18:40:16 +00:00
Deepanshu Gupta
bc1944560c Merge "Build LayoutLib tests with Java 6" into lmp-dev 2014-09-16 18:16:21 +00:00
Deepanshu Gupta
0f6e5d2ab7 Build LayoutLib tests with Java 6 
Build the layoutlib tests with Java 6, so that we can test LayoutLib on
Java 6 also.

Change-Id: I8ab344af29c880dafdc195d8b061a1d08e724e26
 2014-09-16 11:11:36 -07:00
John Spurlock
c787555c36 am 6f002333: am 1c1683a3: am 1ddb7a6b: Merge "Saver: PowerManager call to set low power mode." into lmp-dev 
* commit '6f002333c30d98c4c51b2217dae4bcd05f8a36f3':
  Saver: PowerManager call to set low power mode.
 2014-09-14 20:21:36 +00:00
John Spurlock
b9e2fe1d4a am 1c1683a3: am 1ddb7a6b: Merge "Saver: PowerManager call to set low power mode." into lmp-dev 
* commit '1c1683a35a0267c03729fa36b930c3dc803aff7a':
  Saver: PowerManager call to set low power mode.
 2014-09-14 20:09:39 +00:00
John Spurlock
8d4e6cb060 Saver: PowerManager call to set low power mode. 
- Add an explicit power manager call to set the low power mode state,
  instead of trying manage everything around a single setting.
- When low-power mode is triggered by falling below the configured
  threshold, it does not update the setting.
- The "is-enabled" api returns setting || below configured trigger.
- Move the snooze management into the new api call.
- Callers (sysui + settings) updated to use the api instead of the
  setting.
- Handles the case where the level does an unpowered leap out of the
  low battery level. (Possible if powered in-between while the device
  is off)

Bug:17460535
Change-Id: Ic030504c9cad9868a7137abbe837b170da37852b
 2014-09-14 14:07:23 -04:00
Marcin Kosiba
5e747beb43 am 6fc0dcd3: am 972628dc: am 5128e88e: Merge "Don\'t use reflection when generating the onResourcesLoaded callback." into lmp-dev 
* commit '6fc0dcd393eea224e770e8c1feab749dc56c1bfd':
  Don't use reflection when generating the onResourcesLoaded callback.
 2014-09-12 19:20:50 +00:00
Dan Albert
88ba339aef Clean up makefile cruft. 
The build system already takes care of all these things.

Change-Id: Idef80b554e07cef5e5ed2adf1b5740a76f13ef6d
 2014-09-11 16:21:19 -07:00
Marcin Kosiba
0bdcb84b55 am 972628dc: am 5128e88e: Merge "Don\'t use reflection when generating the onResourcesLoaded callback." into lmp-dev 
* commit '972628dc8c63b02b75f9e976b3ab67e3913da1a8':
  Don't use reflection when generating the onResourcesLoaded callback.
 2014-09-11 18:49:07 +00:00
Marcin Kosiba
a0a9466476 Merge "Don't use reflection when generating the onResourcesLoaded callback." into lmp-dev 2014-09-11 18:34:33 +00:00
Deepanshu Gupta
0eec0f7eb3 am 2af30be8: am 92e039ee: am 8d89d1e0: Merge "LayoutLib: support font weights." into lmp-dev 
* commit '2af30be8c9b4ad160fd954cb0b362a0288578a0e':
  LayoutLib: support font weights.
 2014-09-11 17:30:09 +00:00
Marcin Kosiba
0f3a5a6559 Don't use reflection when generating the onResourcesLoaded callback. 
BUG: 17466240
Change-Id: I74608f3d8b3617281639a9d387face97e15fb616
 2014-09-11 16:02:13 +01:00
Deepanshu Gupta
1cc6e8450b am 92e039ee: am 8d89d1e0: Merge "LayoutLib: support font weights." into lmp-dev 
* commit '92e039ee821aca56f80237c5f58a1f1756b0b3a7':
  LayoutLib: support font weights.
 2014-09-11 05:15:12 +00:00
Deepanshu Gupta
820ce63cea Merge "LayoutLib: support font weights." into lmp-dev 2014-09-11 04:54:26 +00:00
Deepanshu Gupta
145bc2d067 LayoutLib: support font weights. 
Also fixes a shader delegate method.

Change-Id: I86be80ab55d04760084d5bf39235f2ee4de7be23
 2014-09-10 17:01:16 -07:00
Dianne Hackborn
673d87e8c7 am 366ef556: am 803a6f39: am 829b79f6: Merge "Fix build." into lmp-dev 
* commit '366ef5564592e4bc7937423c132d6d55d3bb298d':
  Fix build.
 2014-09-10 01:58:05 +00:00
Adam Lesinski
7035a91176 am f2d31392: am 716c7279: am 799dc748: Merge "AAPT: Don\'t crash on illegal symbol name" into lmp-dev 
* commit 'f2d31392a49c4b2ff96c5861ea0393742c94733d':
  AAPT: Don't crash on illegal symbol name
 2014-09-10 01:09:46 +00:00
Dianne Hackborn
8611dde57b am 803a6f39: am 829b79f6: Merge "Fix build." into lmp-dev 
* commit '803a6f399a2e0bfac8beb5d7ac2425dd3d9bdc46':
  Fix build.
 2014-09-10 01:04:22 +00:00
Adam Lesinski
017d1bdca7 am 716c7279: am 799dc748: Merge "AAPT: Don\'t crash on illegal symbol name" into lmp-dev 
* commit '716c7279854318eeabad39b7bb187aa69ad41c97':
  AAPT: Don't crash on illegal symbol name
 2014-09-10 00:51:15 +00:00
Dianne Hackborn
d5adbec527 Merge "Fix build." into lmp-dev 2014-09-10 00:40:55 +00:00
Dianne Hackborn
f5cc3644f6 Fix build. 
Change-Id: I92eabc35168acfe58641917179be0d90a14f2f11
 2014-09-09 17:38:34 -07:00
Adam Lesinski
e7ad74f070 Merge "AAPT: Don't crash on illegal symbol name" into lmp-dev 2014-09-09 23:15:08 +00:00
Adam Lesinski
3fb8c9b50e AAPT: Don't crash on illegal symbol name 
We never checked the return value when adding a nested
symbol, which would be NULL if the symbol name was invalid.

External bug: https://code.google.com/p/android/issues/detail?id=75876

Change-Id: I5211f4d4b87897d52f2b6e5907113d31930bb92d
 2014-09-09 16:05:10 -07:00
Dan Albert
729b49e12f am f8631178: resolved conflicts for merge of 1d99636f to lmp-dev-plus-aosp 
* commit 'f8631178ea8d1dab768873b82d6ace96d01f23a7':
  Don't check for null references.
 2014-09-09 16:59:42 +00:00
Dan Albert
6800165351 resolved conflicts for merge of 1d99636f to lmp-dev-plus-aosp 
Change-Id: Ic5f808de7d9722056112c6a73c718892e00bc9df
 2014-09-09 09:51:01 -07:00
Dan Albert
1d99636fcc am 8085477f: Merge "Don\'t check for null references." 
* commit '8085477fb98eab36bbc8c3e9add76f398235b469':
  Don't check for null references.
 2014-09-09 16:35:02 +00:00
Dan Albert
8085477fb9 Merge "Don't check for null references." 2014-09-09 16:25:41 +00:00
Dan Albert
181f731f9d am 167efbdf: Merge "resolved conflicts for merge of 6c585756 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp 
* commit '167efbdfcf22143c7383091ba46d59bea9921e0d':
  Use char16_t for char things.
 2014-09-09 15:02:57 +00:00
Deepanshu Gupta
c4c0a76601 am 04c6a0c9: am 7e7fbbba: am c52a1286: Merge "Build layoutlib create tests as part of sdk build." into lmp-dev 
* commit '04c6a0c95e0a1f491283034f3dbbf5c377066cb1':
  Build layoutlib create tests as part of sdk build.
 2014-09-09 05:29:26 +00:00
Baligh Uddin
ccf31a859a am 3f6f2fc0: Merge branch \'lmp-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev-plus-aosp 
* commit '3f6f2fc062998115098b78a0f3c4bb71d0440f4c':
  Don't pollute the namespace for two uses.
 2014-09-09 05:29:22 +00:00
Dan Albert
bb4ed4947c Merge "resolved conflicts for merge of 6c585756 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp 2014-09-09 05:29:21 +00:00
Dan Albert
20ec4fa229 resolved conflicts for merge of 6c585756 to lmp-dev-plus-aosp 
Change-Id: I5a25f2bac44ac5efcd7462af91005e09680a1d96
 2014-09-08 22:25:54 -07:00
Deepanshu Gupta
3f82a64d44 am 7e7fbbba: am c52a1286: Merge "Build layoutlib create tests as part of sdk build." into lmp-dev 
* commit '7e7fbbbac2d9b1bcda44cc4f9d81879772c354ed':
  Build layoutlib create tests as part of sdk build.
 2014-09-09 05:21:10 +00:00
Dan Albert
ddb605d4b2 am de86cf13: am 5a6934c0: Merge "Don\'t pollute the namespace for two uses." 
* commit 'de86cf1362ef0461b589fa85bdd5c58921010c6a':
  Don't pollute the namespace for two uses.
 2014-09-09 05:19:06 +00:00