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

83563 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Sandler
a6aef1bbb4 Merge "New status bar capable of multiple sliding panels." into jb-mr1-dev 2012-08-14 07:56:44 -07:00
Steve Block
c723e35336 Clean up JavaDoc for CookieManager 
Bug: 5461416
Change-Id: I0ae09943007cf3866daad97a76f5008e61c471ed
 2012-08-14 15:54:38 +01:00
Steve Block
27f3e32ee1 Clarify JavaDoc for WebView.loadData() 
Bug: 5461416
Change-Id: I3f0955677ea64bb4073c97aabea34096298cd710
 2012-08-14 15:54:35 +01:00
The Android Automerger
07599e8fca merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-14 07:07:18 -07:00
Daniel Hansson
4b71686d09 Keep keyguard from starting after finished call when screen is on 
Previously keyguard would start after a call ended, even though
the screen was on, if the screen had not been turned off since
phone startup.

Change-Id: I03c18a0bb2a58760614645871f4703afb9a0677d
 2012-08-14 13:42:36 +02:00
Matthew Xie
3fe98084e6 am 58de1427: Merge "Implement enableNoAutoconnect()" into jb-mr1-dev 
* commit '58de1427c313e0debf2a929931e8c4065d4d46c5':
  Implement enableNoAutoconnect()
 2012-08-14 00:39:16 -07:00
Matthew Xie
58de1427c3 Merge "Implement enableNoAutoconnect()" into jb-mr1-dev 2012-08-14 00:37:01 -07:00
Ganesh Ganapathi Batta
fffa86ba83 Implement enableNoAutoconnect() 
Adding enableNoAutoconnect() API support in Bluetooth service
 to let BT enable in quiet mode

Change-Id: I546f3ceb298082a9c9a698f406379470e3cc0d4f
 2012-08-14 00:18:07 -07:00
Jeff Brown
adeadda202 am caaeda95: Merge "Add a toString() method to Sensor for debugging purposes." into jb-mr1-dev 
* commit 'caaeda955bd80df9d9ab310e7ab504865a2e32e9':
  Add a toString() method to Sensor for debugging purposes.
 2012-08-13 23:17:24 -07:00
Jeff Brown
caaeda955b Merge "Add a toString() method to Sensor for debugging purposes." into jb-mr1-dev 2012-08-13 23:14:56 -07:00
Mike Lockwood
c18184f14d am 510cff94: am f02354e2: am 9064a483: Merge "Added missing USB_DEVICE_ATTACHED broadcast to running Activity" 
* commit '510cff946874b8408664c86f9935d6a38f770e82':
  Added missing USB_DEVICE_ATTACHED broadcast to running Activity
 2012-08-13 20:46:32 -07:00
Mike Lockwood
510cff9468 am f02354e2: am 9064a483: Merge "Added missing USB_DEVICE_ATTACHED broadcast to running Activity" 
* commit 'f02354e208ec7b7e0dee68e12c0b5cde86a0f20a':
  Added missing USB_DEVICE_ATTACHED broadcast to running Activity
 2012-08-13 20:45:04 -07:00
Mike Lockwood
f02354e208 am 9064a483: Merge "Added missing USB_DEVICE_ATTACHED broadcast to running Activity" 
* commit '9064a48365c131ef5f64b26ab33dd40a7d1246a7':
  Added missing USB_DEVICE_ATTACHED broadcast to running Activity
 2012-08-13 20:42:42 -07:00
Mike Lockwood
9064a48365 Merge "Added missing USB_DEVICE_ATTACHED broadcast to running Activity" 2012-08-13 19:59:38 -07:00
Scott Main
183bf11697 docs: misc bug fixes from external issues 
Change-Id: I380b65341200c0519a93e2f8969f70f64aec0264
 2012-08-13 19:12:13 -07:00
Joe Malin
ad4abf7dca am 863b19bc: Merge "Bug 6954576: Typos and errors in topic" into jb-mr1-dev 
* commit '863b19bc8fcfa436011781b67a237fcce3cb703a':
  Bug 6954576: Typos and errors in topic
 2012-08-13 18:05:02 -07:00
Nick Kralevich
f5fb3bdf7c am ab7cd91a: Merge "Spelling." into jb-mr1-dev 
* commit 'ab7cd91a799bb1eb3410045f1449642179a4a76e':
  Spelling.
 2012-08-13 18:02:19 -07:00
Joe Malin
863b19bc8f Merge "Bug 6954576: Typos and errors in topic" into jb-mr1-dev 2012-08-13 18:02:16 -07:00
Christopher Tate
f5c0cf9083 am bf7d2220: Merge "Don\'t back up / restore non-primary users\' data" into jb-mr1-dev 
* commit 'bf7d222011bcb417a2d6ab0f086b25e1608445cb':
  Don't back up / restore non-primary users' data
 2012-08-13 18:00:42 -07:00
Nick Kralevich
ab7cd91a79 Merge "Spelling." into jb-mr1-dev 2012-08-13 17:59:55 -07:00
Christopher Tate
bf7d222011 Merge "Don't back up / restore non-primary users' data" into jb-mr1-dev 2012-08-13 17:58:40 -07:00
Nick Kralevich
13cd6420a0 Spelling. 
Change-Id: Ie69d99139355b66e9bb62087cd5f6cd677a51cfa
 2012-08-13 17:52:17 -07:00
Christopher Tate
aac71ff465 Don't back up / restore non-primary users' data 
For now only the device owner "user" gets cloud backups.  Also, only the
device owner account has access to local backup/restore.

Bug 6956438

Change-Id: I87d7ba5969e606c23f4214469f9bf2fd47a6c61b
 2012-08-13 17:36:14 -07:00
Wink Saville
f069c7f58d am ae5ac108: Merge "Fix build." into jb-mr1-dev 
* commit 'ae5ac108b03214e02781a92592f7913ada8ef2d4':
  Fix build.
 2012-08-13 17:34:07 -07:00
Wink Saville
ae5ac108b0 Merge "Fix build." into jb-mr1-dev 2012-08-13 17:30:57 -07:00
Dianne Hackborn
fd96eb05ba am 1866f68d: Merge "Modify how the background process LRU list is handled." into jb-mr1-dev 
* commit '1866f68dfe35da46995e5f2321f33e8fee44bcf8':
  Modify how the background process LRU list is handled.
 2012-08-13 17:17:11 -07:00
Dianne Hackborn
dabd459f90 am 87c42b99: Merge "Small service cleanup." into jb-mr1-dev 
* commit '87c42b9978bde888c3fd2d94e9d52256e56c3187':
  Small service cleanup.
 2012-08-13 17:17:07 -07:00
Dianne Hackborn
1866f68dfe Merge "Modify how the background process LRU list is handled." into jb-mr1-dev 2012-08-13 17:15:04 -07:00
Dianne Hackborn
87c42b9978 Merge "Small service cleanup." into jb-mr1-dev 2012-08-13 17:14:04 -07:00
Dianne Hackborn
f88dd0b32e Small service cleanup. 
Get rid of duplication between find/retrieve service funcs; when
a service in a persistent process crashes, restart it immediately
since the persistent process is going to be immediately restarted
anyway; when a new process is attaching, immediately restart any
services associated with it that are waiting to restart, since
it is weird to not let them run if the process comes back for some
other reason.

Change-Id: Id087fe04ebf2b6a4bd00732796c8326364765ea7
 2012-08-13 17:11:47 -07:00
Dianne Hackborn
ee7621c0f5 Modify how the background process LRU list is handled. 
A long time ago, we had a concept of an "empty" process -- this was
a process that didn't have any interesting components in it, which
would be placed below everything else in the LRU list.

Empty processes didn't work out well, because you could get into
bad situations where you have filled your LRU list with things that
have hidden activities, pushing empty processes to the bottom and
being immediately killed as soon as they go into the list.  So this
was removed.

This change brings the concept back, but in a slightly different
form, to address a more specific problem: for people who are switching
between N different applications, we would like to try to keep those
activities available in RAM in a consistent manner.  Currently the
previous activities would be killed often quickly and suprisingly,
even on devices with lots of RAM.  This is for two reasons:

(1) As you sit in one application, other things going on in the
background will go to the top of the LRU list, pushing down the
previous apps you have visited, even though you aren't aware at all
of these other things executing.
(2) There is a hard limit on the number of background processes
(currently 16) after which they are killed regardless of the amount
of available RAM.  This is desireable because if there is lots of
RAM we can end up with tons and tons of processes sitting around,
not really serving any purpose, but using up resources.

To improve the situation, we have again a concept of "empty" processes
but now it means one with no activities.  Processes that aren't empty
but in the background list are called hidden.  We maintain these as
two parallel lists, each getting half of the process limit: so with
a 16 process limit, you can have at most 8 empty and 8 hidden processes.

This allows us to consistently keep up to 8 recent applications around
for fast app switching; we will also keep around 8 other processes to
make it more efficient for background work to execute again if it needs
to.

Change-Id: Iee06e45efc20787da6a1e50020e5421c28204bd7
 2012-08-13 17:09:19 -07:00
Peter Ng
7e78eb0d9f am 806d53c3: am 55ed7e34: am 3e504ac7: Merge "Multiple design styleguide fixes -Changing extras to videos -new bullet item in swipeviews -new in 4.0 removal -Ui overview notification info -reppling typo fixed" into jb-dev 
* commit '806d53c3db6588920e3d704b184c9b7e9474338d':
  Multiple design styleguide fixes -Changing extras to videos -new bullet item in swipeviews -new in 4.0 removal -Ui overview notification info -reppling typo fixed
 2012-08-13 17:01:08 -07:00
Peter Ng
d6bbf913fe am 97b6f6cf: am ab0b9a9e: am 68432f76: Merge "updated downloads for styleguide -new illustrator stencil" into jb-dev 
* commit '97b6f6cf9ad5c24e3626b69070e92e36d5173b14':
  updated downloads for styleguide -new illustrator stencil
 2012-08-13 17:00:59 -07:00
Peter Ng
806d53c3db am 55ed7e34: am 3e504ac7: Merge "Multiple design styleguide fixes -Changing extras to videos -new bullet item in swipeviews -new in 4.0 removal -Ui overview notification info -reppling typo fixed" into jb-dev 
* commit '55ed7e34b981e9725f664587c6ca1f43d78c3f6e':
  Multiple design styleguide fixes -Changing extras to videos -new bullet item in swipeviews -new in 4.0 removal -Ui overview notification info -reppling typo fixed
 2012-08-13 16:59:07 -07:00
Peter Ng
97b6f6cf9a am ab0b9a9e: am 68432f76: Merge "updated downloads for styleguide -new illustrator stencil" into jb-dev 
* commit 'ab0b9a9e4ec14d556d4c831168e09714c795fa4a':
  updated downloads for styleguide -new illustrator stencil
 2012-08-13 16:58:59 -07:00
Peter Ng
5169a6335f am 6fc1be55: am f059e531: am 250da641: Merge "Revert "Group revert of the following commits for design docs:"" into jb-dev 
* commit '6fc1be557060a1d6c096f066eae958e07b19b73b':
  Revert "Group revert of the following commits for design docs:"
 2012-08-13 16:58:20 -07:00
Peter Ng
6fc1be5570 am f059e531: am 250da641: Merge "Revert "Group revert of the following commits for design docs:"" into jb-dev 
* commit 'f059e531506da8c053324caa3108a932d72da7b3':
  Revert "Group revert of the following commits for design docs:"
 2012-08-13 16:57:15 -07:00
Peter Ng
55ed7e34b9 am 3e504ac7: Merge "Multiple design styleguide fixes -Changing extras to videos -new bullet item in swipeviews -new in 4.0 removal -Ui overview notification info -reppling typo fixed" into jb-dev 
* commit '3e504ac71715a1b152494c9765f41d13bc605b75':
  Multiple design styleguide fixes -Changing extras to videos -new bullet item in swipeviews -new in 4.0 removal -Ui overview notification info -reppling typo fixed
 2012-08-13 16:57:05 -07:00
Peter Ng
ab0b9a9e4e am 68432f76: Merge "updated downloads for styleguide -new illustrator stencil" into jb-dev 
* commit '68432f7691085b82096518f47703d59e83cb934d':
  updated downloads for styleguide -new illustrator stencil
 2012-08-13 16:56:57 -07:00
Peter Ng
f059e53150 am 250da641: Merge "Revert "Group revert of the following commits for design docs:"" into jb-dev 
* commit '250da641302aa98c91855f195cc881880aa69172':
  Revert "Group revert of the following commits for design docs:"
 2012-08-13 16:55:08 -07:00
Peter Ng
3e504ac717 Merge "Multiple design styleguide fixes -Changing extras to videos -new bullet item in swipeviews -new in 4.0 removal -Ui overview notification info -reppling typo fixed" into jb-dev 2012-08-13 16:53:28 -07:00
Peter Ng
68432f7691 Merge "updated downloads for styleguide -new illustrator stencil" into jb-dev 2012-08-13 16:53:28 -07:00
Peter Ng
250da64130 Merge "Revert "Group revert of the following commits for design docs:"" into jb-dev 2012-08-13 16:52:38 -07:00
Wink Saville
2900a3fae6 Fix build. 
I tried to get these into the merge conflict resolution,
but didn't succeed.

Change-Id: Id474415869182da438c09f7a75ee54c098fbc81e
 2012-08-13 16:50:30 -07:00
John Spurlock
9450252e94 Stop screensaver on incoming phone call. 
Use notification manager as an indicator of when to stop the screensaver
due to immediately-needed user interaction.

Any notification with a fullScreenIntent will now exit the screensaver.

Bug: 6976796
Change-Id: Id91cd4c32f3fad018b56f4dfe24b37110bab32d8
 2012-08-13 16:34:37 -07:00
Wink Saville
436f537279 am ee8655c6: am 2605aeeb: am b17a583a: Merge "Fix interface name for tethering" 
* commit 'ee8655c6739cdfb35f192b05d8d4d84402e0d956':
  Fix interface name for tethering
 2012-08-13 16:29:47 -07:00
Wink Saville
ee8655c673 am 2605aeeb: am b17a583a: Merge "Fix interface name for tethering" 
* commit '2605aeeb30e39c2616bbe6ff088d1ed0020b4a3b':
  Fix interface name for tethering
 2012-08-13 16:27:35 -07:00
Wink Saville
2605aeeb30 am b17a583a: Merge "Fix interface name for tethering" 
* commit 'b17a583a3acc57db845993599e4de56e91d5e75a':
  Fix interface name for tethering
 2012-08-13 16:24:15 -07:00
Baligh Uddin
718cfe94fc am 9e1b5846: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '9e1b5846d6f85b7e0ea96a65d3cb1fecd0f568d4':
  Import translations. DO NOT MERGE
 2012-08-13 16:10:53 -07:00
Baligh Uddin
9e1b5846d6 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-13 16:07:41 -07:00