Craig Mautner
6a80527f61
am 3bfd2b7b: am 159da3db: Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev
...
* commit '3bfd2b7b8fb83d47d4a624993c096e1f716df551':
Add enter-animation-done callback for system windows
2014-10-31 00:29:52 +00:00
Alan Viverette
b65a27da39
am d93421b1: am afffc5c2: Merge "Remove scroll view from correct parent in AlertController" into lmp-mr1-dev
...
* commit 'd93421b1438607f7656c7b65163c6681526693b0':
Remove scroll view from correct parent in AlertController
2014-10-31 00:29:29 +00:00
Yigit Boyar
9d0a2dc15d
am 012e06bc: am 33d9dc46: Merge "Move all actionbar related methods to DecorToolbar" into lmp-mr1-dev
...
* commit '012e06bcb965c76e696ebc2e09e5eaaf97129d91':
Move all actionbar related methods to DecorToolbar
2014-10-31 00:15:16 +00:00
Alan Viverette
349e93ea65
am 65d792e4: am 10450405: Merge "Show scroll indicators in AlertDialog" into lmp-mr1-dev
...
* commit '65d792e46cad687b2457ac4903cd489ec9dc77e6':
Show scroll indicators in AlertDialog
2014-10-31 00:14:38 +00:00
Alan Viverette
bfc8599f43
am b2449a39: am d86d7bce: Merge "Use action mode context for ActionMode menu inflater" into lmp-mr1-dev
...
* commit 'b2449a399b0e67ab60c592baca9063540b8c1637':
Use action mode context for ActionMode menu inflater
2014-10-30 23:43:58 +00:00
Craig Mautner
159da3dba8
Merge "Add enter-animation-done callback for system windows" into lmp-mr1-dev
2014-10-30 22:12:31 +00:00
Craig Mautner
9c79504225
Add enter-animation-done callback for system windows
...
Existing hidden methods allow activities to be notified when their
windows have completed animating in. This change adds that capability
to system windows using a ViewTreeObserver callback since system
windows lack an activity token.
The first subsystem to use this is the UserSwitchingDialog which was
previously using a 250 msec timeout to dismiss the dialog. That
deadline was often missed leaving the user with no dialog on the
screen during the transition.
Fixes bug 16661752.
Change-Id: I70789e0d9c07112f275e76fb82850926305f290d
2014-10-30 14:43:18 -07:00
Alan Viverette
35c3cb6a59
Remove scroll view from correct parent in AlertController
...
BUG: 18191700
Change-Id: I37602fc26d103b76021f00c58f03bc32d7a978fe
2014-10-30 13:51:21 -07:00
Alan Viverette
25128b0b5a
am 05b2fedc: Merge "Inflate ActionMode items against the ActionBarContextView theme" into lmp-mr1-dev
...
automerge: b00c424
* commit 'b00c4242579ac9c42c01656cb7b10f394f55a445':
Inflate ActionMode items against the ActionBarContextView theme
2014-10-30 19:05:27 +00:00
Yigit Boyar
33d9dc46cf
Merge "Move all actionbar related methods to DecorToolbar" into lmp-mr1-dev
2014-10-30 02:02:15 +00:00
Alan Viverette
104504053d
Merge "Show scroll indicators in AlertDialog" into lmp-mr1-dev
2014-10-30 00:18:32 +00:00
Alan Viverette
154c2c24dc
Show scroll indicators in AlertDialog
...
BUG: 16353356
Change-Id: I0307283751ccb23b9d85b0c36cb78b01243e70dd
2014-10-30 00:18:22 +00:00
Alan Viverette
3abf5c4bd1
Use action mode context for ActionMode menu inflater
...
BUG: 18078900
Change-Id: Iff837e741dde79a565f1e8c83846ee6155da179e
2014-10-29 11:03:35 -07:00
Yigit Boyar
fe6d57c366
Move all actionbar related methods to DecorToolbar
...
Bug: 17999561
Change-Id: I36af443cf245aedd64a079726c1a2e6f6068f221
2014-10-29 17:34:45 +00:00
Alan Viverette
f6a36e9cf3
Inflate ActionMode items against the ActionBarContextView theme
...
BUG: 18078900
Change-Id: I300a0268bacf7e1ebcd64eac3d79548e1c4a9606
2014-10-28 17:50:59 -07:00
Alan Viverette
a8aa03efa7
Merge "Add support for Explore by Touch to RadialTimePickerView" into lmp-mr1-dev automerge: 1ac5266
...
automerge: 4329ad3
* commit '4329ad3be8f42b62f54ab070fcd97d2a1bb2d7f3':
Add support for Explore by Touch to RadialTimePickerView
2014-10-24 21:28:34 +00:00
Alan Viverette
1ac52667ee
Merge "Add support for Explore by Touch to RadialTimePickerView" into lmp-mr1-dev
2014-10-24 20:36:33 +00:00
Alan Viverette
ffb46bf295
Add support for Explore by Touch to RadialTimePickerView
...
Also adds IntArray, which is like LongArray for integers, and prevents
the AM/PM label text in the time picker header from wrapping.
BUG: 17468036
Change-Id: I7120089885709f23e20368927e4b3ed9db2e5393
2014-10-24 12:06:11 -07:00
Christoph Studer
7ffa8dad6f
am c10f39d5: am 5c1a4965: Merge "SysUI/NoMan: Log clicks on notification buttons" into lmp-mr1-dev
...
* commit 'c10f39d536aebbdd7d6b30ac2dfcfcf6b51772f8':
SysUI/NoMan: Log clicks on notification buttons
2014-10-24 14:38:25 +00:00
Christoph Studer
5c1a49651b
Merge "SysUI/NoMan: Log clicks on notification buttons" into lmp-mr1-dev
2014-10-24 14:29:20 +00:00
Narayan Kamath
0d50b5d0ee
am e572a77f: am fa36b36c: Merge "Deprecate more apache-http." into lmp-mr1-dev
...
* commit 'e572a77f05948fdc9c17ccdce0784d8b179a03ee':
Deprecate more apache-http.
2014-10-24 10:40:00 +00:00
Narayan Kamath
fa36b36c8b
Merge "Deprecate more apache-http." into lmp-mr1-dev
2014-10-24 08:58:45 +00:00
Filip Gruszczynski
2c90a0282b
am 2e052429: am b977ade1: am 625ec484: Check if context is actually an activity.
...
* commit '2e052429d04c11b69b3b3ac85a6344bd3687a0dc':
Check if context is actually an activity.
2014-10-23 22:02:48 +00:00
Filip Gruszczynski
b977ade1e4
am 625ec484: Check if context is actually an activity.
...
* commit '625ec4849118f061a99558ad558b16020435a88d':
Check if context is actually an activity.
2014-10-23 19:49:21 +00:00
Filip Gruszczynski
625ec48491
Check if context is actually an activity.
...
Bug: 18101409
Change-Id: Iab21338ef4ccaab0ce66d664502e0b5e88ad9c50
2014-10-23 10:56:24 -07:00
Narayan Kamath
823675fdbb
Deprecate more apache-http.
...
bug: 18067888
Change-Id: I50511d53dfc9ae236dfb1646c55a5dd7fa15d7b2
2014-10-23 17:43:05 +01:00
Alan Viverette
beb45a194d
am eb09aaa5: am e1201e87: Merge "Lighten action bar on light theme, use secondary color for subtitle" into lmp-mr1-dev
...
* commit 'eb09aaa5acd4bfaa4e71c60f23a934294b8130cd':
Lighten action bar on light theme, use secondary color for subtitle
2014-10-23 15:58:33 +00:00
Alan Viverette
1338a8bd80
am dc546ab7: am 720f43e4: Merge "Revert "Check MenuItem.isVisible() for keyboard shortcuts"" into lmp-mr1-dev
...
* commit 'dc546ab7c3b53012908ce6b594f34a5d27de78e1':
Revert "Check MenuItem.isVisible() for keyboard shortcuts"
2014-10-23 08:01:53 +00:00
Alan Viverette
e1201e87f4
Merge "Lighten action bar on light theme, use secondary color for subtitle" into lmp-mr1-dev
2014-10-23 01:28:50 +00:00
Alan Viverette
bd266fef81
Lighten action bar on light theme, use secondary color for subtitle
...
Also cleans up some code in ActionBarView.
BUG: 17987639
Change-Id: I7dcdf18748d6da5792900ab9a78775a0511f982a
2014-10-22 17:20:17 -07:00
Alan Viverette
720f43e4a4
Merge "Revert "Check MenuItem.isVisible() for keyboard shortcuts"" into lmp-mr1-dev
2014-10-23 00:05:33 +00:00
Alan Viverette
e38eb4d4ef
Revert "Check MenuItem.isVisible() for keyboard shortcuts"
...
Just kidding we do want this to work like it used to.
This reverts commit e354a9e4da .
Change-Id: Ia51050a93e25c1ad16144b0da3f6178a98ad971a
2014-10-22 23:51:32 +00:00
Filip Gruszczynski
b1ed0ab927
am 78b236b3: am d4a52a68: am baecc0b2: Merge "Disable activity\'s translucency until it starts being swiped away." into lmp-sprout-dev
...
* commit '78b236b3d2be713f534a033b0deb0e00b0d436a8':
Disable activity's translucency until it starts being swiped away.
2014-10-22 21:18:15 +00:00
Filip Gruszczynski
d4a52a6878
am baecc0b2: Merge "Disable activity\'s translucency until it starts being swiped away." into lmp-sprout-dev
...
* commit 'baecc0b2d111c3bc930b85d5450f1ff8b7b83395':
Disable activity's translucency until it starts being swiped away.
2014-10-22 20:45:59 +00:00
Alan Viverette
a0579ad00f
am 5eaf0064: am 410f7ee4: Merge "Check MenuItem.isVisible() for keyboard shortcuts" into lmp-mr1-dev
...
* commit '5eaf00641a8dd31b4d7779749db28669e4010af3':
Check MenuItem.isVisible() for keyboard shortcuts
2014-10-22 20:14:35 +00:00
Alan Viverette
410f7ee403
Merge "Check MenuItem.isVisible() for keyboard shortcuts" into lmp-mr1-dev
2014-10-22 20:03:46 +00:00
Christoph Studer
4da84cd565
SysUI/NoMan: Log clicks on notification buttons
...
Introduce notification_action_click logtag that is logged whenever
the user clicks any notification button. For standard templates, we
also log the index of the pressed action button.
Bug: 18064190
Change-Id: Icb07795ff711729d16bde0b7e03d13c2f466779c
2014-10-22 20:18:14 +02:00
Filip Gruszczynski
3f8dd14451
Disable activity's translucency until it starts being swiped away.
...
Change-Id: Ia5dceac7bd9ff57920a43736f9db6a33175e01ac
2014-10-21 15:12:00 -07:00
Adam Powell
639e3181e0
am e055c95b: am 054e8be5: Merge "Intent chooser callback" into lmp-mr1-dev
...
* commit 'e055c95b77a3610452f31d2303fa35bf171acf0e':
Intent chooser callback
2014-10-21 21:49:55 +00:00
Alan Viverette
e354a9e4da
Check MenuItem.isVisible() for keyboard shortcuts
...
Parity with support-v7 change.
BUG: 18021345
Change-Id: I583b586d451a21bbd207d2b0584a396e1125ee59
2014-10-21 12:21:32 -07:00
Adam Powell
0b3c11260a
Intent chooser callback
...
Let an app specify an IntentSender as an extra for ACTION_CHOOSER that
will be notified of the user's chosen target. Apps can use this to
implement things like one-touch last used affordances without
implementing their own one-off chooser UI.
Bug 17363684
Change-Id: Ic5d1d0e0c7a0bae3eda6b1d6ade993f3ba865cfa
2014-10-21 12:17:50 -07:00
Dianne Hackborn
019de15ca2
am 2ea2bf28: am ed512c81: Merge "Fix issue #17948288 : Improve accuracy of memory use reporting" into lmp-mr1-dev
...
* commit '2ea2bf284078eea4871bfa0fb42b56dff3e8bbf3':
Fix issue #17948288 : Improve accuracy of memory use reporting
2014-10-18 00:52:07 +00:00
Dianne Hackborn
ed512c817c
Merge "Fix issue #17948288 : Improve accuracy of memory use reporting" into lmp-mr1-dev
2014-10-18 00:42:24 +00:00
Jim Miller
8596960eb5
am 956e424d: am d9b81b11: am a054a828: am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev
...
* commit '956e424d007df454cc4a2bfc576336eb0c8f20e4':
Add utility methods to LockPatternUtils for encryption
2014-10-18 00:07:35 +00:00
Jim Miller
d9b81b11b9
am a054a828: am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev
...
* commit 'a054a8280c1316a1f805cc86f00f571a3b1cfc2f':
Add utility methods to LockPatternUtils for encryption
2014-10-17 23:57:33 +00:00
Jim Miller
a054a8280c
am c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev
...
* commit 'c6c843fbe8fb8d9bdd012a472e22970ee89b9d24':
Add utility methods to LockPatternUtils for encryption
2014-10-17 23:52:41 +00:00
Jim Miller
c6c843fbe8
Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev
2014-10-17 23:48:21 +00:00
Jim Miller
dd5de719c5
Add utility methods to LockPatternUtils for encryption
...
This enables a change in Settings that allows device
encryption to be disabled by the user.
Fixes bug 17881324
Change-Id: I34dfc586df1a598bf969dc82adf8537a2730d345
2014-10-17 16:08:21 -07:00
Dianne Hackborn
b3af4ec6ba
Fix issue #17948288 : Improve accuracy of memory use reporting
...
We now use Mapped to not double-count cached pages that are
mapped in to app processes. Also read in some more values that
count towards kernel RAM use, and count buffers as free rather
than used RAM.
It also looks like the zram accounting is broken -- it was never
collecting the total zram reserved space. I need to figure out
how I was finding that before.
Change-Id: I883f6fc93966774b5c7d2801d1801666dd11ed41
2014-10-17 15:25:13 -07:00
William Bourke
83c97babb0
am cb1e32ac: am 44d51545: am 7d5c68e3: am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev
...
* commit 'cb1e32ac2b5eb12ff89af5eb8074908b5f54d047':
Modified lollipop Easter egg for TV compatibility
2014-10-17 22:20:44 +00:00