143775 Commits

Author SHA1 Message Date
Jay Civelli
cdd5fe98b6 Revert "Add new intent to prompt user for their device credential. DO NOT MERGE"
Breaks the JavaDoc generation.

This reverts commit c82a11573810ed4d1f40568d19afc27f726829af.

Change-Id: I9e38a0d6ba0935d4967b50023030c99727bfc839
2014-07-25 23:42:07 +00:00
ztenghui
4883a5ab5e Merge "API REVIEW: VectorDrawable" into lmp-dev 2014-07-25 21:16:23 +00:00
Jorim Jaggi
ab3d017e11 Add possible string to survive string freeze.
Winter is coming!

Change-Id: I806e8ece14895f9d79127dd7f98b6818d72ecbf1
2014-07-25 23:27:34 +00:00
ztenghui
a95c8abb36 API REVIEW: VectorDrawable
- Merge <size> and <viewport> attributes all in to top-level <vector> tag
- Indent attributes under <group> in java doc.
- Updata android:stroke to be android:strokeColor, likewise android:fill
- Instead of android:clipToPath, make this a different clip-path tag.
- Document units of the various attributes
- Add example code for defining a VectorDrawable resource

More than that:
= Refactor the code to better support clipPath as a sub-class.
= Update all the xml files to use the new attributes and clip-path tag.

TODO:
-- Remove clipToPath, since that should happen on build break Friday.

bug:16488254

Change-Id: I6db5680ef83cb26c8f064a60fc7d6e7142974b0f
2014-07-25 23:26:41 +00:00
Ji-Hwan Lee
9e8ade2eb7 TIF: Rename ComponentName variables to "component" consistently
Currently, it's sometimes "name", or "service".

Change-Id: I91dffe30fd2b873c744dbde2c027f0582f55746f
2014-07-25 23:16:48 +00:00
Jinsuk Kim
149944e99f Merge "MHL controller for subcommand reception" into lmp-dev 2014-07-24 16:04:26 +00:00
Jinsuk Kim
8c688ada2d MHL controller for subcommand reception
Implement HdmiMhlController command reception part.

Bug: 16215362

Change-Id: Iabf46dfaa762fae8c537e4d4ebd3469388a6b7c3
2014-07-26 08:14:08 +09:00
Dake Gu
f03c139018 fix ArrayIndexOutOfBoundException of ExitTransitionCoordinator
b/16575308

Change-Id: Ieb4f15a8ead7da9682c97d4d342cd77e0b85e5f8
2014-07-25 23:10:51 +00:00
Michael Wright
5438e4e173 Add missing documentation for createVirtualDisplay
Fix incorrect access modifier in Activity documentation.

Change-Id: Id41da6ccbdfa8b53c89360c899f3a43aec899982
2014-07-25 23:01:32 +00:00
Ruben Brunk
971251f362 camera2: Update preview counter after request completed.
Bug: 15116722

- This was causing the preview counter to double decrement
  for requests where the jpeg callback was executed first.

Change-Id: I6bfdaa7da7f68e86e05dc7ac60ceb3c8d5a0104a
2014-07-25 22:53:32 +00:00
Winson Chung
c37e129539 Fixing issue with Recents not triggering correctly for secondary users. (Bug 15689540) 2014-07-25 22:47:33 +00:00
Evan Charlton
17a3814ac6 Merge "Make creating the Connection synchronous" into lmp-dev 2014-07-24 15:36:21 +00:00
Evan Charlton
bf11f98deb Make creating the Connection synchronous
Get rid of CreateConnectionResponse and have the ConnectionService
return the built connection instead.

Change-Id: Ibbf896e5b188b98eb386d6624d3a5d5cacf49922
2014-07-25 11:07:50 -07:00
Jon Miranda
ca7a229eab Fixes the build.
Change-Id: I4d0f04c480ff787e5f0310fd92a3734180154a9a
2014-07-25 10:35:14 -07:00
Sreeram Ramachandran
eb527ef7a6 Merge "Implement support for bypassable VPNs." into lmp-dev 2014-07-24 15:36:21 +00:00
Fabrice Di Meglio
75b121553f Fix bug #16245852 Clean SimpleMonthView.setMonthParams() in the new DatePicker
- simply create a method for passing those parameters
- remove non needed constants

Change-Id: If6e7d21ff07370edd8c73d1e9b5c5f820f3deb5d
2014-07-25 22:36:22 +00:00
Sreeram Ramachandran
8cd33ed84e Implement support for bypassable VPNs.
Bypassable VPNs grab all traffic by default (just like secure VPNs), but:
+ They allow all apps to choose other networks using the multinetwork APIs.
  If these other networks are insecure ("untrusted"), they will enforce that the
  app holds the necessary permissions, such as CHANGE_NETWORK_STATE.
+ They support consistent routing. If an app has an existing connection over
  some other network when the bypassable VPN comes up, it's not interrupted.

Bug: 15347374
Change-Id: Iaee9c6f6fa8103215738570d2b65d3fcf10343f3
2014-07-25 15:17:23 -07:00
Winson Chung
2b92253021 Announcing when a task is dismissed (for accessibility). (Bug 9181212) 2014-07-25 21:58:26 +00:00
John Reck
7679491b02 Merge "Shut up" into lmp-dev 2014-07-24 22:43:15 +00:00
John Reck
5fc41b3ff7 Shut up
Change-Id: I7edbedf665a567e363e3db7984c7c59cba857ad5
2014-07-25 15:19:38 -07:00
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
Andrew Lee
63e44bd999 Merge "Add VideoCall and VideoCall.Listener as an inner classes of Call." into lmp-dev 2014-07-24 22:43:15 +00:00
Kenny Guy
466d203c4f Add method to launch settings app details page.
Add a method to LauncherApps to allow launchers to
show application details for an app in a managed profile.

Bug: 16371359
Change-Id: I23acb4365c09e4a7b9fa742ae6fc7e04434f45aa
2014-07-25 15:59:51 +00:00
Andrew Lee
50aca23bd7 Add VideoCall and VideoCall.Listener as an inner classes of Call.
Bug: 16494880
Bug: 16495203
Change-Id: Ife3b6723374ea5fbbff4927c4f9168d075be21e1
2014-07-25 08:58:10 -07:00
Derek Sollenberger
cae05e0b4c Move Canvas.h to a new location so that it can be shared with HWUI.
Bug: 15672762
Change-Id: Ia59e986cd4034e16b2e54e8d594e6941a6c9fb1b
2014-07-25 11:39:37 -04: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