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

63228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Colonna
4e23bf011e am c9c417c8: Merge "Added callback to allow Face Unlock to hide black area" into ics-mr0 
* commit 'c9c417c85d08074e5ececd5c74db1364e9c097c2':
  Added callback to allow Face Unlock to hide black area
 2011-10-24 13:22:13 -07:00
Xavier Ducrohet
7784724597 am b0994ed7: (-s ours) CherryPick 35530d from master to mr0. do not merge. 
* commit 'b0994ed7ffd31d02b9d66a470decfdfaf0d6f8ee':
  CherryPick 35530d from master to mr0. do not merge.
 2011-10-24 13:20:07 -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
Xavier Ducrohet
27ade42624 am 852edd35: Merge "qemu.hw.mainkeys indicates if the device has h/w main (home/back) keys." 
* commit '852edd3576f511dad0fe3e1e47a9c35cb5b26742':
  qemu.hw.mainkeys indicates if the device has h/w main (home/back) keys.
 2011-10-24 13:03:50 -07:00
Xavier Ducrohet
852edd3576 Merge "qemu.hw.mainkeys indicates if the device has h/w main (home/back) keys." 2011-10-24 13:01:46 -07:00
The Android Automerger
63eaa51d04 merge in ics-mr0-release history after reset to ics-mr0 2011-10-24 12:56:26 -07:00
Scott Main
71b4fd0fc4 am 46b2821b: am 084369fb: docs: add uiOptions attribute to manifest docs 
* commit '46b2821b9f6701344d6c790a34f05421b8738321':
  docs: add uiOptions attribute to manifest docs
 2011-10-24 12:50:42 -07:00
Wink Saville
2417f0aee5 am 110b8a4c: am cd3ec73f: Add getAvailableNetworks. 
* commit '110b8a4cfe65991eeea2440b6b3d8ef7826f26a9':
  Add getAvailableNetworks.
 2011-10-24 12:50:41 -07:00
Scott Main
46b2821b9f am 084369fb: docs: add uiOptions attribute to manifest docs 
* commit '084369fb5e738e4db6ae94b4e24e777bdd9d9c2c':
  docs: add uiOptions attribute to manifest docs
 2011-10-24 12:46:39 -07:00
Wink Saville
110b8a4cfe am cd3ec73f: Add getAvailableNetworks. 
* commit 'cd3ec73f0ce164c718146bc1dbb7c430763be25a':
  Add getAvailableNetworks.
 2011-10-24 12:46:21 -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
Xavier Ducrohet
35530d7787 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: I0e99c1bfe1fcb7714e481524b4d0e1864bb1cb69
 2011-10-24 12:27:53 -07:00
Svetoslav Ganov
339dc6c245 am bddc8354: Merge "Adding APIs to enable reporting virtual view hierarchies to accessibility serivces." 
* commit 'bddc835436f4ebaf902bfcb69715a736bcaa102a':
  Adding APIs to enable reporting virtual view hierarchies to accessibility serivces.
 2011-10-24 12:07:01 -07:00
Svetoslav Ganov
bddc835436 Merge "Adding APIs to enable reporting virtual view hierarchies to accessibility serivces." 2011-10-24 12:05:38 -07:00
Scott Main
084369fb5e docs: add uiOptions attribute to manifest docs 
Change-Id: Ibe2960b6a4ee4e2d4a47e4acc7c197d68702d1e6
 2011-10-24 11:38:29 -07:00
Peter Ng
4c4153aab5 am 723fe126: Merge "Stat notify image update" 
* commit '723fe12644c7758772cb0b119cfcf73b30a6e4e0':
  Stat notify image update
 2011-10-24 11:24:27 -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
Peter Ng
723fe12644 Merge "Stat notify image update" 2011-10-24 10:55:30 -07:00
The Android Open Source Project
f79d731874 am 3c5b65c9: Reconcile with ics-mr0-release 
* commit '3c5b65c95ea4814cbf9c0a3904a9ee13cf41d5c3':
  mDirtyRegion is single threaded, but could be accessed from a hwc thread
 2011-10-24 07:44:45 -07:00
The Android Open Source Project
3c5b65c95e Reconcile with ics-mr0-release 
Change-Id: I8530d709cfd162fdca2cb2d1b6a0bf1bc46b3f66
 2011-10-24 06:32:19 -07:00
Jeff Brown
044966aef3 Use libcorkscrew for stack unwinding. 
Change-Id: Iee1ee5a2018ab8cfc1ce12ec2a124809245eaa02
 2011-10-22 15:44:12 -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
Claudia de Veaux
13a6ad89df String scrub to implement punc, wording, cap standards. 
Bugs: 5165745, 5163232, 5162668, 5162667, 5162328

Change-Id: Ia0417a00f236660134ca86f91a78c92dc94d4ed0

More edits after self-review.
 2011-10-21 18:25:34 -07:00
Jake Hamby
50f3603b28 am 3f06110d: Merge "Add support for SMS-PP data download to USIM." 
* commit '3f06110dd0f0f72a38520482b85efa320f7be8e0':
  Add support for SMS-PP data download to USIM.
 2011-10-21 17:06:14 -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
Robert Greenwalt
49348e77b6 Fix Tethering settings. 
Two issues.  A mcc/mnc-driven overlay means that the config at boot may not be
the config we wish to use - the sim card is read later which may switch the
config.  Changed to read the configuration each time rather than once at boot.
Second, the secure-setting override was always trumping the resource config
as we weren't discriminating between a not-set default and a real setting.
This meant the config could never make DUN-required.

bug:5495862
Change-Id: Icd4e90ac1d32bbb704c0ff9cc69e954fb0a0b58c
 2011-10-21 17:01:39 -07:00
Peter Ng
5eefe4e200 am cfb9df67: (-s ours) am be25d5b0: (-s ours) Merge "Do not merge - Recents background protection increased" into ics-mr0 
* commit 'cfb9df6710b3bbb60dcd06bd65fb9ad1304cd348':
  Do not merge - Recents background protection increased
 2011-10-21 17:00:04 -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
08896e72c5 am b9c903fd: Merge "Fix rebuildWebTextView issues" 
* commit 'b9c903fdfab4f889b8fad3b8cc05075efeb13f00':
  Fix rebuildWebTextView issues
 2011-10-21 16:37:30 -07:00
John Reck
b9c903fdfa Merge "Fix rebuildWebTextView issues" 2011-10-21 16:35:50 -07:00
Xavier Ducrohet
fd5dee1254 am 2f4ce2ec: Merge "Fix software GL renderer." 
* commit '2f4ce2ecd08e06ff02c69d3ddca9943f8e9f7955':
  Fix software GL renderer.
 2011-10-21 16:23:56 -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
Mike Lockwood
aa960113ff Merge "SettingsProvider: Allow overridding default value for Setttings.Secure.DEVICE_PROVISIONED" into ics-aah 2011-10-21 16:09:30 -07:00
Mathias Agopian
c0f48f60f7 am 9ec98cd1: am aa938c8d: Merge "mDirtyRegion is single threaded, but could be accessed from a hwc thread" into ics-mr0 
* commit '9ec98cd134a3d698bc3ee7a62c02c7818e8b02af':
  mDirtyRegion is single threaded, but could be accessed from a hwc thread
 2011-10-21 16:03:45 -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
0f4b48c45f am 1625b2af: (-s ours) am 148d5bd8: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 
* commit '1625b2af03640e810230c09953f6fbc381fb50b9':
  Import revised translations.  DO NOT MERGE
 2011-10-21 15:59:35 -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
5e04714dbe am 6d93ea74: Merge "Recents background protection increased" 
* commit '6d93ea74956277142213c5cf12b1eb5814ba7b7e':
  Recents background protection increased
 2011-10-21 15:24:26 -07:00