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

3080 Commits

Author SHA1 Message Date
Deepanshu Gupta
c4affce9df am 1f3c7f3f: am f18ceefc: am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev 
* commit '1f3c7f3f500bdbfd790c20872961d84ef617f066':
  Update golden image for tests.
  Update to using LayoutlibCallback.
  Remove implementation of deprecated method.
  Add @empty support.
 2015-04-16 17:41:54 +00:00
Deepanshu Gupta
1f3c7f3f50 am f18ceefc: am cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev 
* commit 'f18ceefcf0d3cc91e74737e0a93f16775e3bf18b':
  Update golden image for tests.
  Update to using LayoutlibCallback.
  Remove implementation of deprecated method.
  Add @empty support.
 2015-04-16 17:31:34 +00:00
Deepanshu Gupta
54862febaf Update golden image for tests. 
Change-Id: If07edcbfb7016a6b80f4bd00cffab494f74bfc03
 2015-04-15 18:20:57 -07:00
Deepanshu Gupta
37dbb8b7f3 Update to using LayoutlibCallback. 
Change-Id: Ia89d418b0d40ca8efef8968a4a2a635616b945ac
 2015-04-15 18:20:56 -07:00
Deepanshu Gupta
49ce36e175 Remove implementation of deprecated method. 
BridgeResources.getDrawable(int) is not needed anymore, since the super
method is deprecated and it calls the alternative
getDrawable(int, Theme), which we override.

Change-Id: I00c0bfaef6c4167a787bb74990b91cebb951c847
 2015-04-15 18:20:55 -07:00
Deepanshu Gupta
9ca9774726 Add @empty support. 
Bug: http://b.android.com/162428
Change-Id: Id7a981de2fce21213e12cdabcce4104f146fd4d3
 2015-04-15 18:20:47 -07:00
Colin Cross
4cead39a17 am 1be312df: Merge "Re-enable -Wall and -Werror that were lost in a merge" 
* commit '1be312dfb02e86731da6ac54a39956db791f4978':
  Re-enable -Wall and -Werror that were lost in a merge
 2015-04-09 01:13:50 +00:00
Colin Cross
1be312dfb0 Merge "Re-enable -Wall and -Werror that were lost in a merge" 2015-04-09 00:49:56 +00:00
Colin Cross
01f185633c Re-enable -Wall and -Werror that were lost in a merge 
-Wall and -Werror were lost during a merge when they were added to
aaptCFLAGS instead of aaptCFlags.  Fix the typo, and the warnings
that crept in while it was disabled.

Change-Id: Ib944b8d6149278e4f3861c1acac277bcd95cc7c2
 2015-04-08 17:48:23 -07:00
Elliott Hughes
dbb5f5d6c4 am efcbaec1: Merge "Only Windows doesn\'t have %zd." 
* commit 'efcbaec14135c42f81e2a8f645584cf7cf542a02':
  Only Windows doesn't have %zd.
 2015-04-03 20:40:52 +00:00
Elliott Hughes
b12f2410c7 Only Windows doesn't have %zd. 
Change-Id: I0e4b0fdc61641c5ecb724fd096bd2315dcf8ed4a
 2015-04-03 12:56:45 -07:00
Deepanshu Gupta
80d5c4250f am fb37c97c: am 61bb0b4f: am 4e6ae02a: am 17bb697b: am ec8df9af: Fix tests for Java 6. 
* commit 'fb37c97c251cc9bef81dbf5b9acc58328656a980':
  Fix tests for Java 6.
 2015-03-27 03:05:16 +00:00
Deepanshu Gupta
fb37c97c25 am 61bb0b4f: am 4e6ae02a: am 17bb697b: am ec8df9af: Fix tests for Java 6. 
* commit '61bb0b4f58f794ff468f2cfaf958cb5cc0b09026':
  Fix tests for Java 6.
 2015-03-27 02:58:47 +00:00
Deepanshu Gupta
4e6ae02a29 am 17bb697b: am ec8df9af: Fix tests for Java 6. 
* commit '17bb697b3bce1b23137553829dd62e0e7c16b472':
  Fix tests for Java 6.
 2015-03-27 01:09:53 +00:00
Deepanshu Gupta
17bb697b3b am ec8df9af: Fix tests for Java 6. 
* commit 'ec8df9af2f35eb5be4df01d66b1add4a4e7546c7':
  Fix tests for Java 6.
 2015-03-27 01:02:58 +00:00
Deepanshu Gupta
ec8df9af2f Fix tests for Java 6. 
- Change the guava version used to match the one included in the SDK.
   The test server uses the same. However, the command line build still
   uses the guava present at platform/external/guava, which is compiled
   with Java 7. Thus, running the tests from inside the IDE can be done
   via Java 6.
 - Rebuilt the test app classes with Java 6 compatibility.
 - Change similarity threshold to prevent differences due to some locale
   settings different java versions.

Change-Id: Ic71d43256a8cf6f9df296e63550667a202c7105f
 2015-03-26 12:29:36 -07:00
Bryce Lee
0ad58deca1 am 5f11a1af: add correct exception throw declaration to isScreenBrightnessBoosted. 
* commit '5f11a1af572730567d9e35d6792a720585a268c6':
  add correct exception throw declaration to isScreenBrightnessBoosted.
 2015-03-25 20:33:53 +00:00
Bryce Lee
5f11a1af57 add correct exception throw declaration to isScreenBrightnessBoosted. 
Change-Id: I9b861002d7719ad43643d68f6795df6938bd0fc3
 2015-03-25 11:51:39 -07:00
Bryce Lee
a6045ec8ed am 40a4f4a6: Implement isScreenBrightnessBoosted in BridgePowerManager. 
* commit '40a4f4a61fbb2172901eda763bf928ae9b1b5300':
  Implement isScreenBrightnessBoosted in BridgePowerManager.
 2015-03-25 18:51:05 +00:00
Bryce Lee
40a4f4a61f Implement isScreenBrightnessBoosted in BridgePowerManager. 
Change-Id: I7da132c7522e5c352e14123f059b900008d94c95
 2015-03-25 11:16:23 -07:00
Deepanshu Gupta
693236b367 am c263a07a: am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev 
* commit 'c263a07a55a9806147304a1420ceec2d27a6b49d':
  Update JRE for runConfigurations.
 2015-03-25 00:15:44 +00:00
Deepanshu Gupta
ce2b74f729 am e51f5cdc: am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev 
* commit 'e51f5cdcf34fe127792a177a3953dad03ef23647':
  Fix RoundRect radius.
 2015-03-25 00:15:33 +00:00
Deepanshu Gupta
5c03cd8aad am 96a67430: am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev 
* commit '96a67430c0088168f21b230c64c348a53e672538':
  Use right colors for status bar and nav bar.
 2015-03-25 00:15:28 +00:00
Deepanshu Gupta
25557e0a96 am 5f0252de: am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev 
* commit '5f0252dee43a1cd0f1591b3c9bea2d47ad1f3df0':
  Better shadows.
 2015-03-25 00:15:22 +00:00
Deepanshu Gupta
01f9ad1c67 am 2ceb310d: am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev 
* commit '2ceb310d09a865c56145ba8b5d643a11a7ad2ce5':
  Fix layoutlib tests.
 2015-03-25 00:15:14 +00:00
Deepanshu Gupta
c263a07a55 am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev 
* commit '862f5900e8abce1cc20979a4dca76e1f0b982880':
  Update JRE for runConfigurations.
 2015-03-25 00:09:01 +00:00
Deepanshu Gupta
e51f5cdcf3 am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev 
* commit 'e97079d97a5c914d06c24cb9deda1da9bea88aeb':
  Fix RoundRect radius.
 2015-03-25 00:08:47 +00:00
Deepanshu Gupta
96a67430c0 am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev 
* commit '2b98abde26aa2033562b48d635d6f2ba11c48908':
  Use right colors for status bar and nav bar.
 2015-03-25 00:08:41 +00:00
Deepanshu Gupta
5f0252dee4 am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev 
* commit '6fa9d5546fa27665de3f64564897a77735b2a1b0':
  Better shadows.
 2015-03-25 00:08:35 +00:00
Deepanshu Gupta
2ceb310d09 am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev 
* commit '5bc625d83d60fbb27ab2297051971be91fb3e415':
  Fix layoutlib tests.
 2015-03-25 00:08:28 +00:00
Deepanshu Gupta
862f5900e8 am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev 
* commit '44b5a1c8471ef5e1cd3dcfffec5a9e439f228766':
  Update JRE for runConfigurations.
 2015-03-25 00:02:18 +00:00
Deepanshu Gupta
e97079d97a am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev 
* commit 'a16bb347e120ba17e87f33ff0364380211d01baf':
  Fix RoundRect radius.
 2015-03-25 00:01:58 +00:00
Deepanshu Gupta
2b98abde26 am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev 
* commit '8f9ebc65939ed3ac2e7fdc135e8513fd8d65daaf':
  Use right colors for status bar and nav bar.
 2015-03-25 00:01:53 +00:00
Deepanshu Gupta
6fa9d5546f am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev 
* commit '0b76cf6ff56c59a04783714d40163576e3081cf1':
  Better shadows.
 2015-03-25 00:01:49 +00:00
Deepanshu Gupta
5bc625d83d am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev 
* commit 'a62a18e341180ccf6f5379a7d753584f6cee2e7c':
  Fix layoutlib tests.
 2015-03-25 00:01:43 +00:00
Deepanshu Gupta
44b5a1c847 am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev 
* commit 'e541f35055709ec43407649b8517639ff00e42d6':
  Update JRE for runConfigurations.
 2015-03-24 23:55:18 +00:00
Deepanshu Gupta
cbb4ec7867 am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev 
* commit '6f5fac817abee63d9211e8e43646196950c43707':
  Fix project settings. [DO NOT MERGE]
 2015-03-24 23:55:14 +00:00
Deepanshu Gupta
a16bb347e1 am 44fea603: Merge "Fix RoundRect radius." into lmp-dev 
* commit '44fea60376e4e851b07eb365fd581c5b9404611f':
  Fix RoundRect radius.
 2015-03-24 23:55:10 +00:00
Deepanshu Gupta
8f9ebc6593 am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev 
* commit '3bd5cbb1f3d837d7799fb4b33b4dda99adbeeeb4':
  Use right colors for status bar and nav bar.
 2015-03-24 23:55:06 +00:00
Deepanshu Gupta
0b76cf6ff5 am 34751c79: Merge "Better shadows." into lmp-dev 
* commit '34751c79d6696054b19b5fd0e2946c1dbe5bd9bd':
  Better shadows.
 2015-03-24 23:55:02 +00:00
Deepanshu Gupta
a62a18e341 am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev 
* commit '311a0f54ac95a1649474498748fff8327b0c917d':
  Fix layoutlib tests.
 2015-03-24 23:54:58 +00:00
Deepanshu Gupta
e541f35055 Merge "Update JRE for runConfigurations." into lmp-dev 2015-03-24 23:52:29 +00:00
Deepanshu Gupta
6f5fac817a Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev 2015-03-24 23:52:18 +00:00
Deepanshu Gupta
44fea60376 Merge "Fix RoundRect radius." into lmp-dev 2015-03-24 23:51:50 +00:00
Deepanshu Gupta
3bd5cbb1f3 Merge "Use right colors for status bar and nav bar." into lmp-dev 2015-03-24 23:51:30 +00:00
Deepanshu Gupta
34751c79d6 Merge "Better shadows." into lmp-dev 2015-03-24 23:51:11 +00:00
Deepanshu Gupta
00c2adf5db Better shadows. 
Better shadows for rectangles and rounded rectangles (includes circles).

The shadow painting code is mostly from CardView library, but modified
heavily since CardView needs to draw the shadow inside view bounds.

Change-Id: I88c9f19b1c16839b8d6db6df2bebff126fa5a9a3
 2015-03-24 14:06:49 -07:00
Deepanshu Gupta
7c834296ac Fix RoundRect radius. 
Android APIs use radius for measuring the corner's curvature, but Java2D
APIs use diameter. Add the missing conversion.

Change-Id: I630fc8712e8301324c641885c0c4adf644d13b7e
 2015-03-24 11:43:39 -07:00
Deepanshu Gupta
58ca246c83 Use right colors for status bar and nav bar. 
Bug: http://b.android.com/81862
Change-Id: Ia10297e83e54c01a50de6cbcac2b7fef48e8d238
 2015-03-22 11:03:44 -07:00
Elliott Hughes
0634fba591 am 89da4ca6: Merge "Remove unused printapk.cpp." 
* commit '89da4ca67d5bf6c35ea76f074cb2caa3d542740e':
  Remove unused printapk.cpp.
 2015-03-19 18:19:54 +00:00