Raph Levien
31e61ba355
am a011c7fc: Merge "Fix documentation of nextSpanTransition off by one" into mnc-dev
...
* commit 'a011c7fcf750e25038eb5862f41e883fef1f54f7':
Fix documentation of nextSpanTransition off by one
2015-06-11 15:51:38 +00:00
Jeff Davidson
d2c4d9a894
am a66a067a: Merge "Mark CARRIER_PRIVILEGE_* constants as @SystemApi." into mnc-dev
...
* commit 'a66a067a9c9b706035f48f445561100f29c960bf':
Mark CARRIER_PRIVILEGE_* constants as @SystemApi.
2015-06-11 15:43:23 +00:00
Fyodor Kupolov
38a21ce227
am 50baf43e: Merge "Changed guest_notification_text string" into mnc-dev
...
* commit '50baf43eeb6bbdedca21000a439194ba21ce69f0':
Changed guest_notification_text string
2015-06-11 15:43:08 +00:00
Selim Cinek
60b44d324e
am 5f2c415f: Merge "Enabled appear and dissappear animations for the overflow card" into mnc-dev
...
* commit '5f2c415fbdaf11e37b1b07298bc037cfcb5fa579':
Enabled appear and dissappear animations for the overflow card
2015-06-11 15:42:59 +00:00
Jason Monk
03b85ebd35
am d9d52949: Merge "QS: Allow changes between open detail panels" into mnc-dev
...
* commit 'd9d529497ddcb9e49315571d14fa9d94d06c40c3':
QS: Allow changes between open detail panels
2015-06-11 15:42:53 +00:00
Vladislav Kaznacheev
57b3ff3ce3
am 1955ee57: Merge "Make VPA.setInterpolator(null) unset the interpolator." into mnc-dev
...
* commit '1955ee57b3210d9027e1c46731cf1f44406166da':
Make VPA.setInterpolator(null) unset the interpolator.
2015-06-11 15:42:31 +00:00
Adrian Roos
a1e8a8a83a
am 76430b42: Merge changes from topic \'sup-a11y\' into mnc-dev
...
* commit '76430b42228d38f77f83e44b6307ca368963b3c5':
Make keyguard indication an a11y live view
Hide keyguard status view from a11y when QS expanded
Hide keyguard bottom area from a11y when alpha is zero
Remove unusable a11y focusable area from pattern unlock
Hide StatusBarWindowView from a11y when bouncer is up
2015-06-11 15:42:24 +00:00
Jim Miller
7a6cc719b8
am 9481227f: Correct comments for DPM keyguard features.
...
* commit '9481227fac23131f68edb120f2ed06b9cf44f3f5':
Correct comments for DPM keyguard features.
2015-06-11 15:41:59 +00:00
John Spurlock
effd829b1f
am 5b1548b6: Merge "Zen a11y: Add a blurb re: screen readers to total silence." into mnc-dev
...
* commit '5b1548b6b4d37c905baa867c6065a10b68f77c51':
Zen a11y: Add a blurb re: screen readers to total silence.
2015-06-11 15:41:23 +00:00
Alan Viverette
7b1b8b24e8
am e2998a02: Merge "Account for hotspot bounds in RippleDrawable projection check" into mnc-dev
...
* commit 'e2998a02696740ed179dd4726b2a331ddcfde2cc':
Account for hotspot bounds in RippleDrawable projection check
2015-06-11 15:41:17 +00:00
Alan Viverette
c7e86be82d
am 2964c7b8: Merge "Update seek bar dialog preference for Material" into mnc-dev
...
* commit '2964c7b8af15571e2967622eac0161c065880b3c':
Update seek bar dialog preference for Material
2015-06-11 15:41:11 +00:00
Jim Miller
33bbd4940a
am 09425e50: Merge "Update DPM strings for keyguard features" into mnc-dev
...
* commit '09425e506948648a469e2ed0b244fc65c85fafc0':
Update DPM strings for keyguard features
2015-06-11 15:41:01 +00:00
Tyler Gunn
a1802ecaf7
am 71bb4ca7: Merge "Add support for specifying looper on VideoProviders." into mnc-dev
...
* commit '71bb4ca7cadd97cf6f469e60c98cbddedd8e29c6':
Add support for specifying looper on VideoProviders.
2015-06-11 15:40:55 +00:00
Jeff Brown
695a5f432d
am 797b3d2e: Merge "Don\'t request traversals when updating display brightness." into mnc-dev
...
* commit '797b3d2e9c0ac38a4078967800ee062e07b82ee6':
Don't request traversals when updating display brightness.
2015-06-11 15:40:50 +00:00
Jun Mukai
a9d1aff2a5
am b3aa575e: Merge "Specifies the new height/width for update() on ListPopupWindow.show()." into mnc-dev
...
* commit 'b3aa575e3b8ec8f685c7431259f49ad82f2ee928':
Specifies the new height/width for update() on ListPopupWindow.show().
2015-06-11 15:40:44 +00:00
Nick Kralevich
3e14e33235
am 5ac4a5fa: Merge "Fix USB access control when adb is disabled." into mnc-dev
...
* commit '5ac4a5fa38fe1bea0007235840fb77ba3648a1d3':
Fix USB access control when adb is disabled.
2015-06-11 15:40:39 +00:00
Felipe Leme
c47a7f03fa
am a6dd714a: Merge "Added new options (--eial, --elal, --efal, and --esal) to pass multiple extras as ArrayList instead of Array. BUG: 21757911 Change-Id: I7e2a9c81ad4606a8aba90ea4820ba0732a1c8749 modified: src/com/android/commands/am/Am.java On branch handles_arr
...
* commit 'a6dd714a5ab620cf5b84c2d1f680ddacf763559d':
Added new options (--eial, --elal, --efal, and --esal) to pass multiple extras as ArrayList instead of Array. BUG: 21757911 Change-Id: I7e2a9c81ad4606a8aba90ea4820ba0732a1c8749 modified: src/com/android/commands/am/Am.java On branch handles_array_list Changes to be committed: modified: src/com/android/commands/am/Am.java
2015-06-11 15:40:28 +00:00
Dmitriy Ivanov
ca70e52f7d
am 7cbe9f03: Merge "Fix abi-detection for 32-bit system apps" into mnc-dev
...
* commit '7cbe9f03a968ef42840d234ea325b69f4b1f1417':
Fix abi-detection for 32-bit system apps
2015-06-11 15:40:10 +00:00
Adam Lesinski
7ed56c46f6
am 3d53a26d: Merge "Add more blaming output to batterystats dumpsys" into mnc-dev
...
* commit '3d53a26d1a8471f4709b528686601381fd7e6da4':
Add more blaming output to batterystats dumpsys
2015-06-11 15:39:48 +00:00
Jason Monk
0a2f637531
am 253ee76d: Merge "Add action for reaching ignore battery optimizations" into mnc-dev
...
* commit '253ee76dd9da2cda043d113f247b3c8acf915d77':
Add action for reaching ignore battery optimizations
2015-06-11 15:39:43 +00:00
Robin Lee
5b69aefb1b
am 8bbbcd3d: Merge "Policy: make bulk CA uninstalls happen in service" into mnc-dev
...
* commit '8bbbcd3d5402285b05db64c3ffd3a959f26ad16c':
Policy: make bulk CA uninstalls happen in service
2015-06-11 15:39:33 +00:00
Selim Cinek
46a7bc3947
am 94fc0c26: Merge "Fixed a crash with HUN\'s" into mnc-dev
...
* commit '94fc0c2630926cdf1d246270441a4301f03eeaca':
Fixed a crash with HUN's
2015-06-11 15:39:14 +00:00
Jeff Brown
38fc805459
am 4bc50540: Merge "Support 4K overlay displays." into mnc-dev
...
* commit '4bc5054040c84e5d0e97357a30faab30ce4c5441':
Support 4K overlay displays.
2015-06-11 15:39:09 +00:00
Wale Ogunwale
bf3cc1ec98
am 59d6d943: Merge "Revert "Revert "Recompute focus stack if cleared while starting an activity.""" into mnc-dev
...
* commit '59d6d943d86ef0e3f5ba2f03758b0d40a82639e9':
Revert "Revert "Recompute focus stack if cleared while starting an activity.""
2015-06-11 15:39:00 +00:00
Abodunrinwa Toki
232292388a
am 3ae8bf53: Merge "Change FloatingToolbar entry/exit animations to fadeIn/fadeOut." into mnc-dev
...
* commit '3ae8bf530ad794841a5b702ea99cb8debb733d89':
Change FloatingToolbar entry/exit animations to fadeIn/fadeOut.
2015-06-11 15:38:53 +00:00
Santos Cordon
28c65e6d64
am cefc16df: Merge "TelephonyManager should use TelecomManager\'s getCallState()." into mnc-dev
...
* commit 'cefc16df98a985b8a7c40bca5d5ff3fde6b42dbf':
TelephonyManager should use TelecomManager's getCallState().
2015-06-11 15:38:41 +00:00
Ben Kwa
2d5c9c368e
am c783a5e7: Merge "Enable apps to exclude their own roots from the DocumentsUI roots list." into mnc-dev
...
* commit 'c783a5e762b0c4925756b8ca273eb26aab5e7985':
Enable apps to exclude their own roots from the DocumentsUI roots list.
2015-06-11 15:38:09 +00:00
Dan Sandler
982a63a9a7
am 37d1d6d0: Merge "Announce navbar buttons when lights-out." into mnc-dev
...
* commit '37d1d6d0a3c8bce69aa8dc692bd6d570b038704a':
Announce navbar buttons when lights-out.
2015-06-11 15:37:43 +00:00
Dan Stoza
b355a3a9c5
am 56b94e15: Merge "screencap: Rotate images when display is rotated" into mnc-dev
...
* commit '56b94e1593fde9a09546854c638cff991da6fcb2':
screencap: Rotate images when display is rotated
2015-06-11 15:37:38 +00:00
John Reck
a23a87f7cd
am 767ec843: Merge "Set the right reportNextDraw" into mnc-dev
...
* commit '767ec84354d97624b2b848c8a0b8877d87ebb5eb':
Set the right reportNextDraw
2015-06-11 14:53:11 +00:00
Dan Sandler
b26c1dc4ff
am 382225af: Merge "Null check when reconstituting legacy icon data." into mnc-dev
...
* commit '382225af479964a1677a76fe8d8f69d577ddb912':
Null check when reconstituting legacy icon data.
2015-06-11 14:53:04 +00:00
Paul Jensen
6a470d5b46
am c1e623bb: Merge "Avoid overlapping NetIDs in ConnectivityServiceTest with real NetIDs" into mnc-dev
...
* commit 'c1e623bbcae1678f145106bb1838ee903ad00c6f':
Avoid overlapping NetIDs in ConnectivityServiceTest with real NetIDs
2015-06-11 14:52:57 +00:00
Chien-Yu Chen
1ab3219d5e
am a3a0ea3b: Merge "Camera2: Clarify capture order for reprocess" into mnc-dev
...
* commit 'a3a0ea3b1b75024af23eac8ec767d2299373664a':
Camera2: Clarify capture order for reprocess
2015-06-11 14:52:44 +00:00
John Spurlock
2f45e52758
am ef70f8e4: Merge "Volume: Show row headers for cast streams." into mnc-dev
...
* commit 'ef70f8e426d3414ea9b66c07b15330631a466ed5':
Volume: Show row headers for cast streams.
2015-06-11 14:52:25 +00:00
Michael Wright
a7e8a7d496
am cc87cfa2: Merge "Fix order of initialization arguments for obtained MotionEvents." into mnc-dev
...
* commit 'cc87cfa29c4b38d1f119bdce652918565b0fed0f':
Fix order of initialization arguments for obtained MotionEvents.
2015-06-11 14:51:51 +00:00
Clara Bayarri
23fb9209b0
am 89124000: Merge "Fix Floating tool bar flickers after long pressing on empty region." into mnc-dev
...
* commit '89124000c618f24b948505cd79f654aacbdff957':
Fix Floating tool bar flickers after long pressing on empty region.
2015-06-11 14:51:32 +00:00
Jeff Sharkey
3f384b4fd5
am c7c8af67: Merge "Send added user serial numbers to vold." into mnc-dev
...
* commit 'c7c8af6726eda245288ab1af720297c60cd1be54':
Send added user serial numbers to vold.
2015-06-11 14:51:20 +00:00
Geoff Mendal
faddfd219a
am dc9ad9aa: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'dc9ad9aaee5bef44888cbebb035635a30b548cb8':
Import translations. DO NOT MERGE
2015-06-11 14:51:10 +00:00
Makoto Onuki
d832b1ae9d
am e6d8ffb4: Merge "Add more result extras for ACTION_GET_PERMISSIONS_COUNT" into mnc-dev
...
* commit 'e6d8ffb40f555bbb3b88a3544616de28426e75a1':
Add more result extras for ACTION_GET_PERMISSIONS_COUNT
2015-06-11 14:51:03 +00:00
James Cook
ed29a448d9
am f22030d1: Merge "Fix ActionButton.CloseMode minWidth to match Toolbar.Button.Navigation" into mnc-dev
...
* commit 'f22030d1c59aca4f9ad2af7d4c4d646b0b619f27':
Fix ActionButton.CloseMode minWidth to match Toolbar.Button.Navigation
2015-06-11 14:50:50 +00:00
Paul Lawrence
d1755ec9f3
am 0c3aa483: Merge "Remove hex encoding and password adjusting now that patterns are \'1\' based" into mnc-dev
...
* commit '0c3aa4834efd91ea9559486fed1d613fd4289969':
Remove hex encoding and password adjusting now that patterns are '1' based
2015-06-11 14:50:44 +00:00
Lorenzo Colitti
89409bc2ac
am bc7b1a4c: Merge "When no Internet access is detected, display a notification first." into mnc-dev
...
* commit 'bc7b1a4ca2f114d09ce186e25b18692df2c9e872':
When no Internet access is detected, display a notification first.
2015-06-11 14:50:30 +00:00
Keisuke Kuroyanagi
a4f8893e43
am 136a462c: Merge "Revert "Fix: Crash when modifying text while using drag accelerator."" into mnc-dev
...
* commit '136a462c8bb35bdd21258f03f3f9adca06990701':
Revert "Fix: Crash when modifying text while using drag accelerator."
2015-06-11 14:50:13 +00:00
Jason Monk
11b7219458
am b73390ac: Merge "Fix work apps showing as not installed for owner" into mnc-dev
...
* commit 'b73390acdd6a71d74d6ad107520a0f22d2bc5f1e':
Fix work apps showing as not installed for owner
2015-06-11 14:49:56 +00:00
Chet Haase
7bd942469d
am 81728b86: Merge "Clarify docs for Animator.isStarted()" into mnc-dev
...
* commit '81728b862e8448bc460fd6589de6c1b954f8227e':
Clarify docs for Animator.isStarted()
2015-06-11 14:49:49 +00:00
Chris Wren
b13438b1a0
am 300a1416: Merge changes from topic \'tron\' into mnc-dev
...
* commit '300a141650dc17d2a893b55133c62b0353d2a9bb':
instrument notification longpress controls
induct a bunch of new logging categories.
2015-06-11 14:49:36 +00:00
Geoff Mendal
d8f7a1b634
am b381bcc1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'b381bcc185340a09fbb576b2aa3ae970b1806d34':
Import translations. DO NOT MERGE
2015-06-11 14:49:29 +00:00
Geoff Mendal
46161205c6
am 36eb6d5f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '36eb6d5f46c82a3df42074a3beedc748dec7f438':
Import translations. DO NOT MERGE
2015-06-11 14:49:22 +00:00
Geoff Mendal
c0dc1ac04e
am b6c026be: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'b6c026bec1430f7c31aa72cc9b2e160eca0464fd':
Import translations. DO NOT MERGE
2015-06-11 14:49:16 +00:00
Geoff Mendal
fcb8628696
am 1947d9f5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit '1947d9f55e8b5966a473dbc7a75967325e32ae8b':
Import translations. DO NOT MERGE
2015-06-11 14:49:09 +00:00