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

136024 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Quddus Chong
4706479326 am f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs 
* commit 'f4b6449515f212642e90e435b2a3a55766a41f9e':
  docs: Updated Javadoc for GMS Kenafa release.
 2014-05-19 20:55:31 +00:00
quddusc
728dbf8cc8 Merge "docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4)." into klp-docs 2014-05-19 20:52:05 +00:00
Quddus Chong
f4b6449515 Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs 2014-05-19 20:51:39 +00:00
Mark Renouf
16e782374b am 5a932046: am 6a7843c9: Merge "Override windowContentOverlay and windowBackground for Theme.Micro.*" into klp-modular-dev 
* commit '5a93204678f5032e3464cc36e38a805aabdeec95':
  Override windowContentOverlay and windowBackground for Theme.Micro.*
 2014-05-19 20:44:31 +00:00
Mark Renouf
5a93204678 am 6a7843c9: Merge "Override windowContentOverlay and windowBackground for Theme.Micro.*" into klp-modular-dev 
* commit '6a7843c972122bd90819fe991cb463088f19be0a':
  Override windowContentOverlay and windowBackground for Theme.Micro.*
 2014-05-19 20:40:51 +00:00
Mark Renouf
6a7843c972 Merge "Override windowContentOverlay and windowBackground for Theme.Micro.*" into klp-modular-dev 2014-05-19 20:36:40 +00:00
ztenghui
e3c45e7a6b Remove the versionCode 
Change-Id: I2a77fefd7b14fd3bef0b0c7a142fe88e69883c75
 2014-05-19 13:22:10 -07:00
John Reck
8461b70b6c Merge "Workaround double-translate bug" 2014-05-19 20:21:00 +00:00
John Reck
86faf9ec3e Workaround double-translate bug 
Bug: 15065005

Change-Id: Ie0f77c6ea13eebf3508df7513b79efaa65d31de0
 2014-05-19 13:19:07 -07:00
Selim Cinek
aa22315879 Merge "Fixed overScroll bugs in new notification shade." 2014-05-19 19:57:09 +00:00
Selim Cinek
4195dd0ec6 Fixed overScroll bugs in new notification shade. 
In certain situations the overscroll did not work, this is now fixed.
Also sometimes the overscroll could jump when flinging and we are
already overscrolled.

Change-Id: I20741f5c88028bf7b63c3db86266f8a68341fa62
 2014-05-19 21:56:19 +02:00
Chris Craik
50b843883d am 3c769ec0: am 00fabcbe: am b1708e9b: Merge "Use alpha channel instead of red in drawCachedGlyphBitmap" 
* commit '3c769ec02b8b82bec4dec2169bf76af58be94a9a':
  Use alpha channel instead of red in drawCachedGlyphBitmap
 2014-05-19 19:35:59 +00:00
Chris Craik
3c769ec02b am 00fabcbe: am b1708e9b: Merge "Use alpha channel instead of red in drawCachedGlyphBitmap" 
* commit '00fabcbeb035fb513293ea01d245002f40b3234f':
  Use alpha channel instead of red in drawCachedGlyphBitmap
 2014-05-19 19:32:38 +00:00
Adrian Roos
45d50a1363 Merge "Speed up brightness transition if auto brightness adjustment is changed" 2014-05-19 19:30:15 +00:00
RoboErik
b19c192654 Merge "Rename session classes to have media prefix, hide routes" 2014-05-19 19:29:06 +00:00
RoboErik
b4f4f69e4c Merge "Move media key processing to sessions" 2014-05-19 19:28:54 +00:00
Chris Craik
00fabcbeb0 am b1708e9b: Merge "Use alpha channel instead of red in drawCachedGlyphBitmap" 
* commit 'b1708e9b764268a06d91219a5c39ee9efd32ab00':
  Use alpha channel instead of red in drawCachedGlyphBitmap
 2014-05-19 19:27:52 +00:00
Chris Craik
b1708e9b76 Merge "Use alpha channel instead of red in drawCachedGlyphBitmap" 2014-05-19 19:23:07 +00:00
Jim Miller
d08c2aceb2 Update FingerprintManager API after discussions. 
Change-Id: I4d0b5ffc4d572f50961354ac37844c3cca7e5217
 2014-05-19 19:18:50 +00:00
Mark Renouf
facdea7f69 Override windowContentOverlay and windowBackground for Theme.Micro.* 
Change-Id: Iab40fb70398ad2ce87b613aa9278cb87f7a35d84
 2014-05-19 15:10:05 -04:00
Jim Miller
526ed2d7fc Fix Keyguard PIN error message for N < 4. 
This fixes a bug where no error message was shown
when the user enters less than 4 digits for a PIN.

Fixes bug 14658301

Change-Id: Ia36ad205d197f0eb5f5095d71bc239ec7ded85f2
 2014-05-19 11:31:08 -07:00
Michael Wright
d069cd5164 am dc0c52f4: am 7099995b: am a84d24c3: Merge "Extend support for nordic languages with Sami" 
* commit 'dc0c52f4f592f6b9731939f0031e977a70515d4a':
  Extend support for nordic languages with Sami
 2014-05-19 18:28:40 +00:00
Michael Wright
dc0c52f4f5 am 7099995b: am a84d24c3: Merge "Extend support for nordic languages with Sami" 
* commit '7099995be5bfadcb03973d4ae952fd345bae264b':
  Extend support for nordic languages with Sami
 2014-05-19 18:23:50 +00:00
Dirk Dougherty
0208462f7c am f0029f64: am 94fb0454: am 4d37d7ef: am c385b1e4: Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs 
* commit 'f0029f644aa9d52e6fc1ebca8bea86cd67742c0a':
  Remove neg margin in wear css to resolve layout issue.
 2014-05-19 18:23:44 +00:00
Scott Rowe
5d520df856 am 7a940a49: am 3d55247a: am a0144782: am 6d05170a: docs: b/14510382 ISO language code, add link 
* commit '7a940a49745f51425e60bfde38b8c0dab454ef8b':
  docs: b/14510382 ISO language code, add link
 2014-05-19 18:23:40 +00:00
Michael Wright
7099995be5 am a84d24c3: Merge "Extend support for nordic languages with Sami" 
* commit 'a84d24c37a3e27cdd4f50807e9dc5fb6f14ea009':
  Extend support for nordic languages with Sami
 2014-05-19 18:19:20 +00:00
Michael Wright
a84d24c37a Merge "Extend support for nordic languages with Sami" 2014-05-19 18:15:41 +00:00
Dirk Dougherty
f0029f644a am 94fb0454: am 4d37d7ef: am c385b1e4: Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs 
* commit '94fb04547ca35c09409cfc6e3b930805acddc7d6':
  Remove neg margin in wear css to resolve layout issue.
 2014-05-19 18:12:40 +00:00
Scott Rowe
7a940a4974 am 3d55247a: am a0144782: am 6d05170a: docs: b/14510382 ISO language code, add link 
* commit '3d55247a3f8e488b13f7f467cbc70ac4864d2dd2':
  docs: b/14510382 ISO language code, add link
 2014-05-19 18:12:37 +00:00
David Christie
3662ad4aec Merge "Fix bug where location provider fails on secondary users. Bug: 12592045" 2014-05-19 18:09:50 +00:00
Dirk Dougherty
94fb04547c am 4d37d7ef: am c385b1e4: Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs 
* commit '4d37d7ef141beaf8f7d1b2bf1c19e3fb8c84203f':
  Remove neg margin in wear css to resolve layout issue.
 2014-05-19 18:08:53 +00:00
Scott Rowe
3d55247a3f am a0144782: am 6d05170a: docs: b/14510382 ISO language code, add link 
* commit 'a0144782b16b5b6a767a0c48fa5c3a79a5c74889':
  docs: b/14510382 ISO language code, add link
 2014-05-19 18:08:45 +00:00
Robert Ly
3257984e55 am dbf711ea: am e5c9d855: Merge "docs: updates for changes to notification APIs" into klp-modular-dev 
* commit 'dbf711ea88b01693db1974a3a6a346cff3da6daa':
  docs: updates for changes to notification APIs
 2014-05-19 18:03:19 +00:00
Robert Greenwalt
5d2e896457 Fix the build 
Change-Id: I18f78f6055f6f9c14571058d6834c8dec01aa732
 2014-05-19 11:00:12 -07:00
Robert Ly
dbf711ea88 am e5c9d855: Merge "docs: updates for changes to notification APIs" into klp-modular-dev 
* commit 'e5c9d8551b22c1708723b89e8e8d6f830168f292':
  docs: updates for changes to notification APIs
 2014-05-19 17:59:48 +00:00
Robert Ly
e5c9d8551b Merge "docs: updates for changes to notification APIs" into klp-modular-dev 2014-05-19 17:56:18 +00:00
Robert Greenwalt
537023f172 Merge "Add javadoc and unhide new API" 2014-05-19 17:35:13 +00:00
Robert Greenwalt
d19c41c0bb Add javadoc and unhide new API 
Change-Id: I12e475bbf4000c7acec4ca27b1d3bf8f870cc2cf
 2014-05-19 10:34:36 -07:00
Dirk Dougherty
4d37d7ef14 am c385b1e4: Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs 
* commit 'c385b1e4be928133930d9264a92c98f4747adedb':
  Remove neg margin in wear css to resolve layout issue.
 2014-05-19 17:27:41 +00:00
Craig Mautner
73f843de4b Change method name per API council request 
Activity.finishWithTransition() => finishAfterTransition().

Fixes bug 14997477.

Change-Id: I517f70b3bd6df9962f4bb2acf282e4b9fa91acde
 2014-05-19 10:24:36 -07:00
Dirk Dougherty
c385b1e4be Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs 2014-05-19 17:23:33 +00:00
Antonio Calabrese
db22de8c43 Cleaned up CanvasCompare tests. 
Change-Id: I93b2f73283e3ab2b8679bf36f29c7bd6cb74c6bf
 2014-05-19 10:08:34 -07:00
Scott Rowe
a0144782b1 am 6d05170a: docs: b/14510382 ISO language code, add link 
* commit '6d05170a55ac6a9401e6089ba49d675857c3c25d':
  docs: b/14510382 ISO language code, add link
 2014-05-19 17:04:53 +00:00
Ben Cheng
c12aab2afe Merge "Use default visibility for Snapshot::getLocalClip (attempt #2)." 2014-05-19 16:55:12 +00:00
Robert Greenwalt
34c83190bf Merge "Add docs for Linkproperties and unhide it." 2014-05-19 16:45:12 +00:00
Robert Greenwalt
4f05d55296 Add docs for Linkproperties and unhide it. 
Preperation for ConnectivityManager API reveal.

Change-Id: Id2addf424213e796c6077def0b7f30cac9a0f75f
 2014-05-19 09:43:36 -07:00
John Spurlock
53bccb7d8b Merge "Show current build number in the new bugreport tile." 2014-05-19 16:39:46 +00:00
John Spurlock
9ba2ffd86d Show current build number in the new bugreport tile. 
Change-Id: I20c3894e115a4b3ff0a82016eb86d42f48fa6d54
 2014-05-19 12:37:38 -04:00
Santos Cordon
dce9443f21 Merge "Fix build break." 2014-05-19 16:26:34 +00:00
Winson Chung
958e559b98 Merge "Initial changes to enable keyboard support with alternate Recents. (Bug 14067913)" 2014-05-19 16:25:40 +00:00