164274 Commits

Author SHA1 Message Date
Winson Chung
df56c759a4 am 56f77a6f: Merge "Preloading task metadata to improve Recents startup time after reboot. (Bug 18057321)" into lmp-mr1-dev automerge: 0841cf7
* commit '56f77a6f535a38ccd0bbe359ffd0be766bcc1d51':
  Preloading task metadata to improve Recents startup time after reboot. (Bug 18057321)
2014-10-24 23:03:30 +00:00
Svetoslav
89e5035da6 am dcf21b96: Merge "Enhance computation of click point for accessibility." into lmp-mr1-dev automerge: 74a4a8d
* commit 'dcf21b968d3bd15f7e917ee585cf2a8dbe1babd5':
  Enhance computation of click point for accessibility.
2014-10-24 23:03:25 +00:00
Jeff Sharkey
1b632db207 am ea1841a3: Merge "Use default volume description when missing label." into lmp-mr1-dev automerge: cc66a23
* commit 'ea1841a3c1015b53e19ace727f9ebe5a75f87dc1':
  Use default volume description when missing label.
2014-10-24 23:03:19 +00:00
Alan Viverette
51547e750e am eba0a750: Merge "Clean up GradientDrawable styled attributes, fix useLevelForShape" into lmp-mr1-dev automerge: 91a1a72
* commit 'eba0a7509178094a46c3cca212bc3f07e70b159e':
  Clean up GradientDrawable styled attributes, fix useLevelForShape
2014-10-24 23:03:11 +00:00
Tyler Gunn
c313c441b5 am 928debf5: Merge "IMS call merge call-back changes." into lmp-mr1-dev automerge: cf96936
* commit '928debf59a1c8249a6a502574f806955f2a166cc':
  IMS call merge call-back changes.
2014-10-24 23:03:06 +00:00
Winson Chung
56f77a6f53 Merge "Preloading task metadata to improve Recents startup time after reboot. (Bug 18057321)" into lmp-mr1-dev
automerge: 0841cf7

* commit '0841cf7f37d7b20a08fa894c366f32fde55ea7e9':
  Preloading task metadata to improve Recents startup time after reboot. (Bug 18057321)
2014-10-24 22:25:31 +00:00
Svetoslav
dcf21b968d Merge "Enhance computation of click point for accessibility." into lmp-mr1-dev
automerge: 74a4a8d

* commit '74a4a8d6162dde06297ff6c3ef264e7f9066b88f':
  Enhance computation of click point for accessibility.
2014-10-24 22:24:10 +00:00
Winson Chung
0841cf7f37 Merge "Preloading task metadata to improve Recents startup time after reboot. (Bug 18057321)" into lmp-mr1-dev 2014-10-24 22:08:12 +00:00
Svetoslav
74a4a8d616 Merge "Enhance computation of click point for accessibility." into lmp-mr1-dev 2014-10-24 21:57:39 +00:00
Jeff Sharkey
ea1841a3c1 Merge "Use default volume description when missing label." into lmp-mr1-dev
automerge: cc66a23

* commit 'cc66a236f90cbef7f9562b4179c3aec517f4f082':
  Use default volume description when missing label.
2014-10-24 21:41:19 +00:00
Alan Viverette
eba0a75091 Merge "Clean up GradientDrawable styled attributes, fix useLevelForShape" into lmp-mr1-dev
automerge: 91a1a72

* commit '91a1a7296b776400b9c863ec094cd135614c6fbb':
  Clean up GradientDrawable styled attributes, fix useLevelForShape
2014-10-24 21:40:04 +00:00
Tyler Gunn
928debf59a Merge "IMS call merge call-back changes." into lmp-mr1-dev
automerge: cf96936

* commit 'cf96936966ae9506ce4151bf5bee276b5c7ea96b':
  IMS call merge call-back changes.
2014-10-24 21:38:40 +00:00
Jeff Sharkey
cc66a236f9 Merge "Use default volume description when missing label." into lmp-mr1-dev 2014-10-24 21:33:00 +00:00
Paul Lawrence
60302f1938 am c220d8e5: Stop crypto UI from crashing during encryption automerge: 0e6178b automerge: e20dd30
automerge: 31deee5

* commit '31deee5e307c00245d0fc7fd09dfe299145e1e0c':
  Stop crypto UI from crashing during encryption
2014-10-24 21:30:13 +00: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
Svet Ganov
d1cd77254b Merge "Crash in print spooler if printing app killed from recents." into lmp-mr1-dev automerge: 7cf7c36
automerge: fb7c62c

* commit 'fb7c62c143d210b9ecd01c3054ae2dfbd0dda2b6':
  Crash in print spooler if printing app killed from recents.
2014-10-24 21:27:22 +00:00
Jeff Sharkey
f135073fdd Merge "Recent directories can\'t show file size." into lmp-mr1-dev automerge: 379551e
automerge: 043f8dd

* commit '043f8dd27459f98537d46db77d482215b66c0ba0':
  Recent directories can't show file size.
2014-10-24 21:26:09 +00:00
Tim Kilbourn
a9aecc0c29 Merge "aapt updates for Android TV" into lmp-mr1-dev automerge: 6af7d76
automerge: 181c18e

* commit '181c18efd438f7a5e8cc18327367c49bf51795be':
  aapt updates for Android TV
2014-10-24 21:24:59 +00:00
Alan Viverette
91a1a7296b Merge "Clean up GradientDrawable styled attributes, fix useLevelForShape" into lmp-mr1-dev 2014-10-24 21:17:43 +00:00
Tyler Gunn
cf96936966 Merge "IMS call merge call-back changes." into lmp-mr1-dev 2014-10-24 21:10:41 +00:00
Paul Lawrence
31deee5e30 am c220d8e5: Stop crypto UI from crashing during encryption automerge: 0e6178b
automerge: e20dd30

* commit 'e20dd304b74c7479e1471780e985416902a9b9e9':
  Stop crypto UI from crashing during encryption
2014-10-24 21:10:27 +00:00
Tyler Gunn
f764e80757 IMS call merge call-back changes.
Renaming callSessionMerged to callSessionMergeStarted.
Adding callSessionMergeComplete callback for when merge successfully
completes.

Bug: 18056632
Change-Id: I8fc73b6c9db5e7970de81d8c3e09abc80f1a262f
2014-10-24 14:06:40 -07:00
Jeff Sharkey
c99d00be67 Use default volume description when missing label.
Some mounted storage volumes may not have a user-defined label.  In
those cases, use the default description for the volume.

Bug: 17781505
Change-Id: I8558ba2615c2ff2647a5d44afaec83249df466ab
2014-10-24 13:57:47 -07:00
Paul Lawrence
e20dd304b7 am c220d8e5: Stop crypto UI from crashing during encryption
automerge: 0e6178b

* commit '0e6178b81eb5a09253acbb6e28ee863ffbf8a5a5':
  Stop crypto UI from crashing during encryption
2014-10-24 20:56:22 +00:00
Alan Viverette
4329ad3be8 Merge "Add support for Explore by Touch to RadialTimePickerView" into lmp-mr1-dev
automerge: 1ac5266

* commit '1ac52667ee03af090bb13d1ccf45ee6f38ddee3c':
  Add support for Explore by Touch to RadialTimePickerView
2014-10-24 20:48:05 +00:00
Svet Ganov
fb7c62c143 Merge "Crash in print spooler if printing app killed from recents." into lmp-mr1-dev
automerge: 7cf7c36

* commit '7cf7c364386d18b94d212d98072e97c1c3d87e26':
  Crash in print spooler if printing app killed from recents.
2014-10-24 20:46:17 +00:00
Jeff Sharkey
043f8dd274 Merge "Recent directories can\'t show file size." into lmp-mr1-dev
automerge: 379551e

* commit '379551ebd54947cdff5600af52940f9c283aac1f':
  Recent directories can't show file size.
2014-10-24 20:44:53 +00:00
Tim Kilbourn
181c18efd4 Merge "aapt updates for Android TV" into lmp-mr1-dev
automerge: 6af7d76

* commit '6af7d76eff60220c5ab3678d8d1fb74ede242ace':
  aapt updates for Android TV
2014-10-24 20:43:15 +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
Svet Ganov
7cf7c36438 Merge "Crash in print spooler if printing app killed from recents." into lmp-mr1-dev 2014-10-24 20:32:19 +00:00
Jeff Sharkey
379551ebd5 Merge "Recent directories can't show file size." into lmp-mr1-dev 2014-10-24 20:29:59 +00:00
Tim Kilbourn
6af7d76eff Merge "aapt updates for Android TV" into lmp-mr1-dev 2014-10-24 20:13:43 +00:00
Paul Lawrence
0e6178b81e am c220d8e5: Stop crypto UI from crashing during encryption
* commit 'c220d8e57ca97c70db1fd72f040bd6c6f70bbf13':
  Stop crypto UI from crashing during encryption
2014-10-24 20:08:33 +00:00
Jeff Sharkey
0166ddf5bb Recent directories can't show file size.
Don't show the toggle to the user, which can avoid crashing.

Bug: 17942524
Change-Id: Iaedd61b7c69e14b57508cb9865d1e0124ca2e505
2014-10-24 13:06:32 -07:00
Svet Ganov
4237c92d85 Crash in print spooler if printing app killed from recents.
If the printing app with the print UI on top is killed from recents we get
a crash because: 1) the remote print document was not transitioned to a
failed state if the printing app dies (this is an unrecoverable failure);
2) the print preview controller was destroyed asyncronosly during which it
also asynchronously disconnects from the rendering service which however
happens after the system has already cleaned up all connections of the print
UI activity as it is being destoryed.

bug:18109386

Change-Id: If6200b14a8aa90622228bbb659e9c4962226f561
2014-10-24 13:01:54 -07:00
Tim Kilbourn
d9b1cad71e aapt updates for Android TV
- Output whether an app claims to be a game (android:isGame)
- Output android:banner if it is specified at the application level.

Change-Id: I7118b524f62cdfc4effeef21b32b3cdd814d9bfa
2014-10-24 12:59:24 -07:00
Alan Viverette
969ca91acd Clean up GradientDrawable styled attributes, fix useLevelForShape
BUG: 18117976
Change-Id: Iff2ea392204346f68ea47d577e442d398114e5d8
2014-10-24 12:25:04 -07: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
Winson Chung
14dd733073 am 00f65038: am 272b0a1d: Merge "Fixing issue where Recents would not work if the time is changed. (Bug 17995039)" into lmp-mr1-dev
* commit '00f65038bbbfd0227bb544040e0f06038016a7b4':
  Fixing issue where Recents would not work if the time is changed. (Bug 17995039)
2014-10-24 18:44:22 +00:00
Winson Chung
00f65038bb am 272b0a1d: Merge "Fixing issue where Recents would not work if the time is changed. (Bug 17995039)" into lmp-mr1-dev
* commit '272b0a1d6acdb7c4d244a498f3769e20c35f43d1':
  Fixing issue where Recents would not work if the time is changed. (Bug 17995039)
2014-10-24 18:39:28 +00:00
Winson Chung
7f8d8cc6a2 am e60abbd8: am 623484d2: Merge "Ensuring that user-specific Recent tasks are removed. (Bug 18036610)" into lmp-mr1-dev
* commit 'e60abbd8f2e8d54f0a04944c11f2f752f8a206e2':
  Ensuring that user-specific Recent tasks are removed. (Bug 18036610)
2014-10-24 18:34:47 +00:00
Winson Chung
b645ac5fc4 am 788dd73c: am 6697322a: Merge "Should use Activity.onEnterAnimationComplete. (Bug 18031283)" into lmp-mr1-dev
* commit '788dd73c9e96f77370f8a787d3c25c8ff741de64':
  Should use Activity.onEnterAnimationComplete. (Bug 18031283)
2014-10-24 18:34:36 +00:00
Jae Seo
1c8317a539 am 39b15017: am f98fe42f: Merge "TIF: Notify of size change of the video in TvView" into lmp-mr1-dev
* commit '39b150173ae3a2b6950553450648d5bb223542e3':
  TIF: Notify of size change of the video in TvView
2014-10-24 18:34:30 +00:00
Winson Chung
272b0a1d6a Merge "Fixing issue where Recents would not work if the time is changed. (Bug 17995039)" into lmp-mr1-dev 2014-10-24 18:32:02 +00:00
Winson Chung
e60abbd8f2 am 623484d2: Merge "Ensuring that user-specific Recent tasks are removed. (Bug 18036610)" into lmp-mr1-dev
* commit '623484d231436ee209089adaa6b88b68f0ebf534':
  Ensuring that user-specific Recent tasks are removed. (Bug 18036610)
2014-10-24 18:30:38 +00:00
Winson Chung
788dd73c9e am 6697322a: Merge "Should use Activity.onEnterAnimationComplete. (Bug 18031283)" into lmp-mr1-dev
* commit '6697322af724d44ee59259d4f5563b07c24f62b4':
  Should use Activity.onEnterAnimationComplete. (Bug 18031283)
2014-10-24 18:30:33 +00:00
Jae Seo
39b150173a am f98fe42f: Merge "TIF: Notify of size change of the video in TvView" into lmp-mr1-dev
* commit 'f98fe42f65ff90ae7e3f4c21757827604d374510':
  TIF: Notify of size change of the video in TvView
2014-10-24 18:30:28 +00:00
Winson Chung
bac679b0d4 Preloading task metadata to improve Recents startup time after reboot. (Bug 18057321)
Change-Id: I7fc627c79fe369e444ab411d109c439f796d67ff
2014-10-24 11:29:12 -07:00
Winson Chung
623484d231 Merge "Ensuring that user-specific Recent tasks are removed. (Bug 18036610)" into lmp-mr1-dev 2014-10-24 18:25:10 +00:00
Winson Chung
6697322af7 Merge "Should use Activity.onEnterAnimationComplete. (Bug 18031283)" into lmp-mr1-dev 2014-10-24 18:24:54 +00:00