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

179489 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
e15f580b9d am 2bd01ebf: am 7ed14549: am 7081a114: Merge "Add preferences rendering." into lmp-dev 
* commit '2bd01ebfa99815d4fb6b4e77754146a22cf66d03':
  Add preferences rendering.
 2015-01-06 22:29:17 +00:00
Ricardo Cervera
934c8ddc20 am ebc28729: am e7d1db56: am d69238ef: am 4bb503cf: docs: Minor fixes in Android Studio pages. 
* commit 'ebc2872929177c4780c68a0371a44c25f89a4f1f':
  docs: Minor fixes in Android Studio pages.
 2015-01-06 22:29:12 +00:00
Baligh Uddin
efc0bbecc5 am 94c4b4b2: (-s ours) am 15552158: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '94c4b4b2a5c368a4894bbd8a42301f7ce443129b':
  Import translations. DO NOT MERGE
 2015-01-06 22:29:07 +00:00
Sarah Maddox
efd72a4845 am f22bca34: am 7d9309b6: am 029acc8e: am ab515931: Merge "docs: Fixes typo on Play services page for Maps." into lmp-docs 
* commit 'f22bca34a08c4e24981f169d20135835a189cbf4':
  docs: Fixes typo on Play services page for Maps.
 2015-01-06 22:28:54 +00:00
Joe Fernandez
952ebe3fac am 64d74fbf: am 69434df3: am 180bd6be: am 76db15a8: docs: fix problem with TOC after Japanese pages merge 
* commit '64d74fbf8739d6992ccb9b42c53705ad9fce9e91':
  docs: fix problem with TOC after Japanese pages merge
 2015-01-06 22:28:49 +00:00
David Friedman
859e176bfe am aed8152d: am 2d179c89: am 919ecb22: am 58a5e3db: Merge "Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e" into lmp-docs 
* commit 'aed8152d864b90363569c3a2de09de35048cfeb2':
  Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
 2015-01-06 22:28:43 +00:00
Joe Fernandez
9ebb780ccb am 750c0385: am 214e6867: am c27d5fd6: am 7cec35ef: Merge "docs: b/18122848 [DAC] Android TV - Recommendation card" into lmp-docs 
* commit '750c0385601964ae0bf16b75fe94eb1da22ffa29':
  docs: b/18122848 [DAC] Android TV - Recommendation card
 2015-01-06 22:28:38 +00:00
Joe Fernandez
633db0ee66 am c4429f1f: am 001f6f54: am 66fefd0c: am a9a36ab2: Merge "docs: plugin link name update" into lmp-docs 
* commit 'c4429f1fac0a7be38adaed24eec87e3d3d1e077c':
  docs: plugin link name update
 2015-01-06 22:28:33 +00:00
Scott Rowe
dfc950b40d am aa7c1f68: am 13d31b0a: am d7d1411a: am e2b44f86: docs: Making TV Apps Searchable - new training 
* commit 'aa7c1f6845dcac1ade80196280ead40958bd1acd':
  docs: Making TV Apps Searchable - new training
 2015-01-06 22:28:25 +00:00
Deepanshu Gupta
565f224540 am a6671b70: am 6461e054: Merge "Add image comparison to LayoutLib tests." into lmp-dev 
* commit 'a6671b707446963f402a71219725f317a57b42af':
  Add image comparison to LayoutLib tests.
 2015-01-06 22:23:01 +00:00
Deepanshu Gupta
86f96d07c7 am 0db2524c: am b2ebb968: Merge "Remove Time from CreateInfo" into lmp-dev 
* commit '0db2524caa01022629075a113d3370a1b7c3da30':
  Remove Time from CreateInfo
 2015-01-06 22:22:56 +00:00
Deepanshu Gupta
229ce66583 am 937db7a3: am 53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev 
* commit '937db7a39ef6f5e88a936f78a729f9578123e60b':
  Add DatePicker, CalendarView to LayoutLib tests
 2015-01-06 22:22:53 +00:00
Deepanshu Gupta
b187106c53 am e69e4f8b: am f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-dev 
* commit 'e69e4f8b4db142f024e170cf6faabb36095799b7':
  Fix DatePicker rendering.
 2015-01-06 22:22:49 +00:00
Deepanshu Gupta
48ab6becea am 8c686ddd: am d20a518c: Merge "Make Preference-cookie map non static." into lmp-dev 
* commit '8c686ddd540f3a15cdba4893f104c0e8e9af5716':
  Make Preference-cookie map non static.
 2015-01-06 22:22:44 +00:00
Deepanshu Gupta
b88a65df73 am cec8e5a1: am f861c0ce: Merge "Fix default initial value for preferences" into lmp-dev 
* commit 'cec8e5a10de413c733223b8b1cc11b70c6254647':
  Fix default initial value for preferences
 2015-01-06 22:22:40 +00:00
Deepanshu Gupta
2bd01ebfa9 am 7ed14549: am 7081a114: Merge "Add preferences rendering." into lmp-dev 
* commit '7ed145493d3f5bea32c567980f77cc42f613197e':
  Add preferences rendering.
 2015-01-06 22:22:36 +00:00
Ricardo Cervera
ebc2872929 am e7d1db56: am d69238ef: am 4bb503cf: docs: Minor fixes in Android Studio pages. 
* commit 'e7d1db56324e406a074bf0c44e778060b07d2322':
  docs: Minor fixes in Android Studio pages.
 2015-01-06 22:22:27 +00:00
Baligh Uddin
94c4b4b2a5 am 15552158: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '155521586c71b8fd2ed61e3cd860a3a75c55a4e9':
  Import translations. DO NOT MERGE
 2015-01-06 22:22:13 +00:00
Sarah Maddox
f22bca34a0 am 7d9309b6: am 029acc8e: am ab515931: Merge "docs: Fixes typo on Play services page for Maps." into lmp-docs 
* commit '7d9309b6e9e6974608b2d355c9eb1a66550801b2':
  docs: Fixes typo on Play services page for Maps.
 2015-01-06 22:22:08 +00:00
Joe Fernandez
64d74fbf87 am 69434df3: am 180bd6be: am 76db15a8: docs: fix problem with TOC after Japanese pages merge 
* commit '69434df395798a725072424782f79daaa23aae14':
  docs: fix problem with TOC after Japanese pages merge
 2015-01-06 22:21:58 +00:00
David Friedman
aed8152d86 am 2d179c89: am 919ecb22: am 58a5e3db: Merge "Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e" into lmp-docs 
* commit '2d179c899a59a2001a665ca6c3725832aced648c':
  Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
 2015-01-06 22:21:54 +00:00
Joe Fernandez
750c038560 am 214e6867: am c27d5fd6: am 7cec35ef: Merge "docs: b/18122848 [DAC] Android TV - Recommendation card" into lmp-docs 
* commit '214e6867c5339468a960e8b8a20c535c99eb9e57':
  docs: b/18122848 [DAC] Android TV - Recommendation card
 2015-01-06 22:21:47 +00:00
Joe Fernandez
c4429f1fac am 001f6f54: am 66fefd0c: am a9a36ab2: Merge "docs: plugin link name update" into lmp-docs 
* commit '001f6f5451a71da328c3e05b4da1ad3bf24ad613':
  docs: plugin link name update
 2015-01-06 22:21:43 +00:00
Scott Rowe
aa7c1f6845 am 13d31b0a: am d7d1411a: am e2b44f86: docs: Making TV Apps Searchable - new training 
* commit '13d31b0a40dd58d61e8a6ad82c1de165792b95e4':
  docs: Making TV Apps Searchable - new training
 2015-01-06 22:21:38 +00:00
Ye Wen
bd2d53413c Add new mms error for no data network (airplane mode or no mobile data) 
b/18872094

Change-Id: Ia2e939fe91b6f80c192d601c80de551f173e5e6f
 2015-01-06 14:07:55 -08:00
Paul Lawrence
2c4b1610ef Merge "Fix crash caused by toHex returning exception" 2015-01-06 22:06:53 +00:00
Mike Reed
71487eb0ce Merge frameworks/base changes from master-skia to master. 
Adaptations to changes in Skia upstream since Oct 2014.
(https://code.google.com/p/skia/issues/detail?id=2377)

cbb922d use new roundOut signature
77082de Call SkColorTable::readColors().
5456ab1 Handle the result of SkMatrix::asAffine.
25cfc78 Remove dependence on SK_LEGACY_PICTURE_SIZE_API.

BUG:18468293

Change-Id: I5a4d274e854298843891410b1ffd5e24f038b88a
 2015-01-06 21:41:35 +00:00
Paul Lawrence
7e5898d146 Fix crash caused by toHex returning exception 
toHex was changed to throw an exception in
I4986a8e806d9066129f696ab9f2e80655424e723, but its caller was not adjusted
accordingly, causing a crash whenever an unencrypted device was booted.

Bug: 18886749
Change-Id: If0505f617001cf5e0d99cf14c8b09e6a6a377167
 2015-01-06 13:11:23 -08:00
Christopher Tate
235312d64b am ad02e38b: am 0a511d33: am 1c6014e7: Merge "Remove the "backup_data_changed" event log" into lmp-mr1-dev 
* commit 'ad02e38b631ff4e7a9fa26c7ed5240052fb29960':
  Remove the "backup_data_changed" event log
 2015-01-06 20:09:41 +00:00
Dianne Hackborn
9d06e9f92c am 3d44382a: am 6f36bd3a: am 5fe8197f: Merge "Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit" into lmp-mr1-dev 
* commit '3d44382aca0528a163be0bc7619208ce4b1e5798':
  Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit
 2015-01-06 20:09:36 +00:00
Olawale Ogunwale
803aa17918 am 59820738: am d8aa4660: am da90a9c2: Merge "Do not allow the navigation bar to move if width == height" 
* commit '59820738fd75d1c1311d30280f82f51d251c8d66':
  Do not allow the navigation bar to move if width == height
 2015-01-06 20:09:30 +00:00
Paul Jensen
8ca07337a6 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-01-06 20:09:28 +00:00
Paul Jensen
3e50161a6e am 932bfab9: am 6c93739f: am 9ffb53cb: Clear process DNS NetID binding when expiring or releaseing legacy requests. 
* commit '932bfab9aaa58f116935eb0a1f22de49301724c4':
  Clear process DNS NetID binding when expiring or releaseing legacy requests.
 2015-01-06 20:09:18 +00:00
Narayan Kamath
a6f7099343 am 031acc4b: am 3787decd: am 5137415e: Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod." 
* commit '031acc4b3920336e58c56abb99322cbeb9be9e5c':
  Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.
 2015-01-06 20:09:12 +00:00
Narayan Kamath
f70afa9b8f am 721d0994: am f60b2d40: am 024191b5: Merge "Fix comment. It should be \'or\' not \'of\'." 
* commit '721d0994dc6ed370e359a33a6798f87389a428c8':
  Fix comment.  It should be 'or' not 'of'.
 2015-01-06 20:09:06 +00:00
Jinsuk Kim
59891a9547 am 30a061ed: am e96f9dd1: am b0b4921b: Merge "CEC: Make deviceSelect work for MHL device" into lmp-mr1-dev 
* commit '30a061ed4ffb7360d55b610566ce47b57c058543':
  CEC: Make deviceSelect work for MHL device
 2015-01-06 20:09:01 +00:00
Jinsuk Kim
c985404481 am e96f9dd1: am b0b4921b: Merge "CEC: Make deviceSelect work for MHL device" into lmp-mr1-dev 
automerge: 30a061e

* commit '30a061ed4ffb7360d55b610566ce47b57c058543':
  CEC: Make deviceSelect work for MHL device
 2015-01-06 20:06:57 +00:00
Andrew Solovay
ffe26c219f am eeaf280d: am ff62a5ee: am 4c7390d3: am b663f2fc: am 713cd74e: docs: New "app compatibility with managed profiles" doc 
automerge: 7dd1f66

* commit '7dd1f66bb66ac9a6f6dbf2bcc2c4548b9d123491':
  docs: New "app compatibility with managed profiles" doc
 2015-01-06 20:04:03 +00:00
Joe Fernandez
b63166afd3 am c632031a: am 27195338: am 546a0e8c: am 60925265: am afc3b9e7: Merge "docs: studio build output dir name update" into lmp-docs 
automerge: 7cf74ee

* commit '7cf74ee6e2c51afaf07e29f8597475ec289a20ed':
  docs: studio build output dir name update
 2015-01-06 20:01:43 +00:00
Joe Fernandez
6d2dcbbd30 am 06cdc2fd: am 851931f0: am 21b92f34: am 43f4e8fa: am 27cb0a56: Merge "docs: gradle version update in plugin file" into lmp-docs 
automerge: 629612a

* commit '629612a9d2d1a52809cd0549a1b6d2cbcf1a3d09':
  docs: gradle version update in plugin file
 2015-01-06 19:58:32 +00:00
Joe Fernandez
414d895c11 am 4dc7c158: am 3dcc1289: am 447ea509: am f110d357: am 8eaf4042: Merge "docs: gradle wrapper security note" into lmp-docs 
automerge: 148a578

* commit '148a57877ec5272a6768f427bd280a4d9c18acb1':
  docs: gradle wrapper security note
 2015-01-06 19:56:46 +00:00
Nick Kralevich
cfea9fbc53 resolved conflicts for merge of 175ef812 to master 
Change-Id: I2c6f407fa56b13c54571f8a51573a4b45d251dbb
 2015-01-06 11:50:08 -08:00
Joe Fernandez
17197b856b am e7558b44: am 596868b6: am c811b88a: am d3d09d87: am 66e851fa: Merge "docs: studio workflow links" into lmp-docs 
automerge: 8109599b

* commit '8109599b1c6306d1f2239a88f0cf9ba3ea584f2b':
  docs: studio workflow links
 2015-01-06 19:36:41 +00:00
Paul Miller
f6bf1d7b30 Fix crash on pasting text in a WebView 
WindowDecorActionBar and Chrome's ContentViewCore each have their own ActionMode
reference. ActionModeImpl.finish() nulls WindowDecorActionBar's reference and
calls mCallback.onDestroyActionMode() to null ContentViewCore's reference. But
if the callback is deferred, there is a period when the ActionMode is finished
(and mCallback is null), but ContentViewCore doesn't know. ContentViewCore may
try to invalidate() the ActionMode, which will crash on the null mCallback.

Make ActionModeImpl more permissive so that calling invalidate() during this
period does nothing.

BUG:18758329
Change-Id: I407fa0e0cd3cffa217e165caed83130d44760316
 2015-01-06 11:32:02 -08:00
Nick Kralevich
0e55e3565e resolved conflicts for merge of 1779fd15 to master 
Change-Id: I36b60b943a9cfe53bbbf455cf4e94579bfbfbc69
 2015-01-06 11:29:44 -08:00
Christopher Tate
ad02e38b63 am 0a511d33: am 1c6014e7: Merge "Remove the "backup_data_changed" event log" into lmp-mr1-dev 
* commit '0a511d33b0a7887baab95c39fd5889efad1962b1':
  Remove the "backup_data_changed" event log
 2015-01-06 19:19:07 +00:00
Dianne Hackborn
3d44382aca am 6f36bd3a: am 5fe8197f: Merge "Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit" into lmp-mr1-dev 
* commit '6f36bd3a00a4708c425874764b63f0240e799cfd':
  Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit
 2015-01-06 19:19:00 +00:00
Alan Viverette
f4c068b72e Add getDither, getFilterBitmap to Drawable for CTS testing 
Also removes unnecessary overrides from PictureDrawable.

Change-Id: I13539b5204e8c0d8b9912da14de7ceae62720e3f
 2015-01-06 11:01:36 -08:00
Alan Viverette
304ea5aac7 Merge "Allow use of theme attributes in color state lists" 2015-01-06 18:47:29 +00:00
Yin-Chia Yeh
941aac0c07 Camera: doc update for color aberration modes 
Code-gened document update for camera2 spec.

Bug: 18915494
Change-Id: I4b6236415f93739da4562eac81f53d2fd4c10f69
 2015-01-06 18:46:15 +00:00