Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
163,968 Commits 3 Branches 0 Tags
65215edd7acada70c2bcb060daec6ff718ae92ba
Commit Graph

163968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
65215edd7a am f0d324e5: am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev 
* commit 'f0d324e531e395674f71b3944623bd17fe74b372':
  Fix cyclic dependency in BlendComposite and BlendingMode.
 2015-03-12 00:59:39 +00:00
Deepanshu Gupta
f0d324e531 am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev 
* commit '71ba12308e338595d8068ff788bb5c8abfcfe515':
  Fix cyclic dependency in BlendComposite and BlendingMode.
 2015-03-12 00:52:53 +00:00
Deepanshu Gupta
71ba12308e am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev 
* commit 'efc09c644fa4e8354d54485aab6c0b18868284eb':
  Fix cyclic dependency in BlendComposite and BlendingMode.
 2015-03-12 00:45:40 +00:00
Deepanshu Gupta
c7fc094d31 am d44af610: am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev 
* commit 'd44af6108b18f3de05ed3f61d056d9c5b36ff8be':
  Fix rare NPE in BridgeContext.
 2015-03-12 00:45:35 +00:00
Deepanshu Gupta
a695f87db7 am fa3c6650: am 71518174: Merge "Fix project settings." into lmp-mr1-dev 
* commit 'fa3c665019ace11140b3c5677d02c9711fc4d86d':
  Fix project settings.
 2015-03-12 00:45:31 +00:00
Deepanshu Gupta
05cba2f8ac am 338a5a88: am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev 
* commit '338a5a88fe8ecf8a724fcfaa2888a7c0fe53cb34':
  Add RecyclerView support.
 2015-03-12 00:45:27 +00:00
Deepanshu Gupta
d44af6108b am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev 
* commit 'b3cfb334893a0b302cd6a0a998f27ca2e8ba7f9d':
  Fix rare NPE in BridgeContext.
 2015-03-12 00:39:25 +00:00
Deepanshu Gupta
fa3c665019 am 71518174: Merge "Fix project settings." into lmp-mr1-dev 
* commit '71518174fcd57c85d1e38f1794c44b763baff286':
  Fix project settings.
 2015-03-12 00:39:21 +00:00
Deepanshu Gupta
338a5a88fe am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev 
* commit 'b171be1a54a6a0fe416916ff91e41362b8bb4873':
  Add RecyclerView support.
 2015-03-12 00:39:16 +00:00
Deepanshu Gupta
efc09c644f am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev 
* commit '78660423900fa255cc83b85320e98d5184be393b':
  Fix cyclic dependency in BlendComposite and BlendingMode.
 2015-03-12 00:38:45 +00:00
Deepanshu Gupta
7866042390 Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev 2015-03-12 00:32:55 +00:00
Deepanshu Gupta
b3cfb33489 Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev 2015-03-12 00:32:32 +00:00
Deepanshu Gupta
71518174fc Merge "Fix project settings." into lmp-mr1-dev 2015-03-12 00:31:54 +00:00
Deepanshu Gupta
b171be1a54 Merge "Add RecyclerView support." into lmp-mr1-dev 2015-03-12 00:31:50 +00:00
Deepanshu Gupta
5521f65ecb Fix cyclic dependency in BlendComposite and BlendingMode. 
Introduced in commit 1a10ca7e52

Bug: http://b.android.com/159708
Change-Id: I6add5be3a933bbe4f8d888906e2aa1b2e35d045a
 2015-03-11 17:04:21 -07:00
Quddus Chong
0d258a93ad am 737d3cc0: am 77eb85e1: am c706a980: am a236a49e: am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs 
* commit '737d3cc07996aec1a2f264d242e016a4ccbc4857':
  docs: Added overview page and Javadocs for the Android Testing Support Library.
 2015-03-11 23:47:54 +00:00
Quddus Chong
737d3cc079 am 77eb85e1: am c706a980: am a236a49e: am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs 
* commit '77eb85e14fb37a67af2eaf120e1c866dee64ad2c':
  docs: Added overview page and Javadocs for the Android Testing Support Library.
 2015-03-11 23:42:06 +00:00
Quddus Chong
77eb85e14f am c706a980: am a236a49e: am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs 
* commit 'c706a980e426ea0e0b6aaee5530516b1a16c3755':
  docs: Added overview page and Javadocs for the Android Testing Support Library.
 2015-03-11 23:30:58 +00:00
Quddus Chong
c706a980e4 am a236a49e: am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs 
* commit 'a236a49edec87cd24fe683550c0ab83be3dcbf07':
  docs: Added overview page and Javadocs for the Android Testing Support Library.
 2015-03-11 23:24:37 +00:00
Quddus Chong
a236a49ede am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs 
* commit '47426f1c190b17548eabb50fad3945844f1a7363':
  docs: Added overview page and Javadocs for the Android Testing Support Library.
 2015-03-11 23:16:59 +00:00
Quddus Chong
47426f1c19 Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs 2015-03-11 23:11:03 +00:00
Quddus Chong
489218c3ed docs: Added overview page and Javadocs for the Android Testing Support Library. 
Change-Id: I645d3a302ce0d1d4cd389c6a58709a11a0426aed
 2015-03-11 16:08:24 -07:00
Deepanshu Gupta
85d72c4535 Fix rare NPE in BridgeContext. 
Also fixed some deprecation warnings.

Change-Id: I2fa00996dab0b008b9ca07a5382a059e5780529d
 2015-03-11 15:56:30 -07:00
Luan Nguyen
872a731e59 am a0f20621: am dd7d025b: am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs 
* commit 'a0f20621f1943dfc545e1c2cee3ed6b9c321f61b':
  Revert "docs: Update auto landing and design page image assets"
 2015-03-11 19:19:31 +00:00
Luan Nguyen
a0f20621f1 am dd7d025b: am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs 
* commit 'dd7d025b97aa09723f1695f23b85d1d926cb7ea1':
  Revert "docs: Update auto landing and design page image assets"
 2015-03-11 19:12:53 +00:00
Luan Nguyen
dd7d025b97 am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs 
* commit 'ca0db1a0ec0fc0456ec4180d7b0bbac7e43dffec':
  Revert "docs: Update auto landing and design page image assets"
 2015-03-11 19:07:52 +00:00
Luan Nguyen
5228d0832a am 0c3282b5: am 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs 
* commit '0c3282b5d2f491bfb0ca6b5cda62864d0b42bba7':
  docs: Update auto landing and design page image assets
 2015-03-11 17:42:58 +00:00
Rich Slogar
40055c220f am 11558e5d: am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs 
* commit '11558e5d2259a48604f494c540df72de34977ce5':
  docs: eclipse revisions update
 2015-03-11 17:42:54 +00:00
Andrew Solovay
e5fd6c76a4 am 3d950de4: am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto" 
* commit '3d950de4d4028e0c7763932c00c372d41c832e87':
  docs: Revisions to "Providing Messaging for Auto"
 2015-03-11 17:42:50 +00:00
Luan Nguyen
0c3282b5d2 am 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs 
* commit '50a9b83554decb4913fc8eac9862edf902149265':
  docs: Update auto landing and design page image assets
 2015-03-11 17:32:01 +00:00
Rich Slogar
11558e5d22 am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs 
* commit '8ab872dba1eff1477cb12da63d1f882260a271ae':
  docs: eclipse revisions update
 2015-03-11 17:31:57 +00:00
Andrew Solovay
3d950de4d4 am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto" 
* commit 'a493c48989f3c80dd061b86a6216a622b20dfc7f':
  docs: Revisions to "Providing Messaging for Auto"
 2015-03-11 17:31:53 +00:00
Luan Nguyen
50a9b83554 am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs 
* commit '42ee70aac023da26a6dc4dee5856871372e792e8':
  docs: Update auto landing and design page image assets
 2015-03-11 17:18:43 +00:00
Rich Slogar
8ab872dba1 am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs 
* commit 'dcc5a34b14ae09598d9c019c0d4706c5e2d00be2':
  docs: eclipse revisions update
 2015-03-11 17:18:39 +00:00
Andrew Solovay
a493c48989 am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto" 
* commit '5f8e08ed2c97bb92232e500e7c32b31b8bbd5dcd':
  docs: Revisions to "Providing Messaging for Auto"
 2015-03-11 17:18:23 +00:00
Luan Nguyen
ca0db1a0ec am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs 
* commit 'eeb79d104fc09ea727108bde7a7ef06f3300241a':
  Revert "docs: Update auto landing and design page image assets"
 2015-03-11 16:42:52 +00:00
Luan Nguyen
eeb79d104f am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs 
* commit '9a7238d8f5bd4ec90c2b887808ea26e5f55d0154':
  Revert "docs: Update auto landing and design page image assets"
 2015-03-11 16:35:32 +00:00
Luan Nguyen
9a7238d8f5 Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs 2015-03-11 16:25:33 +00:00
Luan Nguyen
36b8a59a6d Revert "docs: Update auto landing and design page image assets" 
This reverts commit 7859590acd.

Change-Id: Iab71d4a2ce0eb6dbbab685433a7c991015402e19
 2015-03-11 16:20:52 +00:00
Deepanshu Gupta
7b2cae5072 Fix project settings. 
1. Update layoutlib_api source path.
2. Update jdk version
3. Update nullity annotations.

Change-Id: I48db7dbd7ba5ff02fcf11672608b75e072385166
 2015-03-10 18:16:21 -07:00
Deepanshu Gupta
d345f44a87 Add RecyclerView support. 
Bug: http://b.android.com/72117
Change-Id: Iba95baff59f1b715f91da25e15acf27bc052d95e
 2015-03-10 18:16:21 -07:00
Prashant Malani
a98c21a662 Make circular mask thickness configurable 
Obtain the circular mask thickness as a dimension so that it can
be customized per-device.

Change-Id: Ied88f91424c5cf4f25dd1e78cf22f0fd7ea7b0a4
Signed-off-by: Prashant Malani <pmalani@google.com>
 2015-03-11 00:34:15 +00:00
Justin Koh
dff0fdb417 Merge "Add translatable=false to dozeComponent" into lmp-mr1-modular-dev 2015-03-10 20:37:06 +00:00
Justin Koh
ba6cff0de7 Add translatable=false to dozeComponent 
Add translatable=false to dozeComponent: this prevents it from breaking with
en_XA pseudolocalization.

Change-Id: I53a77d8590c65189633b89fed67d247115e75df9
 2015-03-10 13:12:51 -07:00
Luan Nguyen
42ee70aac0 am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs 
* commit '24b4e5729ed917dc2831a111f917d0a5fbd4e4d0':
  docs: Update auto landing and design page image assets
 2015-03-10 19:28:57 +00:00
Rich Slogar
dcc5a34b14 am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs 
* commit '08ddf132bfb2117d49ea3ca70861a227c39e8115':
  docs: eclipse revisions update
 2015-03-10 19:28:53 +00:00
Luan Nguyen
24b4e5729e am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs 
* commit '0fc17c37a514a80073631dffa381ec07caed93cf':
  docs: Update auto landing and design page image assets
 2015-03-10 19:22:37 +00:00
Rich Slogar
08ddf132bf am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs 
* commit '0c1076b270bd718cab4b89acc96f6cbbbd1e9774':
  docs: eclipse revisions update
 2015-03-10 19:22:33 +00:00
Luan Nguyen
0fc17c37a5 Merge "docs: Update auto landing and design page image assets" into lmp-docs 2015-03-10 19:18:54 +00:00
Rich Slogar
0c1076b270 Merge "docs: eclipse revisions update" into lmp-docs 2015-03-10 19:15:10 +00:00