Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
169,382 Commits 3 Branches 0 Tags
a19829a54af2b40671a1fbdfd7b0eb8a6674b188
Commit Graph

169382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Natalie Masse
a19829a54a am 7e3f7ced: am a2e6ec07: am 694a9e46: am 0fbbed83: am 60144a7a: am bcf9ced4: am 1e5bb861: Link and typo fixed 
* commit '7e3f7ced5269828585fa0ffabdaac5b2a5f4039e':
  Link and typo fixed
 2014-10-25 02:37:03 +00:00
George Mount
8652102d3f am a618afc0: am 511452cf: am b71580c3: Merge "Fix NPE when rejected snapshots are null." into lmp-mr1-dev 
* commit 'a618afc0c76ceefc9a0fb4dd9c1b5f7685e0e84e':
  Fix NPE when rejected snapshots are null.
 2014-10-25 02:36:40 +00:00
Winson Chung
c41ed44bfc am df56c759: am 56f77a6f: Merge "Preloading task metadata to improve Recents startup time after reboot. (Bug 18057321)" into lmp-mr1-dev automerge: 0841cf7 
* commit 'df56c759a4c704d99660c434567a1fd2c56897f6':
  Preloading task metadata to improve Recents startup time after reboot. (Bug 18057321)
 2014-10-25 02:36:23 +00:00
Svetoslav
cd34983dfa am 89e5035d: am dcf21b96: Merge "Enhance computation of click point for accessibility." into lmp-mr1-dev automerge: 74a4a8d 
* commit '89e5035da643369b857ebc87d11aa5190b1fb8df':
  Enhance computation of click point for accessibility.
 2014-10-25 02:36:18 +00:00
Jeff Sharkey
ecee90d989 am 1b632db2: am ea1841a3: Merge "Use default volume description when missing label." into lmp-mr1-dev automerge: cc66a23 
* commit '1b632db2074365a7094177f655a4f750807f61f0':
  Use default volume description when missing label.
 2014-10-25 02:36:13 +00:00
Alan Viverette
c6dac7ef17 am 51547e75: am eba0a750: Merge "Clean up GradientDrawable styled attributes, fix useLevelForShape" into lmp-mr1-dev automerge: 91a1a72 
* commit '51547e750e30801e2d367433d8cd59f6b77fdc8c':
  Clean up GradientDrawable styled attributes, fix useLevelForShape
 2014-10-25 02:36:06 +00:00
Tyler Gunn
d2831cb0ca am c313c441: am 928debf5: Merge "IMS call merge call-back changes." into lmp-mr1-dev automerge: cf96936 
* commit 'c313c441b5f7c0aacb1261d8abf776a80381cfba':
  IMS call merge call-back changes.
 2014-10-25 02:36:02 +00:00
Paul Lawrence
876c00dcf5 am 60302f19: am c220d8e5: Stop crypto UI from crashing during encryption automerge: 0e6178b automerge: e20dd30 automerge: 31deee5 
* commit '60302f1938e684407458e61b082353bf770c5dac':
  Stop crypto UI from crashing during encryption
 2014-10-25 02:35:44 +00:00
Alan Viverette
a7dc89bcfc am a8aa03ef: Merge "Add support for Explore by Touch to RadialTimePickerView" into lmp-mr1-dev automerge: 1ac5266 automerge: 4329ad3 
* commit 'a8aa03efa7541b1e6144028271a4d1635aeebfac':
  Add support for Explore by Touch to RadialTimePickerView
 2014-10-25 02:35:39 +00:00
Svet Ganov
ea74007809 am d1cd7725: Merge "Crash in print spooler if printing app killed from recents." into lmp-mr1-dev automerge: 7cf7c36 automerge: fb7c62c 
* commit 'd1cd77254bf6000f9c2ca742e4870ffd7d033f5a':
  Crash in print spooler if printing app killed from recents.
 2014-10-25 02:35:30 +00:00
Jeff Sharkey
e2120f49f0 am f135073f: Merge "Recent directories can\'t show file size." into lmp-mr1-dev automerge: 379551e automerge: 043f8dd 
* commit 'f135073fddff16595f7fd1c53ce4258ed96ec5cf':
  Recent directories can't show file size.
 2014-10-25 02:35:26 +00:00
Tim Kilbourn
7520a452a9 am a9aecc0c: Merge "aapt updates for Android TV" into lmp-mr1-dev automerge: 6af7d76 automerge: 181c18e 
* commit 'a9aecc0c29ce9b9692b9b317559f83b2520dcc43':
  aapt updates for Android TV
 2014-10-25 02:35:16 +00:00
Natalie Masse
7e3f7ced52 am a2e6ec07: am 694a9e46: am 0fbbed83: am 60144a7a: am bcf9ced4: am 1e5bb861: Link and typo fixed 
* commit 'a2e6ec070cc9c127a5c376e3bf5e19de09c44324':
  Link and typo fixed
 2014-10-24 23:39:29 +00:00
Natalie Masse
a2e6ec070c am 694a9e46: am 0fbbed83: am 60144a7a: am bcf9ced4: am 1e5bb861: Link and typo fixed 
* commit '694a9e464cb389e02eac14a163f5fdc10b204880':
  Link and typo fixed
 2014-10-24 23:31:29 +00:00
Natalie Masse
694a9e464c am 0fbbed83: am 60144a7a: am bcf9ced4: am 1e5bb861: Link and typo fixed 
* commit '0fbbed83a681099b7ce9a98fe6cd3cf52a250338':
  Link and typo fixed
 2014-10-24 23:17:34 +00:00
George Mount
a618afc0c7 am 511452cf: am b71580c3: Merge "Fix NPE when rejected snapshots are null." into lmp-mr1-dev 
* commit '511452cf4d3cd2669a89abd98658a844b852b5e3':
  Fix NPE when rejected snapshots are null.
 2014-10-24 23:13:38 +00:00
Natalie Masse
0fbbed83a6 am 60144a7a: am bcf9ced4: am 1e5bb861: Link and typo fixed 
* commit '60144a7a06d818e7ef22d08722be67c602aeb088':
  Link and typo fixed
 2014-10-24 23:04:46 +00:00
George Mount
511452cf4d am b71580c3: Merge "Fix NPE when rejected snapshots are null." into lmp-mr1-dev 
* commit 'b71580c34efcc12bf7221c57eccaf80f36cb23bc':
  Fix NPE when rejected snapshots are null.
 2014-10-24 23:03:42 +00:00
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
George Mount
b71580c34e Merge "Fix NPE when rejected snapshots are null." into lmp-mr1-dev 2014-10-24 22:43:45 +00:00
Natalie Masse
60144a7a06 am bcf9ced4: am 1e5bb861: Link and typo fixed 
* commit 'bcf9ced47a123220271fcca70f71c2adf69ad100':
  Link and typo fixed
 2014-10-24 22:36:54 +00:00
George Mount
83c692efd3 Fix NPE when rejected snapshots are null. 
Bug 18055705

Change-Id: Id0b98e7da5510af438c5d66c0ddb00489d581864
 2014-10-24 15:26:32 -07: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