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

60559 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
057e85ac0b Merge "docs: remove links to ADP devices" into ics-mr0 2011-10-24 16:47:49 -07:00
Brian Colonna
1a088aa1b9 Fix 5479823: black patch was showing before resuming call 
- This issue was marked as RelTeamHotIssue

- When Face Unlock is enabled, the black area is shown when going into
  the emergency dialer to prevent the backup lock from showing.
  However, it was doing this even if Face Unlock has already gone to
  the backup method.

- Since the same code is used for returning to a call as is used for
  starting the emergency dialer, it was doing the same thing when
  resuming a call.

- Just had to add a simple check to only display the black area if
  Face Unlock is still running.

- Note that this did *not* cause a problem when Face Unlock was not
  the unlock method.

Change-Id: Icc4deebcb47ceda035ea29c7d976342d3a8a60a7
 2011-10-24 17:15:52 -04:00
Jim Miller
7a962fef2f Merge "Fix 3384942: Force ASCII-capable IME to show on lockscreen" into ics-mr0 2011-10-24 13:31:15 -07:00
Xavier Ducrohet
e869ca9626 CherryPick f9e455 from master to mr0. do not merge. 
Fix software GL renderer.

Change-Id: I7273a8e65c23a0032d155ea6572de2923791e411
 2011-10-24 13:29:26 -07:00
Brian Colonna
c9c417c85d Merge "Added callback to allow Face Unlock to hide black area" into ics-mr0 2011-10-24 13:19:55 -07:00
Xavier Ducrohet
b0994ed7ff CherryPick 35530d from master to mr0. do not merge. 
qemu.hw.mainkeys indicates if the device has h/w main (home/back) keys.

If it has main keys, then the navigation bar is *not* displayed.

Change-Id: Idb36a1f787360363a009463f0c016a423594a5b9
 2011-10-24 13:15:58 -07:00
Roman Nurik
a51225736f Add Q3 2011 ADL slides to docs/shareables/adl 
Change-Id: If082b350188f3a73ac798abfa98f5a747747bd09
 2011-10-24 13:11:59 -07:00
Brian Colonna
f8b9a4751e Added callback to allow Face Unlock to hide black area 
- Part of fix 5491362 (RelTeamHotIssue)

- Because the fix closes the camera early, this change is needed so
  the black area isn't still hanging around while the camera fades
  to the backup lock.

Change-Id: Iab7c264adab0fb05979fe2732048ccf2237e64c5
 2011-10-24 15:37:53 -04:00
Scott Main
084369fb5e docs: add uiOptions attribute to manifest docs 
Change-Id: Ibe2960b6a4ee4e2d4a47e4acc7c197d68702d1e6
 2011-10-24 11:38:29 -07:00
Wink Saville
cd3ec73f0c Add getAvailableNetworks. 
To allow a operator test to pass we need to manually select
a network. Therefore getAvailableNetworks needs to be implemented
on CDMALTEPhone so that RIL_REQUEST_QUERY_AVAILABLE_NETWORKS is
sent to the RIL/radio.

Bug: 5420630
Change-Id: I8e138b211d42755399a9e30f3e45dde2f579401e
 2011-10-24 11:10:36 -07:00
The Android Open Source Project
3c5b65c95e Reconcile with ics-mr0-release 
Change-Id: I8530d709cfd162fdca2cb2d1b6a0bf1bc46b3f66
 2011-10-24 06:32:19 -07:00
The Android Automerger
335978e729 merge in ics-mr0-release history after reset to ics-mr0 2011-10-21 23:22:41 -07:00
Jake Hamby
3f06110dd0 Merge "Add support for SMS-PP data download to USIM." 2011-10-21 17:04:15 -07:00
Mathias Agopian
73182fc821 mDirtyRegion is single threaded, but could be accessed from a hwc thread 
We now have mInvalidateRegion which holds the region to invalidate, it
can be set from any thread as long as mInvalidateLock is held. We use
fine-grained locking here because mInvalidateRegion can be set from anywhere,
in particular frmo HWC callbacks.

Bug: 5466774
Change-Id: Iafca20aa3f5b25a87755e65bde7b769aa8f997bc
 2011-10-21 17:04:05 -07:00
Peter Ng
cfb9df6710 am be25d5b0: (-s ours) Merge "Do not merge - Recents background protection increased" into ics-mr0 
* commit 'be25d5b05639c8475b7faf312959923db86efa5d':
  Do not merge - Recents background protection increased
 2011-10-21 16:45:23 -07:00
Jake Hamby
ac09d2af14 Add support for SMS-PP data download to USIM. 
Devices supporting IMS may receive SMS-PP data download messages
which are normally handled in the radio baseband. Add support to
framework for these messages, passing the data to the UICC and
sending the response data as part of the SMS ACK.

Change-Id: I1da76982c6f8c402f82a6f535591e614f4e0de18
 2011-10-21 16:43:24 -07:00
Peter Ng
be25d5b056 Merge "Do not merge - Recents background protection increased" into ics-mr0 2011-10-21 16:42:49 -07:00
John Reck
b9c903fdfa Merge "Fix rebuildWebTextView issues" 2011-10-21 16:35:50 -07:00
Xavier Ducrohet
2f4ce2ecd0 Merge "Fix software GL renderer." 2011-10-21 16:22:15 -07:00
Xavier Ducrohet
f9e4551367 Fix software GL renderer. 
Change-Id: I07ab2709fa694e41aa3fcc5b9dfc809f55853ab4
 2011-10-21 16:18:48 -07:00
Mathias Agopian
9ec98cd134 am aa938c8d: Merge "mDirtyRegion is single threaded, but could be accessed from a hwc thread" into ics-mr0 
* commit 'aa938c8d9c0e71c9b556657cb33794210ce6ebf8':
  mDirtyRegion is single threaded, but could be accessed from a hwc thread
 2011-10-21 16:00:00 -07:00
Eric Fischer
1625b2af03 am 148d5bd8: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '148d5bd855e4872bbe99870b0019462bcf73b72c':
  Import revised translations.  DO NOT MERGE
 2011-10-21 15:57:54 -07:00
Mathias Agopian
aa938c8d9c Merge "mDirtyRegion is single threaded, but could be accessed from a hwc thread" into ics-mr0 2011-10-21 15:57:45 -07:00
Eric Fischer
148d5bd855 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-10-21 15:56:22 -07:00
The Android Automerger
cbbf026a43 merge in ics-mr0-release history after reset to ics-mr0 2011-10-21 15:55:40 -07:00
Mathias Agopian
6497eabf0e mDirtyRegion is single threaded, but could be accessed from a hwc thread 
We now have mInvalidateRegion which holds the region to invalidate, it
can be set from any thread as long as mInvalidateLock is held. We use
fine-grained locking here because mInvalidateRegion can be set from anywhere,
in particular frmo HWC callbacks.

Bug: 5466774
Change-Id: Iafca20aa3f5b25a87755e65bde7b769aa8f997bc
 2011-10-21 15:41:01 -07:00
Peter Ng
02d6fa5840 Do not merge - Recents background protection increased 
Change-Id: I45719b44102c088c82b619c717db3df31930c1b3
 2011-10-21 15:37:28 -07:00
John Reck
c0e9fb91c8 Fix rebuildWebTextView issues 
Bug: 5488135
 Cherry pick from MR0

Change-Id: I2df047b6de42dbe716008f69d720fa5fad3fe19d
 2011-10-21 15:31:33 -07:00
Daniel Shiplacoff
6d93ea7495 Merge "Recents background protection increased" 2011-10-21 15:22:54 -07:00
John Reck
59cf1dd6ae am 8bf89f30: (-s ours) Fix the build 
* commit '8bf89f305eb3a2010b1a63048a4aa18ccbc42e78':
  Fix the build
 2011-10-21 15:22:11 -07:00
Scott Main
a9f92a05dc docs: remove links to ADP devices 
Change-Id: I1ac719a876c285dcee0678b3c5559e82105f8df3
 2011-10-21 14:44:51 -07:00
Adam Cohen
bd12e41ba5 am e3bb0ecb: Merge "Removing fades on last item in StackView for major FPS improvement on Prime" into ics-mr0 
* commit 'e3bb0ecb2b36964cb3b02bc0d575e9366818ee00':
  Removing fades on last item in StackView for major FPS improvement on Prime
 2011-10-21 14:38:41 -07:00
John Reck
a26f7f169e am 2dd2e5b4: (-s ours) Merge changes I2df047b6,I791eeb3c into ics-mr0 
* commit '2dd2e5b4eb95280bb18717c1a31ca8db40a6413b':
  Fix rebuildWebTextView issues
  DO NOT MERGE Fixed spell check failing to change word.
 2011-10-21 14:38:32 -07:00
Dianne Hackborn
6ec96ec404 am 943da7b8: Merge "Fix issue #5342788: Setting wallpaper from gallery set default..." into ics-mr0 
* commit '943da7b895b7cc69cdaed7979cff422a7dbaac19':
  Fix issue #5342788: Setting wallpaper from gallery set default...
 2011-10-21 14:38:31 -07:00
Eric Fischer
66358bbd3e Import revised translations. DO NOT MERGE 
Change-Id: Ia333fa4ab1d72588e9c9ae4a9ef069eccdc9b485
 2011-10-21 14:36:36 -07:00
John Reck
8bf89f305e Fix the build 
Change-Id: I822f75b3ed29e7817c7bd9ac5e2314b43831d2c1
 2011-10-21 14:24:31 -07:00
Dirk Dougherty
7543b65022 am f1ed59bc: Merge "Doc change: fix typo in platform highlights." into ics-mr0 
* commit 'f1ed59bcebfd3042aead8d91ee47eca38af543c6':
  Doc change: fix typo in platform highlights.
 2011-10-21 13:59:34 -07:00
Winson Chung
19da321c9a am 53a1b82c: Merge "Last update for screenshot animations for MR0. (Bug: 5333706)" into ics-mr0 
* commit '53a1b82c9a2133c5c3184898335fce0826279691':
  Last update for screenshot animations for MR0. (Bug: 5333706)
 2011-10-21 13:59:08 -07:00
Dianne Hackborn
12b3e39ecb am 4bbd71a6: Merge "Fix issue #5228934: IME shows up on boot, or when digits screen is tapped" into ics-mr0 
* commit '4bbd71a6b2f4957f4778da13861ec03d30afbee7':
  Fix issue #5228934: IME shows up on boot, or when digits screen is tapped
 2011-10-21 13:59:07 -07:00
Mike Lockwood
186e21d8fb am 6b6bfb18: Merge "PowerManagerService: Enable light sensor debug output" into ics-mr0 
* commit '6b6bfb187412e4845c89d866eff0b87b6d0a5541':
  PowerManagerService: Enable light sensor debug output
 2011-10-21 13:59:05 -07:00
Gilles Debunne
03d13e7fa9 am 0499f90a: Merge "Bug 5428541: Check that span is still in text before deleting" into ics-mr0 
* commit '0499f90a2d2774f28ca3d430dfe563391669c515':
  Bug 5428541: Check that span is still in text before deleting
 2011-10-21 13:59:04 -07:00
Eric Fischer
0a79a2eaab am 4e7ce935: (-s ours) Merge "Import revised translations." into ics-mr0 
* commit '4e7ce9352b9c3a832715ac4b8014b2434a447172':
  Import revised translations.
 2011-10-21 13:59:03 -07:00
Adam Cohen
e3bb0ecb2b Merge "Removing fades on last item in StackView for major FPS improvement on Prime" into ics-mr0 2011-10-21 13:34:46 -07:00
Peter Ng
ab5040cf85 Merge "Sharpening text edit assets" 2011-10-21 13:29:52 -07:00
Peter Ng
3ed8933b12 Recents background protection increased 
Change-Id: I45719b44102c088c82b619c717db3df31930c1b3
 2011-10-21 13:29:16 -07:00
George Mount
930b5654a3 Merge "Fixed spell check failing to change word." 2011-10-21 13:02:05 -07:00
RoboErik
f9d89f388f Merge "s/should/can" 2011-10-21 13:01:56 -07:00
John Reck
2dd2e5b4eb Merge changes I2df047b6,I791eeb3c into ics-mr0 
* changes:
  Fix rebuildWebTextView issues
  DO NOT MERGE Fixed spell check failing to change word.
 2011-10-21 13:01:48 -07:00
Mangesh Ghiware
760bf7de06 Merge "Fix issue# 5492404: Reading level check thread error." 2011-10-21 12:45:30 -07:00
Dianne Hackborn
943da7b895 Merge "Fix issue #5342788: Setting wallpaper from gallery set default..." into ics-mr0 2011-10-21 12:45:07 -07:00