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

123384 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Narayan Kamath
9672ee125d am deda5467: am a4fd1baa: Merge "Fail if we\'re unable to agree on an ISA for shared UIDs." 
* commit 'deda5467f44fc4a03c3435f0c6d7bda4ea298b99':
  Fail if we're unable to agree on an ISA for shared UIDs.
 2014-05-19 13:33:19 +00:00
Narayan Kamath
deda5467f4 am a4fd1baa: Merge "Fail if we\'re unable to agree on an ISA for shared UIDs." 
* commit 'a4fd1baac68dcd73957e0fca0c02089ecf9a268a':
  Fail if we're unable to agree on an ISA for shared UIDs.
 2014-05-19 13:29:57 +00:00
Narayan Kamath
a4fd1baac6 Merge "Fail if we're unable to agree on an ISA for shared UIDs." 2014-05-19 13:26:44 +00:00
Narayan Kamath
20ee78ab95 Fail if we're unable to agree on an ISA for shared UIDs. 
It's not worth the complexity of rescanning the APK and
extracting a shared library with a different ABI.

Also gets rid of an unnecessary command line argument and
checks for dex-opt failures while adjusting shared ABIs.

bug: 14453227

Change-Id: I6a0695e24cba37e93540c540507088e95b89089b
 2014-05-19 14:24:46 +01:00
Ben Murdoch
4088970dce am 3011fc1a: Merge "Fallback to NullWebView when Chromium WebView not present." into klp-modular-dev 
* commit '3011fc1aa7dbffd3faab7d41203f63d2c0b50c2c':
  Fallback to NullWebView when Chromium WebView not present.
 2014-05-19 11:30:41 +00:00
Ben Murdoch
3011fc1aa7 Merge "Fallback to NullWebView when Chromium WebView not present." into klp-modular-dev 2014-05-19 11:26:33 +00:00
Mathieu Meisser
903c1ec383 Extend support for nordic languages with Sami 
Add access (via ralt combination) of Sami characters
into Danish, Norwegian and Swedish mappings.
Update Finnish mapping by fixing wrong Sami characters,
removing wrong ralt+shift mappings and adding support
with capslock+ralt for capital Sami's.
Remove unnecessary swap of MINUS and SLASH key
mapping in kcm.

Change-Id: I872ae2ad31272e8cf55ae1db01c7e30c6a40d5bc
Signed-off-by: Olivier Gay <ogay@logitech.com>
Signed-off-by: Manuel Carthoblaz <mcarthob@logitech.com>
Signed-off-by: Mathieu Meisser <mmeisser@logitech.com>
 2014-05-17 11:53:28 +02:00
Robert Ly
6cf59a3edb docs: updates for changes to notification APIs 
Change-Id: I8a016b0693e928eb864065bea1079be824987340
 2014-05-16 21:10:52 -07:00
Joe LaPenna
3e1bbaf786 am 45734b4a: Merge "Log accept and close debug statements in BluetoothSocket." into klp-modular-dev 
* commit '45734b4ae180ea3c34f92575b3ed362bbf4f20e5':
  Log accept and close debug statements in BluetoothSocket.
 2014-05-17 01:57:44 +00:00
Joe LaPenna
45734b4ae1 Merge "Log accept and close debug statements in BluetoothSocket." into klp-modular-dev 2014-05-17 01:55:06 +00:00
Michael Wright
d55fa5d584 am 3a123fda: am 0a5236a7: Merge "Add support for Latvian (qwerty) keyboard mapping" 
* commit '3a123fda8a48519601b8782845dfb176de16d871':
  Add support for Latvian (qwerty) keyboard mapping
 2014-05-17 01:09:43 +00:00
Michael Wright
3a123fda8a am 0a5236a7: Merge "Add support for Latvian (qwerty) keyboard mapping" 
* commit '0a5236a7cd3fa5a62a97f14a512dbeb5eb34772a':
  Add support for Latvian (qwerty) keyboard mapping
 2014-05-17 01:06:51 +00:00
Michael Wright
0a5236a7cd Merge "Add support for Latvian (qwerty) keyboard mapping" 2014-05-17 01:02:55 +00:00
Scott Rowe
6d05170a55 docs: b/14510382 ISO language code, add link 
Change-Id: Id78858743b453d9e44624f491db183d9a099a1ce
 2014-05-16 22:33:12 +00:00
Griff Hazen
cfa271618f am 50c11659: Fix Notification sdk docs build. 
* commit '50c11659f0f971e1a6b0adde59247f5de370b74d':
  Fix Notification sdk docs build.
 2014-05-16 16:56:47 +00:00
Griff Hazen
50c11659f0 Fix Notification sdk docs build. 
Builder#X looked like it was considered ambiguous even though Action
was not in scope. Intellij disagreed but this fixes the issue.

Change-Id: I51fac39b2a4834e25f936c6eae223cda8c9c610e
 2014-05-16 09:46:31 -07:00
John Reck
313c5f38e8 am f18aed83: am 0661ddee: Merge "Enable display list updates with zero delta time" 
* commit 'f18aed83f63b41fc9e2fd4cecc1fdf2c08c302c0':
  Enable display list updates with zero delta time
 2014-05-16 16:00:09 +00:00
John Reck
f18aed83f6 am 0661ddee: Merge "Enable display list updates with zero delta time" 
* commit '0661ddee112477db180d65e605f34fd538fdf8bc':
  Enable display list updates with zero delta time
 2014-05-16 15:56:07 +00:00
John Reck
0661ddee11 Merge "Enable display list updates with zero delta time" 2014-05-16 15:51:39 +00:00
Griff Hazen
de35b636df am 959591e3: Add support for extendable actions to Notification. 
* commit '959591e3ba3934f5bd8ecc2c81ad2a16d226acab':
  Add support for extendable actions to Notification.
 2014-05-16 15:40:18 +00:00
Ben Murdoch
0e04bcfbdc Fallback to NullWebView when Chromium WebView not present. 
If it's not possible to load the Chromium WebView, fallback to loading
the NullWebView that will throw UnsupportedOperationException.

Bug: 13438487
Change-Id: If44b8b7a569c2f8e0e8bba7e6953288802d1c9e0
 2014-05-16 13:41:12 +01:00
Narayan Kamath
b4606676a8 am 49538def: am 79e0206e: Merge "Init the static member when first used for CursorWindow." 
* commit '49538def98520eb57d4fb634bf09b2f3104e7953':
  Init the static member when first used for CursorWindow.
 2014-05-16 12:29:59 +00:00
Narayan Kamath
49538def98 am 79e0206e: Merge "Init the static member when first used for CursorWindow." 
* commit '79e0206ef3203a1842949242e58fa8f3c25eb129':
  Init the static member when first used for CursorWindow.
 2014-05-16 12:26:34 +00:00
Narayan Kamath
79e0206ef3 Merge "Init the static member when first used for CursorWindow." 2014-05-16 12:24:33 +00:00
Narayan Kamath
0c42f3bb33 am 2c125876: am 8a196c06: Merge "Change InputMessage.motion.pointerSize to a uint32_t." 
* commit '2c125876208c6b7173ef561316843d64ae1599e2':
  Change InputMessage.motion.pointerSize to a uint32_t.
 2014-05-16 12:13:49 +00:00
Narayan Kamath
2c12587620 am 8a196c06: Merge "Change InputMessage.motion.pointerSize to a uint32_t." 
* commit '8a196c0676eebf10b2120f3305c0b9bcb99e97ce':
  Change InputMessage.motion.pointerSize to a uint32_t.
 2014-05-16 12:08:09 +00:00
Narayan Kamath
8a196c0676 Merge "Change InputMessage.motion.pointerSize to a uint32_t." 2014-05-16 12:06:09 +00:00
Narayan Kamath
844a4c81ff Change InputMessage.motion.pointerSize to a uint32_t. 
This ensures it's the same size in both 32 and 64 bit
processes and also brings it in line with struct
MotionEntry.

(cherry-picked from commit bc6001b026069714177526eb1120b0011d6f2a51)

Change-Id: Ide6bb4dc05cc92a7ae8833e615e8ebb2353255a6
 2014-05-16 12:55:48 +01:00
Griff Hazen
959591e3ba Add support for extendable actions to Notification. 
Change-Id: I2945a6994a28fc454af3f84e75c96d7619547f01
 2014-05-15 22:26:18 -07:00
Justin Koh
8b2e7c4aaa am 0ade263c: Merge "If there is only 1 simple global action, autolaunch it" into klp-modular-dev 
* commit '0ade263c28ea62e619972752ef2e6a6c994eeddf':
  If there is only 1 simple global action, autolaunch it
 2014-05-15 17:20:23 +00:00
Justin Koh
0ade263c28 Merge "If there is only 1 simple global action, autolaunch it" into klp-modular-dev 2014-05-15 17:17:14 +00:00
Baligh Uddin
3d58e2292d am bd44640c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'bd44640c7f532cdfe2b6d8c3e721abd92fbca65e':
  Import translations. DO NOT MERGE
 2014-05-15 14:31:13 +00:00
Baligh Uddin
bd44640c7f Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-05-15 14:26:05 +00:00
Narayan Kamath
35b884f88e am be3dc575: am 402120a2: Merge "Wait for secondary zygote before bringing up the system_server." 
* commit 'be3dc5754fd081f54a86df9894763c0da915eed3':
  Wait for secondary zygote before bringing up the system_server.
 2014-05-15 13:41:12 +00:00
Narayan Kamath
be3dc5754f am 402120a2: Merge "Wait for secondary zygote before bringing up the system_server." 
* commit '402120a2236b294dff9a51461cb22400a6ef67f6':
  Wait for secondary zygote before bringing up the system_server.
 2014-05-15 13:38:17 +00:00