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
Kenny Root
24791b3864
am d3d78a67: am 0b4771e0: am 28dba4fc: Merge "Update preloaded-classes for JB"
...
* commit 'd3d78a67c48cf8331ff48612a382f244237807d3':
Update preloaded-classes for JB
2012-08-13 16:05:31 -07:00
Wink Saville
5af8a7666a
am 54d535bd: Merge "Merge commit \'e0df2c4f\' into fix-merge-conflict" into jb-mr1-dev
...
* commit '54d535bd57a2873e1e34b7a42cef14ace8e1d694':
Telephony: Signal Strength cleanup & LTE support
2012-08-13 16:03:34 -07:00
Kenny Root
d3d78a67c4
am 0b4771e0: am 28dba4fc: Merge "Update preloaded-classes for JB"
...
* commit '0b4771e02f77c540f3f198cfadd7ad716901a2b1':
Update preloaded-classes for JB
2012-08-13 16:03:14 -07:00
Wink Saville
54d535bd57
Merge "Merge commit 'e0df2c4f' into fix-merge-conflict" into jb-mr1-dev
2012-08-13 16:01:02 -07:00
Baligh Uddin
3bf5d71288
am bc6ee344: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'bc6ee3447aea457b3297bb68df5ba053d55adad4':
Import translations. DO NOT MERGE
2012-08-13 15:56:20 -07:00
Wink Saville
c1e68d133c
Merge commit 'e0df2c4f' into fix-merge-conflict
...
* commit 'e0df2c4f':
Telephony: Signal Strength cleanup & LTE support
Change-Id: I655fcc0cf430820a50a8751ac132c73f7d8e0c6f
2012-08-13 15:53:19 -07:00
Baligh Uddin
bc6ee3447a
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-13 15:53:15 -07:00
Wink Saville
b17a583a3a
Merge "Fix interface name for tethering"
2012-08-13 15:37:09 -07:00
Vishal Mahaveer
a6b6556082
Fix interface name for tethering
...
Fix the interface name used in stopTethering
Change-Id: I3a8fb80c3c6cd382e7641d1735bff85d8a938ee9
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
2012-08-13 15:07:24 -07:00
John Spurlock
1e33ce8b43
am 460847c7: Merge "Stop screensaver on incoming phone call." into jb-mr1-dev
...
* commit '460847c70d6d7f75addd8cb0ffa091755821c0dd':
Stop screensaver on incoming phone call.
2012-08-13 14:37:44 -07:00
John Spurlock
460847c70d
Merge "Stop screensaver on incoming phone call." into jb-mr1-dev
2012-08-13 14:34:44 -07:00
Amith Yamasani
167a4ffd06
am b26295b7: Merge "Tests for mapping android name to uid" into jb-mr1-dev
...
* commit 'b26295b7a0bc23deb2987c4ff10810c3ce2f1869':
Tests for mapping android name to uid
2012-08-13 14:00:48 -07:00
Amith Yamasani
b26295b7a0
Merge "Tests for mapping android name to uid" into jb-mr1-dev
2012-08-13 13:58:32 -07:00
Amith Yamasani
dc09102c8d
Tests for mapping android name to uid
...
This tests some changes made to bionic.
Change-Id: I7ff8c7f94f6b4bfff64d4e15d4a1a3516a453180
2012-08-13 13:51:01 -07:00
John Spurlock
7be1a3d67c
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:45:12 -04:00
Peter Ng
02123630ca
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
Bug: 6936546
Bug: 6936394
Bug: 6958972
Bug: 6960355
Bug: 6937850
Bug: 6937856
Bug: 6912380
Bug: 6941255
Bug: 6937723
Bug: 5836846
Bug: 6915055
Bug: 6915259
Bug: 6651973
Bug: 6937070
Bug: 6947018
Bug: 6924456
Bug: 6915152
Bug: 6936797
Bug: 6924201
Bug: 6922994
Bug: 6924137
Bug: 6907998
Bug: 6912377
Bug: 6937761
Bug: 6923664
Bug: 6946790
Bug: 6918869
Change-Id: Ic5f39fe5b9f56c911af8bde9a254007748f6530e
2012-08-13 13:22:21 -07:00
Baligh Uddin
3e300c4693
Import translations. DO NOT MERGE
...
Change-Id: I95bed23285699c68b623ae0e36600ec5e813db8c
Auto-generated-cl: translation import
2012-08-13 13:20:03 -07:00
Daniel Sandler
08d05e3d1d
New status bar capable of multiple sliding panels.
...
There are some visual glitches but almost everything should
be put back pretty much where it was.
Change-Id: I2f9b0591d44599b07bd83f03c4e09e6dd98e1448
2012-08-13 15:23:51 -04:00
Kenny Root
0b4771e02f
am 28dba4fc: Merge "Update preloaded-classes for JB"
...
* commit '28dba4fc394f0736e1d7bdf5601382c19c08f518':
Update preloaded-classes for JB
2012-08-13 12:00:35 -07:00