146325 Commits

Author SHA1 Message Date
Dake Gu
f7ff2205d9 ExitTransitionCoordinator: suppressLayout during running transition
b/16570734

Change-Id: I52d7132b91256085aa9e535575e978a6031fb276
2014-07-25 22:18:57 +00:00
Chris Craik
738ec3aace Revert "Dump RenderThread stack on unresponsive"
bug:16563871
bug:16565900
bug:16555847
bug:16551643

This reverts commit ca66e06b9db6e6c921662886e4b7ddd02ac92280.

Change-Id: I23e8d4eaf828b1b298126ba5f36e4e8e7451706a
2014-07-25 18:26:36 +00:00
John Spurlock
addcf34645 Merge "Volume: Persist unsafe volume playback time." into lmp-dev 2014-07-24 23:36:47 +00:00
Jay Civelli
3087e49667 Add new intent to prompt user for their device credential. DO NOT MERGE
Bug: 16242766
cherry-pick from master 2e7beadedeb7d41d8c2d1cc62956bdd9f5081d26

Change-Id: I76efb3bef888eb1e94c4e5455934816fb4acc5bc
2014-07-25 22:04:19 +00:00
John Spurlock
aa5ee4d65f Volume: Persist unsafe volume playback time.
Instead of warning after every reboot, remember the
playback time after a user confirmation and only
reset after the 20 hour playback threshold.

Bug:16543104
Change-Id: I783358d97b88302a28fe77a8eb88bcd338ef1c87
2014-07-25 17:00:25 -04:00
John Spurlock
543650bb10 Merge "Volume: Show safe media warning in settings." into lmp-dev 2014-07-24 23:36:47 +00:00
John Spurlock
351346092a Volume: Show safe media warning in settings.
If the safe media warning is enabled, make sure
we display it from the new inline slider preference in
Settings (without showing the volume dialog itself).

Also:
 - Update the warning dialog to the new sysui theme.
 - Separate the warning sentences with an additional line.
 - Fix the auto-dismiss timeout.
 - Add a system property to additionally enable the safe
   media warning for testing
 - Add more information to audio service dumpsys.

Bug:15434662
Change-Id: I95fec12c9049bbfdb7ebdf246160e4b12c0c5be3
2014-07-25 11:27:51 -04:00
Anish Athalye
8020721059 Merge "Fix bug in measurement of paragraphs" into lmp-dev 2014-07-24 22:06:48 +00:00
Yao Chen
186655285f fix build
Change-Id: Id5a93019b60ac4881f398b80de2e14786776a883
2014-07-25 11:23:30 -07:00
Paul Soulos
6b2dd6337e Adds getTypeLabel to ContactsContract Event
Bug: 16550284
Change-Id: Ie95093a2c9bca2b9ba130dea470c8beef94cd659
2014-07-25 18:17:35 +00:00
Fabrice Di Meglio
3fbad42a4b Fix bug #16307124 Not able to select hour 12 in TimePicker with 24-hour time enabled
- ahhh modulo ...

Change-Id: Ief08594590480bfcecc09cad1f782e57b05d9786
2014-07-25 18:06:25 +00:00
Yao Chen
8470857ee4 Fix build
Change-Id: Ia2a09417451dd9cdca0a6351b8ddd00f9195f361
2014-07-25 11:01:45 -07:00
Wei Wang
ec64dbfbc0 Fix bug of ScanSettings. Add unit test.
b/16318637.

Change-Id: I3fbc1212c1712faa0c29132f3dc9cfc1d58af26b
2014-07-25 10:56:08 -07:00
Anish Athalye
c14b3ada5c Fix bug in measurement of paragraphs
This fixes b/16510772.

When measuring paragraphs, leading margins should be taken into account.
When computing line width, the margin should be added to the absolute
value of the extent (there were missing parenthesis). Both of these
caused views with leading margins to be rendered incorrectly.

Change-Id: I5029b2790a249192a858eb226d7b793d0622a70d
2014-07-25 17:55:46 +00:00
Craig Mautner
5ec618e3c3 am a9c5257a: am a0bb44ef: Merge "Finish crashed activities immediately" into klp-modular-dev
* commit 'a9c5257a15f2efb5c017d2ecadb5a7360230bfee':
  Finish crashed activities immediately
2014-07-25 17:43:37 +00:00
Craig Mautner
a9c5257a15 am a0bb44ef: Merge "Finish crashed activities immediately" into klp-modular-dev
* commit 'a0bb44efe96ca70635b64dac8922b225d1a19407':
  Finish crashed activities immediately
2014-07-25 02:19:53 +00:00
Alan Viverette
e4f53d65d1 Merge "Remove content description from SearchView text field" into lmp-dev 2014-07-24 20:48:02 +00:00
Alan Viverette
9f716b7c40 Remove content description from SearchView text field
BUG: 16519353
Change-Id: I4df5e1e04fdf0d625e42f70f67657c5107f1443b
2014-07-25 13:51:57 -07:00
RoboErik
2726e0a6eb Add clean step to remove old framework intermediates
The framework intermediates path moved. Failing to notice this will
cause your classpath to be wrong and you'll get red on new aidl methods.
This removes the old path which makes it more obvious that it's moved.

Change-Id: If1a36fefc703b7899e09687e2de598c3830fa72e
2014-07-25 20:36:50 +00:00
Craig Mautner
a0bb44efe9 Merge "Finish crashed activities immediately" into klp-modular-dev 2014-07-24 20:48:02 +00:00
Tyler Gunn
4758b4134a Merge "Adding missing break statement in VideoCallProvider." into lmp-dev 2014-07-24 20:48:02 +00:00
Tyler Gunn
6c11189beb Adding missing break statement in VideoCallProvider.
Related to cl/510948

Bug: 16494880
Bug: 16495203
Change-Id: I4de0dccb886efbd119bd75b1285fdc84210c94fb
2014-07-25 13:04:31 -07:00
Alan Viverette
78b7211507 Merge "Remove duplicate Toolbar method for setting content description" into lmp-dev 2014-07-24 22:06:48 +00:00
Alan Viverette
e88700a2ad Remove duplicate Toolbar method for setting content description
Also moves the setNavigationIcon(int) method closer to the one that
takes a Drawable.

BUG: 16491458
Change-Id: Ia02f05e6270c9d420f61f7ab34117b4c7e6548ec
2014-07-25 12:57:31 -07:00
Craig Mautner
8e5b133bf6 Finish crashed activities immediately
By finishing crashed activities right away the VirtualDisplays
associated with ActivityView are removed immediately rather than
being deferred. Also there is no waiting for Pause (0.5 sec) and
Destroy (10 sec) timeouts to expire.

Fixes bug 15092354.

Change-Id: Ie4941cb19dcc6f6fc61b2475162ea2794c9558a2
2014-07-24 13:32:37 -07:00
Prashant Malani
bc3699b1c3 am b4dcc64f: Merge "Revert "Remove circular mask"" into klp-modular-dev
* commit 'b4dcc64fe6314b139ac17aa296419bbf153df2f6':
  Revert "Remove circular mask"
2014-07-24 18:06:03 +00:00
Behdad Esfahbod
c437f6eef2 Merge "Further centralize Minikin interaction" into lmp-dev 2014-07-24 15:37:54 +00:00
Behdad Esfahbod
63c5c78a72 Further centralize Minikin interaction
Part of the fix for bug 15246510 and others.

Change-Id: Ie99000989dfcd7a81aaa1233dec522344f852f31
2014-07-25 19:23:49 +00:00
Behdad Esfahbod
b9333b5970 Merge "Remove unused TextLayout.h" into lmp-dev 2014-07-24 15:36:21 +00:00
Behdad Esfahbod
1fc68395d3 Remove unused TextLayout.h
Respective code was removed when switching to Minikin.

Change-Id: I353c834457145ccd9462a439dfdf16d4adb8b695
2014-07-25 14:06:35 -04:00
Adam Lesinski
3c153519ca Add Per-User logging of UsageStats
Change-Id: I4518c5d3c56b3821292accb886f9fb21f3a8b25f
2014-07-25 17:18:54 +00:00
Dake Gu
8a4c89a36a Merge "TransitionSet: fix excludeTarget not working" into lmp-dev 2014-07-24 16:56:49 +00:00
Dake Gu
d761dcaf1c TransitionSet: fix excludeTarget not working
b/16552254

Change-Id: I01467e258754d95f1b9fa61a27d1da98eed9b57c
2014-07-25 19:19:07 +00:00
Winson Chung
a4cc966050 Adding content description for task view buttons. 2014-07-25 19:12:28 +00:00
Yohei Yukawa
48e28ad06c Merge "Stop assuming language part in locale string is up to 2-letter" into lmp-dev 2014-07-24 22:43:15 +00:00
Jorim Jaggi
bc976e3f4c Fix ordering of notifications, user switcher and QS panel
Also closes the user switcher when opening QS on Keyguard because
touch logic would interleave with QS.

Change-Id: I391dc9bcba7f9e2e99c0854d34ed0ec6efbb2f44
2014-07-25 19:03:47 +00:00
Yohei Yukawa
71cf0a32d0 Stop assuming language part in locale string is up to 2-letter
With this CL, InputMethodSubtypeSwitchingController stop
assuming that language part in locale string is up to 2-letter.

this CL is not so risky because
InputMethodSubtypeSwitchingController have used language part for
nothing but sorting subtypes to determine the initial rotation
order of IME switching.

BUG: 16502987
Change-Id: Ib159ece0b7aa04f8fd7abc96c9a6e0832a4b7cd2
2014-07-26 03:21:03 +09:00
Jeff Sharkey
22fa6e5c49 Merge "PackageInstaller changes based on feedback." into lmp-dev 2014-07-24 15:37:54 +00:00
Jeff Sharkey
16c8e3f494 PackageInstaller changes based on feedback.
Mostly cosmetic changes from API council feedback.

Bug: 16543552
Change-Id: Ic926829b3f77c31f50a899c59b779353daf00d59
2014-07-25 11:59:48 -07:00
Ruben Brunk
91838ded36 camera2: Fix LEGACY mode timestamps.
Bug: 15116722

- Add CaptureCollector class to accumulate buffer timestamps
  and manage lifecycle callbacks for each request.
- Set correct timestamps for buffers, results, and callbacks.

Change-Id: I75fa1049cf100d9d14c5ba8992be93ba1048df19
2014-07-25 18:52:10 +00:00
Amith Yamasani
f7496d7e0c Merge "Don't update user's setup state unless it changed" into lmp-dev 2014-07-24 15:36:21 +00:00
Dan Sandler
1968201b44 Don't crash when drawing zero pixels.
Bug: 16561522
Change-Id: Ia3a2d2930abc393dbe587053f598246c49c0c9c4
2014-07-25 16:46:47 +00:00
Amith Yamasani
0da218be00 Don't update user's setup state unless it changed
Eliminates an extra write on every boot.

Bug: 16416936
Change-Id: I9ca16676c1b39dafeed3fc744a69c5bde819990c
2014-07-25 08:03:00 -07:00
Jon Miranda
1a0449eb1d Merge "Animates AbsSeekBar progress movement from key presses." into lmp-dev 2014-07-24 20:48:02 +00:00
Jon Miranda
0c11a48907 Animates AbsSeekBar progress movement from key presses.
Change-Id: I9ef00c61351e8fe28be7a7a7d592f09a5124caa0
2014-07-25 00:47:55 +00:00
Alan Viverette
ccf9fca471 Merge "Clip windows to their background by default" into lmp-dev 2014-07-24 22:06:48 +00:00
Alan Viverette
07470537df Clip windows to their background by default
BUG: 16549166
Change-Id: I4ed0f60316df02b6ee56e163ad25e27e1396a6ae
2014-07-24 16:18:53 -07:00
Alan Viverette
366c693b60 Merge "Fix radio button tints" into lmp-dev 2014-07-24 22:06:48 +00:00
Alan Viverette
c734dafb21 Fix radio button tints
BUG: 16513084
Change-Id: I0cda30f25c54a3d9814bbbb4578893734efb5d82
2014-07-25 00:15:11 +00:00
Alan Viverette
f43192c845 Merge "Separate background from ripple for better focus/press UX" into lmp-dev 2014-07-24 22:06:48 +00:00