Commit Graph

3665 Commits

Author SHA1 Message Date
Dianne Hackborn
95ccfd9950 am 80cb4a01: am 8c7605b1: Merge "Fix issue #17397177: BatteryStats reporting error on job start/stop" into lmp-dev
* commit '80cb4a012b57110246a17e4110ccadb5bd232c55':
  Fix issue #17397177: BatteryStats reporting error on job start/stop
2014-09-06 01:09:57 +00:00
Dianne Hackborn
ce78347c37 Merge "Fix issue #17397177: BatteryStats reporting error on job start/stop" into lmp-dev 2014-09-06 00:49:28 +00:00
Dianne Hackborn
c3940bc1ba Fix issue #17397177: BatteryStats reporting error on job start/stop
Dumb, dumb, dumb mistake.

Also fix battery stats wakeup reason tracking to use a SamplingTimer
(like kernel wake locks) so we can track both the duration and count
for each wakeup reason.

Change-Id: I89d69661006dc533622b1b7e68a139166d3a6975
2014-09-05 17:33:06 -07:00
Anwar Ghuloum
248b369661 Merge "Timing Hacks DO NOT MERGE" into lmp-dev 2014-09-05 14:22:51 +00:00
Anwar Ghuloum
629dc18013 Timing Hacks DO NOT MERGE
Let's submit to see any lingering effects.

Bug: 17310019
Change-Id: I791bceec0b6aa8b80ac4e6c582a10c3f0ec7a906
2014-09-05 07:17:39 -07:00
Adam Powell
a46bdef5a8 am ce9978b5: am c3b7ca91: Merge "Menu callbacks for ToolbarActionBars, part 2" into lmp-dev
* commit 'ce9978b5fed0f941bf3613910d58c3d1538660b0':
  Menu callbacks for ToolbarActionBars, part 2
2014-09-05 04:26:05 +00:00
Adam Powell
c461250424 Menu callbacks for ToolbarActionBars, part 2
Pass through the menu mode change events and make sure Activities get
prepare/open/close events properly.

Bug 17326424

Change-Id: I0ac2f56e4d0054ef01720b2ff1c41ded053750c7
2014-09-04 19:16:39 -07:00
Adam Powell
7701884dd0 am f34ce09c: am 2e9f1521: Merge "Dispatch more menu events to window callbacks from ToolbarActionBar" into lmp-dev
* commit 'f34ce09c34591d16eb1cdf82fb4cb9af6855ffce':
  Dispatch more menu events to window callbacks from ToolbarActionBar
2014-09-05 00:41:01 +00:00
Adam Powell
e50a26f3d8 Merge "Dispatch more menu events to window callbacks from ToolbarActionBar" into lmp-dev 2014-09-05 00:26:30 +00:00
Adam Powell
04c0d46078 Dispatch more menu events to window callbacks from ToolbarActionBar
Wire through the callbacks that result in onPrepareOptionsMenu being
called properly when an activity overflow menu is opened.

Bug 17326424

Change-Id: Ifc5b67af0d215f210bb00326f82f60ba55a36d52
2014-09-04 16:25:26 -07:00
Andreas Gampe
dc84c6ca86 resolved conflicts for merge of 82ad9ec3 to lmp-dev-plus-aosp
Change-Id: I7ae05c4f1b072906932a9ed47bdbad881b8e0d37
2014-09-04 16:15:52 -07:00
Yorke Lee
cbd61cf075 am 42d221f3: am 002e85e1: Merge "Use TelecommManager APIs to detect if we are in a call" into lmp-dev
* commit '42d221f34b50f8823695c26b65659faa2047564c':
  Use TelecommManager APIs to detect if we are in a call
2014-09-04 17:44:30 +00:00
Yorke Lee
135b59e597 Merge "Use TelecommManager APIs to detect if we are in a call" into lmp-dev 2014-09-04 17:27:25 +00:00
Andreas Gampe
aec67dcc02 Frameworks/base: Add native bridge post-fork initialization
Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
2014-09-03 21:38:34 -07:00
Adam Powell
b5bbe5745e am f1197ed9: am c3070461: Merge "Change the CAB to use the up-glyph for closing action modes" into lmp-dev
* commit 'f1197ed9d98716a2bb572efc6960672a55baee79':
  Change the CAB to use the up-glyph for closing action modes
2014-09-04 03:21:54 +00:00
Adam Powell
4ef16eaa8d Merge "Change the CAB to use the up-glyph for closing action modes" into lmp-dev 2014-09-04 01:18:14 +00:00
Alan Viverette
f2f326561b am ed1bf1cf: am 1d53feb9: Merge "Only use default backgrounds when not extending AlertDialog style" into lmp-dev
* commit 'ed1bf1cfeb069336c26482283592068bede937d9':
  Only use default backgrounds when not extending AlertDialog style
2014-09-04 00:42:04 +00:00
Adam Powell
b2536cf473 Change the CAB to use the up-glyph for closing action modes
In an effort to reduce glyph proliferation, change the "done"
checkmark from the CAB to the up-navigation arrow, placing the CAB
firmly in the current navigation hierarchy. This matches behavior for
expandable action views such as SearchView.

Allow the use of different CAB "done" layouts by theme; the material
layout should not include the "done" text and should use the standard
borderless selectable item background.

Bug 17372188

Change-Id: Icfb3e0bbc6a718e22ab27f9d520da5fe4eb833e7
2014-09-03 17:17:45 -07:00
Yorke Lee
cc5179f0e3 Use TelecommManager APIs to detect if we are in a call
Bug: 17335666
Change-Id: I5f443c76041e51a2eca903db924fb26031dde055
2014-09-03 17:04:54 -07:00
Dan Sandler
5b01afa072 am c0a4823d: am cdb9de6a: Merge "Reduce RAM requirements of grayscale icon testing" into lmp-dev
* commit 'c0a4823dfb0381c810f8610660d723cd5048d989':
  Reduce RAM requirements of grayscale icon testing
2014-09-03 23:48:39 +00:00
Alan Viverette
98a31b2ef0 Merge "Only use default backgrounds when not extending AlertDialog style" into lmp-dev 2014-09-03 23:42:42 +00:00
Alan Viverette
b17c6c178f Only use default backgrounds when not extending AlertDialog style
BUG: 17368867
Change-Id: I440dad33cfb093c13b450a5f2369481fb30665ad
2014-09-03 16:27:51 -07:00
Dan Sandler
d1dc910eff Merge "Reduce RAM requirements of grayscale icon testing" into lmp-dev 2014-09-03 22:15:38 +00:00
Dan Sandler
05c362d564 Reduce RAM requirements of grayscale icon testing
The isGrayscale family of methods is designed to identify
drawables and bitmaps that apps are using in the largeIcon
position to pose as small icons in order to get the
appropriate background treatment (a solid blue or gray block
in KK/JB, or geniune selvedge denim in ICS/HC).

We can optimize this search two ways:

(1) Reject immediately any largeIcon that is larger than
    largeIcons should be (64x64dp). We could one day simply
    reject, or resize, these in the notification manager,
    but regardless these are not plausible smallIcon
    subsitutes. This new constraint is commemorated in the
    new name, isGrayscaleIcon().

(2) Shrink the bitmap even smaller before scanning it slowly
    in Java.  This lets native_drawBitmap do the heavy
    lifting across the entire bitmap; we need only scan a
    few pixels.

Bug: 16513124
Change-Id: I3a2b79130ed2465a4aedfbb5a556db7f8a7aa132
2014-09-03 23:52:47 +02:00
Yohei Yukawa
8bb3b4331c am d88a1f97: am ebb6b422: Merge "API Review: InputConnection" into lmp-dev
* commit 'd88a1f9790bfaaa6540f65d76827274d716a2539':
  API Review: InputConnection
2014-09-03 14:35:32 +00:00
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
Yohei Yukawa
d8636ea7ca API Review: InputConnection
This CL does nothing but rename some L API candidates
in InputConnection class, as per requested.

- requestUpdateCursorAnchorInfo()
  -> requestCursorUpdates()
- REQUEST_UPDATE_CURSOR_ANCHOR_INFO_IMMEDIATE
  -> CURSOR_UPDATE_IMMEDIATE
- REQUEST_UPDATE_CURSOR_ANCHOR_INFO_MONITOR
  -> CURSOR_UPDATE_MONITOR

BUG: 17320996
Change-Id: I772c48ff18918e48a81e807b48ff907614485c09
2014-09-02 22:39:08 -07: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