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

86861 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Wren
f0cec427a4 Merge "remove debug logs." into jb-mr1-lockscreen-dev 2012-10-24 13:27:40 -07:00
Victoria Lease
405e6746c6 am f704e9f6: Merge "revise android.location.Geofence documentation" into jb-mr1-dev 
* commit 'f704e9f67745d1f1c01058f4c74b06d157b4054d':
  revise android.location.Geofence documentation
 2012-10-24 13:26:38 -07:00
Chris Wren
dc0d12278a remove debug logs. 
Change-Id: I8d0066bdce1c93c7a3da0fa36d865c674e5dcd40
Proto-Id: I7ac6b8c8a664dbd7abda089fcd9edb8d7ccc3208
 2012-10-24 16:26:34 -04:00
Victoria Lease
f704e9f677 Merge "revise android.location.Geofence documentation" into jb-mr1-dev 2012-10-24 13:23:21 -07:00
Adam Cohen
a9f166695b Merge "Fading side pages as per mock" into jb-mr1-lockscreen-dev 2012-10-24 13:18:39 -07:00
Adam Cohen
6fb841fa21 Fading side pages as per mock 
-> Also, adding side pages hints when keyguard is inflated

Change-Id: I33f073ed97510a5982cddc4ee95f1ee3ed3c9397
 2012-10-24 13:15:38 -07:00
Chris Wren
ff8722574e Merge "catch exceptional cases on factory-fresh devices." into jb-mr1-lockscreen-dev 2012-10-24 13:07:29 -07:00
Chris Wren
28c5ee9ea9 catch exceptional cases on factory-fresh devices. 
Change-Id: I2019b4f31415efba72b5a3b5d659e41595e506f6
Proto-Id: I8a57f9f6f5b7339df3e243ecc51fb311f6ac8981
 2012-10-24 16:05:14 -04:00
Christopher Tate
698e144f70 am acf5943c: Merge "Fix the Backup Manager\'s uninstall tracking" into jb-mr1-dev 
* commit 'acf5943c44d34845386afe7946aed086f8b3e87e':
  Fix the Backup Manager's uninstall tracking
 2012-10-24 12:27:47 -07:00
Christopher Tate
acf5943c44 Merge "Fix the Backup Manager's uninstall tracking" into jb-mr1-dev 2012-10-24 12:24:51 -07:00
Baligh Uddin
985dc14264 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-10-24 12:19:01 -07:00
Baligh Uddin
2171fa1cd3 am 0fa4cf5b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '0fa4cf5bb57d1c116db6b07256afa224619c461f':
  Import translations. DO NOT MERGE
 2012-10-24 12:17:09 -07:00
Jeff Brown
d9fb5848c8 am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev 
* commit '1202c43685c475158a773d03d70effa01b6bb4ff':
  Secure windows, secure surface views and secure displays.
 2012-10-24 12:17:04 -07:00
Baligh Uddin
0fa4cf5bb5 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-24 12:15:05 -07:00
Jeff Brown
1202c43685 Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev 2012-10-24 12:14:08 -07:00
Baligh Uddin
c1e2466502 Import translations. DO NOT MERGE 
Change-Id: I035193bae4235a54f721473ff5db4f63e1b1b4ae
Auto-generated-cl: translation import
 2012-10-24 12:10:45 -07:00
Baligh Uddin
c1b2060b17 Import translations. DO NOT MERGE 
Change-Id: I60e51769668cbf4823155238a51cdac84b4b49af
Auto-generated-cl: translation import
 2012-10-24 12:08:18 -07:00
Zhihai Xu
11181c7ae6 am 8e080d7e: Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev 
* commit '8e080d7e10dd17662750605538a9799af66494e9':
  License of files Bluetooth package is not updated to ASL2
 2012-10-24 11:01:15 -07:00
Dirk Dougherty
7833ea17ad am d8d83faa: am cde979d2: am 3d087920: am 76cdbdc8: Doc change: update develop landing page content. 
* commit 'd8d83faae8101cda0c4f6fa2616d6b4c596e7d75':
  Doc change: update develop landing page content.
 2012-10-24 11:01:10 -07:00
Dianne Hackborn
cc9106bb7a am ecf4725e: Merge "Fix issue #7401818: Wrong transition animation when clearing task" into jb-mr1-dev 
* commit 'ecf4725ef4e753a2ef08205c922391753eb3803f':
  Fix issue #7401818: Wrong transition animation when clearing task
 2012-10-24 11:01:07 -07:00
Dave Burke
4d56a16728 am 799916e6: Merge "Revert "Check non-primary user dirs during package scan"" into jb-mr1-dev 
* commit '799916e6ac706921e43a3382e5d9e06e13f87525':
  Revert "Check non-primary user dirs during package scan"
 2012-10-24 11:00:31 -07:00
Eric Laurent
22df26cac2 am f52cbb6b: Merge "AudioService: add fix for corrupted settings" into jb-mr1-dev 
* commit 'f52cbb6b1800fc2b338e8c0883170567fcd0447a':
  AudioService: add fix for corrupted settings
 2012-10-24 11:00:11 -07:00
Kenny Root
16106a7641 am 92bc9b31: PMS: check outInfo for null during delete 
* commit '92bc9b3196907a76d4b73c3f361d41c14dfd7f5c':
  PMS: check outInfo for null during delete
 2012-10-24 11:00:01 -07:00
Dianne Hackborn
a4dcf311c1 am 56e75631: Merge "Fix issue #7342364: JellyBean broke Toddler Lock, again" into jb-mr1-dev 
* commit '56e75631bd737e5362309330d4839cc1dddb501c':
  Fix issue #7342364: JellyBean broke Toddler Lock, again
 2012-10-24 10:59:40 -07:00
Svetoslav Ganov
40ca868a08 am e1655c98: (-s ours) Merge "When A11y is on, use a longer interval between lockout announcements." into jb-mr1-dev 
* commit 'e1655c980d28b953597727d2c7832b442ca926cc':
  When A11y is on, use a longer interval between lockout announcements.
 2012-10-24 10:59:36 -07:00
Zhihai Xu
8e080d7e10 Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev 2012-10-24 10:44:16 -07:00
Dirk Dougherty
d8d83faae8 am cde979d2: am 3d087920: am 76cdbdc8: Doc change: update develop landing page content. 
* commit 'cde979d2fdc9cf7517819b896ca46a7d7768ff43':
  Doc change: update develop landing page content.
 2012-10-24 10:43:44 -07:00
Dirk Dougherty
cde979d2fd am 3d087920: am 76cdbdc8: Doc change: update develop landing page content. 
* commit '3d0879201d4c1c660f0ff3b8fc63410298cd9264':
  Doc change: update develop landing page content.
 2012-10-24 10:40:30 -07:00
Victoria Lease
b17223b6f5 revise android.location.Geofence documentation 
Bug: 7172696
Change-Id: Ib1a104ee4a97c51996200b8d456face66178115f
 2012-10-24 10:40:07 -07:00
Dirk Dougherty
3d0879201d am 76cdbdc8: Doc change: update develop landing page content. 
* commit '76cdbdc848153680d27e8f7abd6281c0f95d793e':
  Doc change: update develop landing page content.
 2012-10-24 10:38:45 -07:00
John Spurlock
86b6357e5e Manual f/b merge of lockhotness camera integration. 
Change-Id: I5c7c3c49e13656e9ba4a3761be7d503642d5b76f
 2012-10-24 13:30:02 -04:00
Dianne Hackborn
ecf4725ef4 Merge "Fix issue #7401818: Wrong transition animation when clearing task" into jb-mr1-dev 2012-10-24 10:28:30 -07:00
Dirk Dougherty
76cdbdc848 Doc change: update develop landing page content. 
Change-Id: I1b3639e4097650d9182b8e2bf213f1603ee17e10
 2012-10-24 10:23:37 -07:00
Dave Burke
799916e6ac Merge "Revert "Check non-primary user dirs during package scan"" into jb-mr1-dev 2012-10-23 23:14:15 -07:00
Dave Burke
383fa18b51 Revert "Check non-primary user dirs during package scan" 
This reverts commit 4525f5b69cb44a9a0c92f9c525fc47541f456621

Change-Id: I31b7a0860972532478ab3420556b806bfa78739a
 2012-10-23 23:12:19 -07:00
Adam Powell
848a5557db Merge "Fix up GlowPadView attributes" into jb-mr1-lockscreen-dev 2012-10-23 21:54:42 -07:00
Eric Laurent
f52cbb6b18 Merge "AudioService: add fix for corrupted settings" into jb-mr1-dev 2012-10-23 21:18:28 -07:00
Jeff Brown
f0681b34df Secure windows, secure surface views and secure displays. 
Add new API to determine whether a display is secure.
Add new API to make a SurfaceView secure.
Clarify documentation.

Bug: 7368436
Change-Id: I7068c34c910e43b4bc72e43fa0dded59a25f0fe2
 2012-10-23 20:37:40 -07:00
Eric Laurent
d799db406b AudioService: add fix for corrupted settings 
Added correction of MODE_RINGER_STREAMS_AFFECTED setting in
case it is inconsistent when read from the database: ringtone,
notification and system streams are always affected by ringer mode.
A corruption of this setting persists accross reboots and propagates via
backup/restore causing devices to play notification and ringtones in silent mode.

Bug 7384750.

Change-Id: I23170413d01e6a8e34ef514f1516d7b9ab8bc656
 2012-10-23 20:14:27 -07:00
Jim Miller
19a5267003 Merge latest prototype changes into keyguard 
Change-Id: Ibec6e9a7667ec730a25a58226c3203332af64b24
 2012-10-23 19:52:04 -07:00
Dianne Hackborn
9622ca4f88 Fix issue #7401818: Wrong transition animation when clearing task 
When we are clearing activities off the top of a task, propagate
any activity options down from the top-most one to whatever top
activity we are keeping.  This ensures that if we set the activity
options on the top activity of the task previously to give it the
correct animation, we still keep that animation for the activity
that really ends up being the top.

Change-Id: I6919b644a530ac283fe4d320496edc2bf72aa04e
 2012-10-23 18:56:33 -07:00
Kenny Root
92bc9b3196 PMS: check outInfo for null during delete 
It appears that changing an application's signature during boot can pass
an outInfo of null to this function.

Bug: 7402550
Change-Id: I839fea6c8ee728a352c6b906f0fa6671c85f8694
 2012-10-23 17:44:26 -07:00
Dianne Hackborn
56e75631bd Merge "Fix issue #7342364: JellyBean broke Toddler Lock, again" into jb-mr1-dev 2012-10-23 17:35:59 -07:00
Svetoslav Ganov
e1655c980d Merge "When A11y is on, use a longer interval between lockout announcements." into jb-mr1-dev 2012-10-23 17:35:24 -07:00
Zhihai Xu
fa0fd39a4b License of files Bluetooth package is not updated to ASL2 
bug 7385618

Change-Id: I6232f537f4fda979d3aabe3a059c11d3299de9b8
 2012-10-23 17:31:56 -07:00
alanv
c2798a916e When A11y is on, use a longer interval between lockout announcements. 
Bug: 7384471
Change-Id: I72ac1fe7646588c9c7185cb0186f1e990b3a2f72
 2012-10-23 17:26:17 -07:00
Kenny Root
356f2f5941 am da2509c4: Merge "Check non-primary user dirs during package scan" into jb-mr1-dev 
* commit 'da2509c434ebb2a5a0da1bc270cae7f007cbb0f9':
  Check non-primary user dirs during package scan
 2012-10-23 17:06:34 -07:00
Kenny Root
da2509c434 Merge "Check non-primary user dirs during package scan" into jb-mr1-dev 2012-10-23 17:03:09 -07:00
Craig Mautner
ce1696c22a am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev 
* commit '6757572b39d3802c4d7b69467b5ebf69a96c208b':
  Add throwing InvalidDisplayException from addView.
 2012-10-23 16:56:17 -07:00
Craig Mautner
6757572b39 Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev 2012-10-23 16:53:32 -07:00