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

107389 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
John Spurlock
0efd4f0215 Merge "Fix typo in View.java javadocs" 2013-05-28 15:45:18 +00:00
Scott Main
5215f43992 am 0b92682d: am 43fa2b88: am 718011ac: am d4b710c6: new android studio download v0.1.1 
* commit '0b92682d292acd830ac84467178ff417cbb3e699':
  new android studio download v0.1.1
 2013-05-28 08:44:23 -07:00
Scott Main
0b92682d29 am 43fa2b88: am 718011ac: am d4b710c6: new android studio download v0.1.1 
* commit '43fa2b8853ea61a2bbb1a34cf98c558c4ca830da':
  new android studio download v0.1.1
 2013-05-28 08:42:24 -07:00
John Spurlock
44b1edd948 Fix typo in View.java javadocs 
Change-Id: I85b9b2bd30d1f9d38954c31f24a352930a230ced
 2013-05-28 11:40:58 -04:00
Scott Main
43fa2b8853 am 718011ac: am d4b710c6: new android studio download v0.1.1 
* commit '718011ac851dcd8925ebeaf4f5516b7b1b62a647':
  new android studio download v0.1.1
 2013-05-28 08:39:42 -07:00
Craig Mautner
41c0f353c6 Replace mFocusedStack with getFocusedStack() 
mFocusedStack should not be used directly as it may be null. Added
a note to the declaration to remind future self of that.

Fixes bug 9165949.

Change-Id: I8fad428d93b50909be9e7ec51df81149c11313b3
 2013-05-28 08:39:25 -07:00
Scott Main
718011ac85 am d4b710c6: new android studio download v0.1.1 
* commit 'd4b710c69800acd0a9237a64e73d62ac9ba3a517':
  new android studio download v0.1.1
 2013-05-28 08:37:35 -07:00
Derek Sollenberger
d7a80774f0 Modifications needed for updating Skia to r9286. 
bug: 8719528
Change-Id: I260fefb93c5a8c5dec86acdec66cbe55a2ee8a92
 2013-05-28 10:44:26 -04:00
The Android Open Source Project
a503315865 Reconcile with jb-mr2-release - do not merge 
Change-Id: I6e813db1760b5f2889fac72f042d82743179cc66
 2013-05-28 07:37:29 -07:00
John Spurlock
9643d40395 Fix typo in View.java javadocs 
Change-Id: I6da88e18fe32c4763c916990f6aa17dda21f5c8f
 2013-05-28 09:44:50 -04:00
Baligh Uddin
1f12ff9b0e Import translations. DO NOT MERGE 
Change-Id: I258b08e31327bb4b99088338f81217db5ec2d0fb
Auto-generated-cl: translation import
 2013-05-27 10:08:03 -07:00
Baligh Uddin
451b69eee5 Import translations. DO NOT MERGE 
Change-Id: I99c1563b2e8d99075b09492c163c4a28e229734d
Auto-generated-cl: translation import
 2013-05-27 09:55:15 -07:00
Baligh Uddin
bb0a7f5010 Import translations. DO NOT MERGE 
Change-Id: I7d29ef01bf03a1640cabf0a179fc0b05d0e53b3a
Auto-generated-cl: translation import
 2013-05-27 09:53:06 -07:00
Andrew Hsieh
c01e1ed688 Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event 
See b.android.com/55873

Change-Id: Idff7b71480991e16f57e55748fafa57d5827b10b
 2013-05-27 12:27:10 +08:00
Matthew Xie
e7e6bf9f02 am 27e45361: Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev 
* commit '27e453617a2c179580a55d6cbe0619fa95adf693':
  Revert "Change GATT_FAILURE from 0 to 0x101"
 2013-05-26 14:40:14 -07:00
Matthew Xie
27e453617a Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev 2013-05-26 21:38:01 +00:00
Matthew Xie
d21f674c15 Revert "Change GATT_FAILURE from 0 to 0x101" 
This reverts commit 8310e6196ffeb6d0dce33fc1a528113b04f304d6

Change-Id: I467f7cfc8626b0fc54509a89158cd2d84a0c10b8
 2013-05-26 21:03:16 +00:00
Matthew Xie
84e1afcccc am 413f6293: Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev 
* commit '413f62930003d4ff20e29fd3bbfaf2d163a08ac1':
  Change GATT_FAILURE from 0 to 0x101
 2013-05-26 13:21:44 -07:00
Matthew Xie
413f629300 Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev 2013-05-26 20:19:06 +00:00
The Android Automerger
f062b2a5d0 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-26 05:55:27 -07:00
Dianne Hackborn
66e596e788 am 840f1143: am 7f3ff133: Merge "Fix wrong log information in DevicePolicyManagerService" 
* commit '840f114395652b3d31815ae23302218305b8b780':
  Fix wrong log information in DevicePolicyManagerService
 2013-05-26 00:25:11 -07:00