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

107410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Xie
90ca807f7b Revert "Revert "Change GATT_FAILURE from 0 to 0x101"" 
This reverts commit d21f674c150aa26c8094d1418108649f53f810e6
bug 9109238
Change-Id: Ie1fc3d7420e6c401d3db29499d8846e6b70a61bb
 2013-05-28 15:28:24 -07:00
John Spurlock
883ffa243d Merge "Hideybars feature confirmation toast bar." 2013-05-28 22:23:17 +00:00
Andreas Huber
7b8e1ea139 Fix parsing of global:http_proxy value. 
This caused a runtime restart for ':' and did not disable the proxy for ""
before.

Change-Id: Ib88b21e9eba5818a4968ae604abad8a3b3d1766f
 2013-05-28 15:17:37 -07:00
Romain Guy
6b084d5735 Merge "Re-initialize the 9patch cache if cleared with onTrimMemory" 2013-05-28 22:01:19 +00:00
Romain Guy
7d9b1b3c02 Re-initialize the 9patch cache if cleared with onTrimMemory 
The 9aptch cache was reinitialized after destroying/recreating
the EGL context but not after clearing it during a normal
memory trim.

Change-Id: If6155bfc8a62439e9878bc742a4766b3bd6c6aec
 2013-05-28 14:32:01 -07:00
Chris Craik
1728bebe9a Merge "Support larger bitmaps in BitmapFactory.Options.inBitmap" 2013-05-28 21:31:54 +00:00
Jeff Brown
be16567567 am dcb8d876: am 79df1e65: am e2a281ca: Merge "Add additional Method that check whether a table is empty or not" 
* commit 'dcb8d876581f9bf77e51c5539ef68993870264d8':
  Add additional Method that check whether a table is empty or not
 2013-05-28 13:51:01 -07:00
Scott Main
bdfec11352 am 2ee100c0: am e0329cae: am 5bd67944: am 5fbe17fe: am 27ab718e: Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev 
* commit '2ee100c0999e15d11ad36f387a22d9500eb14a6f':
  update eclipse download URL; /mobile URL will be deprecated
 2013-05-28 13:50:57 -07:00
John Spurlock
46292ee89a am be7a7e54: am ee352cca: Merge "Fix typo in View.java javadocs" into jb-mr2-dev 
* commit 'be7a7e546f409442c2f6505dd7a0526553fa395c':
  Fix typo in View.java javadocs
 2013-05-28 13:50:36 -07:00
Chris Craik
9f58361e98 Support larger bitmaps in BitmapFactory.Options.inBitmap 
bug:8121994

Adds a new distiction between bitmap size and the allocation
(pixel ref/buffer) used to store its data.

BitmapFactory.inBitmap will allow a bitmap to be reinitialized with
new data if the bitmap being decoded is (after sampleSize) equal or
smaller.

Change-Id: I747750a735c858882df3af74fca6cdc46f2a9f81
 2013-05-28 13:50:33 -07:00
Scott Main
f7e530a805 am 1a4022c8: am 0e11e8ef: am 6e5ee7dd: am ea325978: am 005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev 
* commit '1a4022c8a625436e00fb3174b287c33dd85a45be':
  docs: SDK and ADT r22.0.1 Release Notes
 2013-05-28 13:50:32 -07:00
Scott Main
55a60d7e59 am a0ac0f15: am 597a8374: am afaff6e2: am fb22f9cb: am 5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev 
* commit 'a0ac0f15cd8c8ed3a61cd41ce932dd3c860ce0e5':
  update GPS setup page to include emulator support. revise the doc layout with headings
 2013-05-28 13:50:28 -07:00
Scott Main
53baef1f55 am 5215f439: am 0b92682d: am 43fa2b88: am 718011ac: am d4b710c6: new android studio download v0.1.1 
* commit '5215f4399253d7444d094343429ce6277864f7a7':
  new android studio download v0.1.1
 2013-05-28 13:50:25 -07:00
The Android Open Source Project
dccb341546 am a5033158: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit 'a503315865507129e93efe15b281dd0ba98e6da3':
 2013-05-28 13:50:22 -07:00
Matthew Xie
67cc127186 am e7e6bf9f: am 27e45361: Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev 
* commit 'e7e6bf9f02a0a74f0a8d3812d2a3a3f3ec855086':
  Revert "Change GATT_FAILURE from 0 to 0x101"
 2013-05-28 13:50:13 -07:00
Matthew Xie
d78afea78d am 84e1afcc: am 413f6293: Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev 
* commit '84e1afcccc328e7a52bfde16e824a3ed37889d1d':
  Change GATT_FAILURE from 0 to 0x101
 2013-05-28 13:50:09 -07:00
Dianne Hackborn
525862c776 am 66e596e7: am 840f1143: am 7f3ff133: Merge "Fix wrong log information in DevicePolicyManagerService" 
* commit '66e596e788761e1168805304d2f5fc93c1f2fbcd':
  Fix wrong log information in DevicePolicyManagerService
 2013-05-28 13:50:05 -07:00
Dianne Hackborn
aa508bc6db am 23b07d55: am 43861f9d: am f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()" 
* commit '23b07d5549bf38cfea388b439ac519670be6e7e2':
  Avoid IllegalArgumentException in Preference.java compareTo()
 2013-05-28 13:50:02 -07:00
Dianne Hackborn
bbf6ecc981 am 4e73e8a8: am 95b79966: am 0a40bef9: Merge "Fix CalendarView to show the month title properly." 
* commit '4e73e8a817ff99a19ba9ed6fa68754007731406d':
  Fix CalendarView to show the month title properly.
 2013-05-28 13:49:59 -07:00
Dianne Hackborn
f8b8521598 am 89eed125: am c7322005: am f9b41efe: Merge "Don\'t include flags in configuration change if their value hasn\'t changed." 
* commit '89eed125590c6286fa64e9074e95196c8cc4bd27':
  Don't include flags in configuration change if their value hasn't changed.
 2013-05-28 13:49:56 -07:00
Dianne Hackborn
56798adf41 am 959b9b39: am fc09b326: am fee6d0cb: Merge "Fix documentation of requestCode parameter." 
* commit '959b9b39b4e488b643919fb7a58f2fbbdd70e573':
  Fix documentation of requestCode parameter.
 2013-05-28 13:49:53 -07:00
Dianne Hackborn
d73cb49bc0 am d031f9c7: (-s ours) am 087384b0: am f3251033: Merge "Framework/base: Added synchronization block to avoid race condition" 
* commit 'd031f9c7b7f9b28021abe32b0e0be2033dbec0ae':
  Framework/base: Added synchronization block to avoid race condition
 2013-05-28 13:49:50 -07:00
Maunik Shah
46c94b6626 DO NOT MERGE. Framework/base: Added synchronization block to avoid race condition 
Fix for the synchronization issue leading to access of an array
Index out of bounds. Issue occurs due to race condition between
removing the activities of a crashed process from history stack
and resuming a separate activity.

Change-Id: I14bb5834e778c15b674248e46fe93b0ce9f37967
 2013-05-28 13:46:24 -07:00
Jeff Sharkey
e4c29de9c6 Merge "Add missing ACTION_MEDIA_UNMOUNTED intent" 2013-05-28 20:44:47 +00:00
Daniel Sandler
8b268d461b Don't show emergency calls label unless it's a phone. 
Bug: 9042105
Change-Id: I8ffb6a66851878cdf22be9a20dbf57f5b6b48002
 2013-05-28 16:17:13 -04:00
Jeff Brown
3422ceb6ba Merge "Bug fix for building the hover target list" 2013-05-28 20:04:23 +00:00
Jeff Brown
dcb8d87658 am 79df1e65: am e2a281ca: Merge "Add additional Method that check whether a table is empty or not" 
* commit '79df1e65455fdb69f07675cffae99dea06a5afb2':
  Add additional Method that check whether a table is empty or not
 2013-05-28 13:00:28 -07:00
Jeff Brown
79df1e6545 am e2a281ca: Merge "Add additional Method that check whether a table is empty or not" 
* commit 'e2a281ca85f17eaf6d47978c76d2cafb0fa81782':
  Add additional Method that check whether a table is empty or not
 2013-05-28 12:57:59 -07:00
Jeff Brown
7573e5947a Merge "Properly rotate full [-pi, +pi] orientation range if available" 2013-05-28 19:56:20 +00:00
Jeff Brown
e2a281ca85 Merge "Add additional Method that check whether a table is empty or not" 2013-05-28 19:55:26 +00:00
John Spurlock
d85618ef57 Clear low profile bit when showing hideybars. 
Consider this an interaction, ensures that the hideybar
does not reveal itself in low profile mode.

Bug: 9102473
Change-Id: I8819a7d3d7aef0e08afb6f8c574c0ac519066cca
 2013-05-28 14:58:50 -04:00
Scott Main
2ee100c099 am e0329cae: am 5bd67944: am 5fbe17fe: am 27ab718e: Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev 
* commit 'e0329cae82dac7a650d505f9baafbd98e511e339':
  update eclipse download URL; /mobile URL will be deprecated
 2013-05-28 11:51:08 -07:00
Scott Main
e0329cae82 am 5bd67944: am 5fbe17fe: am 27ab718e: Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev 
* commit '5bd6794468df7f7900f1e0a37c24653dd524a5c8':
  update eclipse download URL; /mobile URL will be deprecated
 2013-05-28 11:49:25 -07:00
Scott Main
5bd6794468 am 5fbe17fe: am 27ab718e: Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev 
* commit '5fbe17fe2a5804a613c3e9d72d555a0aae8ba618':
  update eclipse download URL; /mobile URL will be deprecated
 2013-05-28 11:45:25 -07:00
Scott Main
5fbe17fe2a am 27ab718e: Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev 
* commit '27ab718e7ca00092acab7f55fed1a5dea9a7a77b':
  update eclipse download URL; /mobile URL will be deprecated
 2013-05-28 11:43:50 -07:00
Scott Main
27ab718e7c Merge "update eclipse download URL; /mobile URL will be deprecated" into jb-mr1.1-ub-dev 2013-05-28 18:41:37 +00:00
Joe Malin
ba0256fdc5 Docs bug fix: B9085293 - Stop Location Updates 
Change-Id: I8dd9e6ca59bac628ba834a86f50783170964e652
 2013-05-28 10:50:58 -07:00
John Spurlock
dcf4f21460 Hideybars feature confirmation toast bar. 
Enhance Toast to support new standard toast bar style, similar
to the undo bar in Gmail.  Toast bars can be interactive,
and can have a single action.  Add a new toast duration to
indicate persistent toasts (no auto-hide delay).

Use the new toast bar to implement a feature hint when hiding
the navigation bar in hideybars mode.

Per UX, the feature confirmation bar can also be dismissed on
any outside touch as long as the user confirmed it using the
OK button at least once globally.

Bug: 8754108
Change-Id: Iaa85d3b4da7ada1952a562f1e31de04380f5d587
 2013-05-28 13:09:23 -04:00
John Spurlock
be7a7e546f am ee352cca: Merge "Fix typo in View.java javadocs" into jb-mr2-dev 
* commit 'ee352cca1f3beb577dfdf1c18a08242e4f94d01b':
  Fix typo in View.java javadocs
 2013-05-28 09:36:19 -07:00
John Spurlock
ee352cca1f Merge "Fix typo in View.java javadocs" into jb-mr2-dev 2013-05-28 16:33:49 +00:00
Scott Main
1a4022c8a6 am 0e11e8ef: am 6e5ee7dd: am ea325978: am 005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev 
* commit '0e11e8ef4bb6472b8e8a1b4b76b4b7c195aaffe1':
  docs: SDK and ADT r22.0.1 Release Notes
 2013-05-28 09:08:02 -07:00
Scott Main
0e11e8ef4b am 6e5ee7dd: am ea325978: am 005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev 
* commit '6e5ee7ddf2cc948ef3b69a73f25ce81f7edd76e9':
  docs: SDK and ADT r22.0.1 Release Notes
 2013-05-28 09:03:37 -07:00
Scott Main
a0ac0f15cd am 597a8374: am afaff6e2: am fb22f9cb: am 5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev 
* commit '597a8374491ffb9dc5c07fadfccd9c1b1b336046':
  update GPS setup page to include emulator support. revise the doc layout with headings
 2013-05-28 09:01:10 -07:00
Scott Main
6e5ee7ddf2 am ea325978: am 005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev 
* commit 'ea32597832aada5f811c9ca1c1baf008d62ab64a':
  docs: SDK and ADT r22.0.1 Release Notes
 2013-05-28 09:00:51 -07:00
Scott Main
597a837449 am afaff6e2: am fb22f9cb: am 5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev 
* commit 'afaff6e2e90e61df52737fec9e059b05cfa71e48':
  update GPS setup page to include emulator support. revise the doc layout with headings
 2013-05-28 08:59:09 -07:00
Scott Main
ea32597832 am 005d2afb: Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev 
* commit '005d2afb308f474352ec4b504cf661851e4c2e59':
  docs: SDK and ADT r22.0.1 Release Notes
 2013-05-28 08:58:18 -07:00
Scott Main
afaff6e2e9 am fb22f9cb: am 5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev 
* commit 'fb22f9cb04d13fb85f1b3fd0e979742b5ab6568d':
  update GPS setup page to include emulator support. revise the doc layout with headings
 2013-05-28 08:57:27 -07:00
Scott Main
005d2afb30 Merge "docs: SDK and ADT r22.0.1 Release Notes" into jb-mr1.1-ub-dev 2013-05-28 15:56:24 +00:00
Scott Main
fb22f9cb04 am 5d64a193: Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev 
* commit '5d64a1932d6c94628442b811c4be7bc41f0f1a8f':
  update GPS setup page to include emulator support. revise the doc layout with headings
 2013-05-28 08:54:59 -07:00
Scott Main
5d64a1932d Merge "update GPS setup page to include emulator support. revise the doc layout with headings" into jb-mr1.1-ub-dev 2013-05-28 15:53:04 +00:00