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

107291 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
5bee398f16 Merge "Clear low profile bit when showing hideybars." 2013-05-29 13:21:23 +00:00
Dave Burke
846b6f8df5 am 17486b97: am ed8f94fc: Merge "Fix up device sounds." into jb-mr2-dev 
* commit '17486b974940e7f129e74d89b7f8fb0473115943':
  Fix up device sounds.
 2013-05-28 22:59:24 -07:00
Dave Burke
17486b9749 am ed8f94fc: Merge "Fix up device sounds." into jb-mr2-dev 
* commit 'ed8f94fc454098889ccc6cf7745447090dc16905':
  Fix up device sounds.
 2013-05-28 22:57:59 -07:00
Dave Burke
ed8f94fc45 Merge "Fix up device sounds." into jb-mr2-dev 2013-05-29 05:56:04 +00:00
Matthew Xie
16a90db8d7 am 897d98a7: am 6ea0636a: Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev 
* commit '897d98a7530109bff8d73b3651d8884c76f54c42':
  Revert "Revert "Change GATT_FAILURE from 0 to 0x101""
 2013-05-28 22:30:10 -07:00
Matthew Xie
897d98a753 am 6ea0636a: Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev 
* commit '6ea0636a9c6e3661d6a9ac443eba5b9b6a0d7354':
  Revert "Revert "Change GATT_FAILURE from 0 to 0x101""
 2013-05-28 22:27:44 -07:00
Matthew Xie
6ea0636a9c Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev 2013-05-29 05:25:47 +00:00
Dave Burke
fbdb7d25de Fix up device sounds. 
Bug: 9179812
Change-Id: Ie86287487830c06f38bcc5c0e8bab3da225d6bbf
 2013-05-28 21:44:29 -07:00
Daniel Sandler
7ca6c5c426 am a1f49d8b: am 295eddb9: Merge "Don\'t show emergency calls label unless it\'s a phone." into jb-mr2-dev 
* commit 'a1f49d8bb77db20617f9ea372ad9f1a9e06deece':
  Don't show emergency calls label unless it's a phone.
 2013-05-28 21:40:29 -07:00
Daniel Sandler
a1f49d8bb7 am 295eddb9: Merge "Don\'t show emergency calls label unless it\'s a phone." into jb-mr2-dev 
* commit '295eddb92fd6e137ae352ea8dace2ecd18bf0a8a':
  Don't show emergency calls label unless it's a phone.
 2013-05-28 21:37:59 -07:00
Daniel Sandler
295eddb92f Merge "Don't show emergency calls label unless it's a phone." into jb-mr2-dev 2013-05-29 04:36:24 +00:00
Robert Greenwalt
b61e757ffb am 466ceb46: am aa4b2ee0: Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev 
* commit '466ceb463f44f72bdd73764e50dcb34c174a0cfe':
  Ignore outstanding delayed shutdown on restart
 2013-05-28 21:25:44 -07:00
Robert Greenwalt
466ceb463f am aa4b2ee0: Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev 
* commit 'aa4b2ee0d654b345b727cb47afd246d0b769fafd':
  Ignore outstanding delayed shutdown on restart
 2013-05-28 21:23:11 -07:00
Robert Greenwalt
aa4b2ee0d6 Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev 2013-05-29 04:21:25 +00:00
Baligh Uddin
09d85677c3 am e3425ac4: (-s ours) am af1e512e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'e3425ac426fa5da15fa3d8471dd9c0e27cb52375':
  Import translations. DO NOT MERGE
 2013-05-28 20:47:19 -07:00
Baligh Uddin
e3425ac426 am af1e512e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'af1e512e3f2b52e563e37c1635cbea06e87e0592':
  Import translations. DO NOT MERGE
 2013-05-28 20:44:52 -07:00
Baligh Uddin
b3db126dd4 Merge "Import translations. DO NOT MERGE" 2013-05-29 03:43:49 +00:00
Baligh Uddin
af1e512e3f Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-05-29 03:42:23 +00:00
Baligh Uddin
31c50d0f9b Merge "Import translations. DO NOT MERGE" 2013-05-29 03:41:57 +00:00
Robert Greenwalt
e9868c1ba0 Ignore outstanding delayed shutdown on restart 
This was causing us to go disabled when we shouldn't
so the API being tested in the CTS would fail.  Bug
is timing dependent and hard to repro.

bug:9067887
Change-Id: I70b813bf826988d859cc29201242238f18dcf2e6
 2013-05-28 19:33:48 -07:00
Dianne Hackborn
493f2bd8e3 Merge "Add more details about why a force stop is happening." 2013-05-29 01:20:58 +00:00
Dianne Hackborn
21d9b56692 Add more details about why a force stop is happening. 
Change-Id: Ia938cf6fc37ad22fc7447dc538968c7bd234be7d
 2013-05-28 17:46:59 -07:00
Andrew Hsieh
5b5d10969d am 222ff39f: am 64b5f7cc: am 09377ddb: Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event" 
* commit '222ff39fe2ead6f7fa8f6e6e98082542ad675548':
  Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event
 2013-05-28 17:12:20 -07:00
Andrew Hsieh
222ff39fe2 am 64b5f7cc: am 09377ddb: Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event" 
* commit '64b5f7cc4ca094754d4631ffb801b7bb771081ec':
  Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event
 2013-05-28 17:10:02 -07:00
Andrew Hsieh
64b5f7cc4c am 09377ddb: Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event" 
* commit '09377ddb93a964b9e0def6d84b8beb3a515f4a18':
  Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event
 2013-05-28 17:08:54 -07:00
Andrew Hsieh
09377ddb93 Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event" 2013-05-29 00:06:54 +00:00
Andreas Huber
b54e0aa299 Merge "Fix parsing of global:http_proxy value." 2013-05-28 23:06:30 +00:00
Jeff Sharkey
2267a7862e am 2c4b0905: am ab4a0541: am e4c29de9: Merge "Add missing ACTION_MEDIA_UNMOUNTED intent" 
* commit '2c4b0905513b73c9e0435632cbaa00320480a857':
  Add missing ACTION_MEDIA_UNMOUNTED intent
 2013-05-28 15:52:25 -07:00
Jeff Brown
19c618dbce am c8a77735: am dea6e86d: am 3422ceb6: Merge "Bug fix for building the hover target list" 
* commit 'c8a777356267803be3e235b2fdaf807166fb46eb':
  Bug fix for building the hover target list
 2013-05-28 15:52:22 -07:00
Jeff Sharkey
2c4b090551 am ab4a0541: am e4c29de9: Merge "Add missing ACTION_MEDIA_UNMOUNTED intent" 
* commit 'ab4a0541994d5de9520ad4ba37c3a11c5f540eb5':
  Add missing ACTION_MEDIA_UNMOUNTED intent
 2013-05-28 15:49:16 -07:00
Jeff Brown
c8a7773562 am dea6e86d: am 3422ceb6: Merge "Bug fix for building the hover target list" 
* commit 'dea6e86dce716b67fe92c9b281fe9e79256f3b78':
  Bug fix for building the hover target list
 2013-05-28 15:49:13 -07:00
Jeff Brown
e33243ff18 am ef0c3e26: am c8c82009: resolved conflicts for merge of 7573e594 to stage-aosp-master 
* commit 'ef0c3e269f15200a3a1111ce9f80516b2d38590a':
  Properly rotate full [-pi, +pi] orientation range if available
 2013-05-28 15:48:47 -07:00
Jeff Sharkey
ab4a054199 am e4c29de9: Merge "Add missing ACTION_MEDIA_UNMOUNTED intent" 
* commit 'e4c29de9c69d332d65d2eb490961faffab4467fd':
  Add missing ACTION_MEDIA_UNMOUNTED intent
 2013-05-28 15:46:08 -07:00
Jeff Brown
dea6e86dce am 3422ceb6: Merge "Bug fix for building the hover target list" 
* commit '3422ceb6ba453c28ac39dfce34534e0346394a3a':
  Bug fix for building the hover target list
 2013-05-28 15:46:00 -07:00
Jeff Brown
ef0c3e269f am c8c82009: resolved conflicts for merge of 7573e594 to stage-aosp-master 
* commit 'c8c82009dc8c146efadac6b51702922148f6003f':
  Properly rotate full [-pi, +pi] orientation range if available
 2013-05-28 15:45:43 -07:00
Jeff Brown
c8c82009dc resolved conflicts for merge of 7573e594 to stage-aosp-master 
Change-Id: Ic19294c82ec023707e23b5848901426433b22e9f
 2013-05-28 15:43:16 -07:00
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