Commit Graph

3499 Commits

Author SHA1 Message Date
Adam Powell
0c0702da64 am 9f7a5fae: am 1b17f939: Merge "Automatically supply a content description for ToolbarActionBar nav" into lmp-dev
* commit '9f7a5fae89057644244f0821f75954100ff6deaa':
  Automatically supply a content description for ToolbarActionBar nav
2014-09-03 06:13:06 +00:00
Adam Powell
12b0321c0b Automatically supply a content description for ToolbarActionBar nav
If the developer hasn't set a navigation content description on the
Toolbar assigned to be an action bar or a home-action content
description via the ActionBar interface, use the framework default
"navigate up" string.

Also make sure that the default Up description is supplied in the
screen_toolbar window decor layout and that it is parsed properly in
all toolbars, even if we don't have an icon set during construction.

Bug 17298370

Change-Id: Ie2f9e34f92046d4d4ffb9a07e38fa89581891f7b
2014-09-02 16:20:08 -07:00
Adrian Roos
e647a9a5fe am 0910b0b7: am 5e287457: Merge "Trust: Look at the security unlock method of the right user" into lmp-dev
* commit '0910b0b7229db8a826b8fc9d3a57a4dc40ded1c8':
  Trust: Look at the security unlock method of the right user
2014-09-01 21:37:24 +00:00
Adrian Roos
1572ee379e Trust: Look at the security unlock method of the right user
Follow up to Ic9e93862c722ebc529f5b2010b9cea941f569ce7.

Bug: 17107213
Change-Id: I8f3c19aedeaca3f265c98a4fb60ab74b115fca47
2014-09-01 23:03:28 +02:00
Adam Lesinski
e466091f06 am 81d63ef2: am 3335c1dc: Merge "Make UsageStats API comply with API Council" into lmp-dev
* commit '81d63ef2f2249a3be896a6ca792aeb8e2faf50fb':
  Make UsageStats API comply with API Council
2014-08-29 20:18:22 +00:00
Adam Lesinski
d6fe30be04 am b616b94b: am 247e8e84: Merge "Revert "Make UsageStats API comply with API Council"" into lmp-dev
* commit 'b616b94b63b91d17140a31ef65fa26cb261a67f4':
  Revert "Make UsageStats API comply with API Council"
2014-08-29 20:05:14 +00:00
Adam Lesinski
cc562a811d Make UsageStats API comply with API Council
- Fix documentation to mention units of time in APIs.
- Return a Map instead of an ArrayMap

Bug:17289531
Change-Id: I0a2cfdc0bc003eeeb65a16e37bb7b991624b2853
2014-08-29 12:52:41 -07:00
Adam Lesinski
25b09837d1 Merge "Revert "Make UsageStats API comply with API Council"" into lmp-dev 2014-08-29 19:42:43 +00:00
Adam Lesinski
df77a40d40 Revert "Make UsageStats API comply with API Council"
This reverts commit 3811dabe57a60e4729f67b6fdc7fbe91eb8b3e06.

Did not update current.txt

Change-Id: I93faccaf24570b1ce88ade37c00506c4a48a8a1d
2014-08-29 19:34:09 +00:00
Adam Lesinski
d57e1cb644 am f5e3785e: am 84b95b66: Merge "Make UsageStats API comply with API Council" into lmp-dev
* commit 'f5e3785e6fc2d4dcbc8ce72ad871a96421ca1f1d':
  Make UsageStats API comply with API Council
2014-08-29 19:21:28 +00:00
Adam Lesinski
a496b1a7f3 Merge "Make UsageStats API comply with API Council" into lmp-dev 2014-08-29 18:56:24 +00:00
Yohei Yukawa
4bf61aa61e am 7046f79e: am bbee6beb: Merge "Reject request when any unknown flag is speficied" into lmp-dev
* commit '7046f79ec9c9b0510af0f541f0e135b8a1ad4f5d':
  Reject request when any unknown flag is speficied
2014-08-29 18:50:18 +00:00
Yohei Yukawa
72d35fa829 Reject request when any unknown flag is speficied
Currently EditableInputConnection#requestUpdateCursorAnchorInfo
never returns false unless InputMethodManager is somehow
unavailable.

This is problematic, especifially when we add a new flag to
EditableInputConnection#requestUpdateCursorAnchorInfo in a
future release.

With this CL, #requestUpdateCursorAnchorInfo does nothing and
immediately returns false when one ore more unknown bits are
specified.

BUG: 17324806
Change-Id: I5601714b481e8efa0ad3337c0d093cfcf55eade3
2014-08-29 00:57:19 -07:00
Dianne Hackborn
85facfc1b7 am c297cc71: am f63aa97c: Merge "Fix issue #17289876: startActivityFromRecents appears to launch the wrong task" into lmp-dev
* commit 'c297cc71d1382b3a492087d64205ebe6f13b164a':
  Fix issue #17289876: startActivityFromRecents appears to launch the wrong task
2014-08-28 20:01:12 +00:00
Dianne Hackborn
2db754ac6e Merge "Fix issue #17289876: startActivityFromRecents appears to launch the wrong task" into lmp-dev 2014-08-28 19:33:08 +00:00
Dianne Hackborn
93d0678e80 am 82f7dc78: am c6273338: Merge "Fix issue #16953886: History and batterystats checkin summary..." into lmp-dev
* commit '82f7dc780dc2fb1c877fce19bea9a9e92b0a0bac':
  Fix issue #16953886: History and batterystats checkin summary...
2014-08-28 19:23:14 +00:00
Dianne Hackborn
d7c9289f93 Fix issue #17289876: startActivityFromRecents appears to launch the wrong task
It would be good to actually bring the task to the front.

Also, make the flow when inTask is provided better match what happens when
we go looking for a task on our own.

And this includes another fix that was supposed to be part of a different
change but I forgot this class is part of the framework project now.

Change-Id: I3cf05f2e585c0fd7a0dbb7c7cf9fb1655764dd93
2014-08-28 11:38:13 -07:00
Dianne Hackborn
7d9eefd871 Fix issue #16953886: History and batterystats checkin summary...
...start timestamps are in 1970s

Look for the wall clock time being very small, and try to update
it to a better value if we see one.

Also handle time change events to update the current time we a re
tracking.

Change-Id: Ifbae2b8c43ab5baa75ee4f672a752a542e23b52d
2014-08-27 18:30:31 -07:00
Adam Lesinski
c5bf108e70 Make UsageStats API comply with API Council
- Fix documentation to mention units of time in APIs.
- Return a Map instead of an ArrayMap

Bug:17289531
Change-Id: I8b07a5328a01a0f490b62bc5d9b83c959a3e79c7
2014-08-27 11:57:46 -07:00
Dianne Hackborn
940434def1 am eb7a0e4e: am 0d006c60: Fix issue #17146552: system anr
* commit 'eb7a0e4e9bcb6a18655c4f349c90216011406d75':
  Fix issue #17146552: system anr
2014-08-27 06:20:11 +00:00
Dianne Hackborn
5232271a41 Fix issue #17146552: system anr
Add a safe path for Slog.wtf that doesn't acquire an activity manager
lock or block in any way.

Change-Id: I8fef8251a0cb85081442cae55d85063944248d15
2014-08-26 22:55:47 -07:00
Adam Powell
a80c4a2296 am f6925920: am 78f0a6e5: Merge "Adjust toolbar/action bar title handling" into lmp-dev
* commit 'f692592004f011759d9a79824c156b51ab10da13':
  Adjust toolbar/action bar title handling
2014-08-27 04:46:11 +00:00
Adam Powell
4902a89103 Merge "Adjust toolbar/action bar title handling" into lmp-dev 2014-08-27 01:31:18 +00:00
Adam Powell
af2d85973e Adjust toolbar/action bar title handling
Treat activity title changes as window title changes when propagating
to action bars. This gives it lower priority if a "hard" title has
been set. Fix some lifecycle handling around this that previously
resulted in multiple calls.

Automatically detect the starting display options for a
ToolbarWidgetWrapper if we're not grabbing them from styles. This
prevents setTitle and friends from going totally out to lunch if
constructed around a Toolbar with no starting title.

Bug 17138048

Change-Id: I9f58a3d222546745c8aa873e996b8f0d52a0ad21
2014-08-26 18:28:17 -07:00
Paul Jensen
52baba9086 am dd46fb1f: am 96fff1a7: Merge "Implement VpnConfig.addAllowedApplication()." into lmp-dev
* commit 'dd46fb1f205412681eb86f1ea5535088cd55b3e3':
  Implement VpnConfig.addAllowedApplication().
2014-08-26 20:29:33 +00:00
Dianne Hackborn
302da59d8b am f1bb15d2: am 55953caa: Merge "Fix issue #16311398: Limit number of documents a process can open" into lmp-dev
* commit 'f1bb15d214bdb70e348ee7d649c1249a67434534':
  Fix issue #16311398: Limit number of documents a process can open
2014-08-26 20:13:59 +00:00
Paul Jensen
5b62d263a7 Merge "Implement VpnConfig.addAllowedApplication()." into lmp-dev 2014-08-26 20:09:00 +00:00
Dianne Hackborn
4610545dd2 Merge "Fix issue #16311398: Limit number of documents a process can open" into lmp-dev 2014-08-26 19:56:26 +00:00
Calin Juravle
ca989888e2 am e956c7f0: am 2fb4f93e: Merge "Pass vmSafeMode (manifest attribute) to installd." into lmp-dev
* commit 'e956c7f02cd51b577f46105620bb003059a2a87f':
  Pass vmSafeMode (manifest attribute) to installd.
2014-08-26 19:32:57 +00:00
Calin Juravle
d68f83cc47 Merge "Pass vmSafeMode (manifest attribute) to installd." into lmp-dev 2014-08-26 19:10:25 +00:00
Dianne Hackborn
89ad456ea4 Fix issue #16311398: Limit number of documents a process can open
In application processes, monitor for when we start getting close
to the Dalvik heap limit, and ask the activity manager to try to
prune old activity instances in that case.

Add an explicit API for apps to ask that they have their own
activity instances cleaned up, if they want.

Fix some bugs in launching activities that were not correctly
applying the "multi task" behavior in the appropriate situations
of document-centric recents.

Clean up the activity manager's process removal code to all share
a common path.

Add a new "Spam" option to ActivityTests, which continually creates
new tasks, checking that the activity manager will now prune old
tasks rather than letting the app run out of RAM.

And while I was was doing this, I found problems with the path
for bringing an empty task to the foreground -- it could make
a new task instead of re-starting the root activity in the
existing task.  This is fixed, and some code in the recents
UI for working around the bug is removed.

And as long as I am doing that, we now have nice hooks in to
the activity manager for AppTask to give some APIs for better
managing the task, so add those along with more tests for these
APIs in ActivityTests.

We should look at also having the activity manager try to prune
old tasks when it sees app processes being killed, to better balance
memory use across multiple processes when some processes may host
many documents.  That however is for another CL...

Change-Id: I2bb81c3f92819350c868c7a7470b35817eb9bea9
2014-08-26 11:16:59 -07:00
Nancy Chen
bca396d5e1 am 2ac6146c: am f9317703: Merge "API review PhoneManager -> TelecommManager. Rename methods (6/6)" into lmp-dev
* commit '2ac6146c31e2f4798b66b7fa2abdb8e853592686':
  API review PhoneManager -> TelecommManager. Rename methods (6/6)
2014-08-26 04:55:24 +00:00
Paul Lawrence
a0280916d3 am b0714550: am 518fc438: Merge "Show PIN screen with all PINs, not just simple ones" into lmp-dev
* commit 'b0714550209241bb7740ea3cee09faf2cbefd4ef':
  Show PIN screen with all PINs, not just simple ones
2014-08-26 04:52:40 +00:00
Nancy Chen
e4b1d57dfd Merge "API review PhoneManager -> TelecommManager. Rename methods (6/6)" into lmp-dev 2014-08-25 22:24:09 +00:00
Paul Jensen
0784eeab28 Implement VpnConfig.addAllowedApplication().
bug:17109588
bug:13651397
Change-Id: Ibb944794627117728373f0105e24f196f3eeb9e9
2014-08-25 15:09:25 -04:00
Paul Lawrence
396ac76fd3 Show PIN screen with all PINs, not just simple ones
Bug: 17194645
Change-Id: I8b8ccd2b7cf6dbfac567492387d4f4fd61258a34
2014-08-25 11:13:46 -07:00
Nancy Chen
0eb1e402c7 API review PhoneManager -> TelecommManager. Rename methods (6/6)
PhoneManager
- handlePinMMI docs should explain what a Pin is and what MMI is
- rename isInAPhoneCall to isInCall
- rename showCallScreen to showInCallScreen
- merge this class into TelecommManager, we don't need both

Bug: 16960458

Change-Id: I7d573e27ed093f2ddb7849703cc62f9916835393
2014-08-25 10:50:44 -07:00
Jeff Sharkey
daa88714a1 am 9f3ddd55: am e3218d35: Merge "Installing splits into ASECs!" into lmp-dev
* commit '9f3ddd551393b4fbc421156b8f700cae7dbd6a3b':
  Installing splits into ASECs!
2014-08-24 19:04:07 +00:00
Jeff Sharkey
37cf9907d2 Merge "Installing splits into ASECs!" into lmp-dev 2014-08-24 18:45:55 +00:00
Jeff Davidson
c52b5b1fc1 am 9f207f97: am 78595786: Merge "Restore legacy VPN stats dialog." into lmp-dev
* commit '9f207f97d7b04465f3ed86af1ce855f1a84c40d9':
  Restore legacy VPN stats dialog.
2014-08-23 02:48:48 +00:00
Jeff Davidson
90b1b9f985 Restore legacy VPN stats dialog.
Was originally removed in ag/522961, but restoring to keep legacy VPN
behavior the same from within VpnSettings. This dialog is only
accesible from VpnSettings and so should only ever be shown for legacy
VPNs.

Bug: 17164793
Change-Id: I06c4e136e1023b8f84edfd15a15264d2e41d325b
2014-08-22 17:06:37 -07:00
Jeff Sharkey
941a8ba1a6 Installing splits into ASECs!
Sessions can now zero-copy data directly into pre-allocated ASEC
containers.  Then at commit time, we compute the total size of the
final app, including any inherited APKs and unpacked libraries, and
resize the container in one step.

This supports both brand new ASEC installs and inheriting from
existing ASEC installs.  To keep things simple, it currently requires
copying any inherited ASEC contents, but this could be optimized in
the future.

Expose new vold resize command, and allow read-write mounting of ASEC
containers.  Move native library extraction into the installer flow,
since it needs to happen before ASEC is sealed.  Move multiArch flag
into NativeLibraryHelper, instead of making everyone pass it
around.  Migrate size calculation to shared location.

Separate "other" package name in public API, provide a path to a
storage device when relevant, and add more docs.

Bug: 16514385
Change-Id: I06c6ce588d312ee7e64cce02733895d640b88456
2014-08-22 16:25:04 -07:00
Adam Powell
9971017140 am cb3b976d: am 2ad136df: Merge "Fix (another) measurement issue in ActionBarContainer" into lmp-dev
* commit 'cb3b976da10899bc7cfcc934ebf3eae9fa5d15db':
  Fix (another) measurement issue in ActionBarContainer
2014-08-22 21:45:38 +00:00
Adam Powell
c9991c7149 Merge "Fix (another) measurement issue in ActionBarContainer" into lmp-dev 2014-08-22 21:20:24 +00:00
Elliott Hughes
fbba4317a8 am 942b8379: am 97352608: Merge "Don\'t show the pseudolocales unless we\'re in developer mode." into lmp-dev
* commit '942b8379bfc2418d4cc33d45928949508bb390c5':
  Don't show the pseudolocales unless we're in developer mode.
2014-08-22 21:03:20 +00:00
Adam Powell
2b7ff72683 Fix (another) measurement issue in ActionBarContainer
Or, the patch in which we discover how many silly bugs adamp caused in
e77b6590.

Change-Id: Iaacd3792d161e068dee74b897872e9ab2f155aca
2014-08-22 13:57:43 -07:00
Elliott Hughes
5d04fee900 Merge "Don't show the pseudolocales unless we're in developer mode." into lmp-dev 2014-08-22 20:42:19 +00:00
Yigit Boyar
eb4fd4d84c am 5ebd8379: am 907b5603: Merge "Fix RTL bug for actionbar tooltips" into lmp-dev
* commit '5ebd837951041185b53d16d71ef939fbab00a13c':
  Fix RTL bug for actionbar tooltips
2014-08-22 19:33:12 +00:00
Yigit Boyar
1960b32434 Merge "Fix RTL bug for actionbar tooltips" into lmp-dev 2014-08-22 19:15:40 +00:00
Elliott Hughes
dee5cde1ec Don't show the pseudolocales unless we're in developer mode.
The old zz_ZY and zz_ZZ pseudolocales are gone, replaced by ar_XB and en_XA.
The existing check for "developer mode" wasn't working, and now the
pseudolocales are there by default, we want to _remove_ them if we're not
in developer mode rather than add them if we are in developer mode.

Bug: 17190407
Change-Id: I6ee6eba53f5b816ef8e0d1768c94cd3484a196b5
2014-08-22 11:57:15 -07:00