drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
149,388 Commits 1 Branch 0 Tags
Commit Graph

149388 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
f23e6bd45f am 46d239e7: am 8677fbb2: am 96dc0629: Merge "AAPT support for feature splits" into lmp-dev 
* commit '46d239e7c2d39cfc62262315c22df78f7497120f':
  AAPT support for feature splits
 2014-08-09 04:21:03 +00:00
Adam Lesinski
fee7eed93a am 8677fbb2: am 96dc0629: Merge "AAPT support for feature splits" into lmp-dev 
* commit '8677fbb29473babc0c6942163b8a796450f4f33b':
  AAPT support for feature splits
 2014-08-09 03:30:19 +00:00
Winson Chung
f1eff768c1 am b6850473: am da48e8a9: am 038561b5: Merge "Fixing transition animation in landscape on tablets (Bug 16867731)" into lmp-dev 
* commit 'b68504737db37f2a609f4b95d10fcefe8674c9b1':
  Fixing transition animation in landscape on tablets (Bug 16867731)
 2014-08-09 03:14:12 +00:00
Adam Lesinski
4649fdfb65 am 96dc0629: Merge "AAPT support for feature splits" into lmp-dev 
* commit '96dc06291a7fc8779730419d0a9fcd00d526285f':
  AAPT support for feature splits
 2014-08-09 01:58:10 +00:00
Winson Chung
781d0b66fe am da48e8a9: am 038561b5: Merge "Fixing transition animation in landscape on tablets (Bug 16867731)" into lmp-dev 
* commit 'da48e8a915287c78140eae221073eedc2dc20a2f':
  Fixing transition animation in landscape on tablets (Bug 16867731)
 2014-08-09 01:00:46 +00:00
Winson Chung
2ce27629d4 am 038561b5: Merge "Fixing transition animation in landscape on tablets (Bug 16867731)" into lmp-dev 
* commit '038561b5d34ed2b97d3e0d8e236f3ce30b7557ef':
  Fixing transition animation in landscape on tablets (Bug 16867731)
 2014-08-09 00:56:46 +00:00
Adam Lesinski
ec64709ce0 Merge "AAPT support for feature splits" into lmp-dev 2014-08-09 00:40:15 +00:00
Jose Lima
fea4cddb37 am 4e3f4aeb: am 71e07247: am 927d07ec: Merge "Added StatusBarNotification.aidl to frameworks/base/Android.mk" into lmp-dev 
* commit '4e3f4aeb32bf960ff0d9f98d0d69aed54cd3af95':
  Added StatusBarNotification.aidl to frameworks/base/Android.mk
 2014-08-09 00:12:11 +00:00
Jose Lima
cff9bc2e84 am 71e07247: am 927d07ec: Merge "Added StatusBarNotification.aidl to frameworks/base/Android.mk" into lmp-dev 
* commit '71e07247546df05efd6b335f2604c93d0ff1eda7':
  Added StatusBarNotification.aidl to frameworks/base/Android.mk
 2014-08-09 00:08:16 +00:00
Amith Yamasani
4c64af4f63 am 9961cc34: am 70a36a49: am 3cb15637: Allow singleton providers to accept connections from other users 
* commit '9961cc3450b2dc023f5c045ae37d747a89e12f3c':
  Allow singleton providers to accept connections from other users
 2014-08-09 00:08:07 +00:00
Amith Yamasani
0cbce460bc am 70a36a49: am 3cb15637: Allow singleton providers to accept connections from other users 
* commit '70a36a49acb54a225568cdb09c1566935cc940a2':
  Allow singleton providers to accept connections from other users
 2014-08-09 00:04:08 +00:00
Jose Lima
d2655891f1 am 927d07ec: Merge "Added StatusBarNotification.aidl to frameworks/base/Android.mk" into lmp-dev 
* commit '927d07eca6941c5c331a6491ff1b45850fa1bc44':
  Added StatusBarNotification.aidl to frameworks/base/Android.mk
 2014-08-09 00:03:44 +00:00
Amith Yamasani
e6e2d08938 am 3cb15637: Allow singleton providers to accept connections from other users 
* commit '3cb156372b0b18030196e17f1d503e2a62531594':
  Allow singleton providers to accept connections from other users
 2014-08-08 23:56:48 +00:00
George Mount
98d8c3e61f am 390b066b: am 2c61d2f5: am 8011744b: Merge "Move shared elements to overlay when in a transition group." into lmp-dev 
* commit '390b066b894dd5a855c8028ce3b485374b4d1a55':
  Move shared elements to overlay when in a transition group.
 2014-08-08 23:56:33 +00:00
George Mount
03f8e26083 am 2c61d2f5: am 8011744b: Merge "Move shared elements to overlay when in a transition group." into lmp-dev 
* commit '2c61d2f56f0866efe1d875e81d24e6dadfe22ba6':
  Move shared elements to overlay when in a transition group.
 2014-08-08 23:52:52 +00:00
Amith Yamasani
a6f4d58b90 Allow singleton providers to accept connections from other users 
This is required for singleton providers like sms log.

Change-Id: Icb18a764c27dc1b43f8b8bcc24c21c91274995fd
 2014-08-08 16:50:42 -07:00
George Mount
8a881cc33a am 8011744b: Merge "Move shared elements to overlay when in a transition group." into lmp-dev 
* commit '8011744b52dbd2089b079fcd7e426550f40a8379':
  Move shared elements to overlay when in a transition group.
 2014-08-08 23:48:19 +00:00
Jeff Sharkey
14c63582a2 am b7c84df9: am 3da08302: am 64f7e438: Move DocumentsUI settings into overflow menu. 
* commit 'b7c84df9d820911464073084d52adc6b7d2bb8c6':
  Move DocumentsUI settings into overflow menu.
 2014-08-08 23:34:53 +00:00
Jeff Sharkey
b40ba72941 am 3da08302: am 64f7e438: Move DocumentsUI settings into overflow menu. 
* commit '3da083027f3816174093b12d64ea86a23ecc9021':
  Move DocumentsUI settings into overflow menu.
 2014-08-08 23:28:13 +00:00
Jeff Sharkey
0369cdf329 am 64f7e438: Move DocumentsUI settings into overflow menu. 
* commit '64f7e43838255464164b5dd56595590ec14eefab':
  Move DocumentsUI settings into overflow menu.
 2014-08-08 23:16:54 +00:00
Jose Lima
7f708ecc2f Merge "Added StatusBarNotification.aidl to frameworks/base/Android.mk" into lmp-dev 2014-08-08 23:07:59 +00:00
Jose Lima
b6d77e2d16 Added StatusBarNotification.aidl to frameworks/base/Android.mk 
Change-Id: I98fb4821642e3431bb41506de3d8905f90a40729
 2014-08-08 16:39:28 -07:00
George Mount
9985aaf268 Merge "Move shared elements to overlay when in a transition group." into lmp-dev 2014-08-08 23:02:20 +00:00
Jeff Sharkey
669f8e7c70 Move DocumentsUI settings into overflow menu. 
Also use different strings based on device type to make clearer.

Bug: 13437894
Change-Id: I4053780de2c7197fb45cc53aee7659e9d0d75c0a
 2014-08-08 23:00:55 +00:00
Igor Murashkin
f5d813750d am 05ed8150: am f9dc65f9: am b4131ac5: camera2: Fix TotalCaptureResult#getKeys not to return empty list 
* commit '05ed8150ccb458fbe5064049f712829a6e25a83e':
  camera2: Fix TotalCaptureResult#getKeys not to return empty list
 2014-08-08 22:58:02 +00:00
Igor Murashkin
7d580c4bf8 am f9dc65f9: am b4131ac5: camera2: Fix TotalCaptureResult#getKeys not to return empty list 
* commit 'f9dc65f99d599370d00b300b6cb0cf885448bddc':
  camera2: Fix TotalCaptureResult#getKeys not to return empty list
 2014-08-08 22:53:06 +00:00
Adam Lesinski
2586c89656 am 0bb27d84: am ed9be6fb: am 38daa3c5: Merge "Second iteration of the UsageStats API" into lmp-dev 
* commit '0bb27d848264459c08f3d81406edb591c54aad87':
  Second iteration of the UsageStats API
 2014-08-08 22:49:43 +00:00
Igor Murashkin
9346385035 am b4131ac5: camera2: Fix TotalCaptureResult#getKeys not to return empty list 
* commit 'b4131ac563d136ca7cb33afef876b0862522879f':
  camera2: Fix TotalCaptureResult#getKeys not to return empty list
 2014-08-08 22:48:37 +00:00
Igor Murashkin
696bbee963 camera2: Fix TotalCaptureResult#getKeys not to return empty list 
Bug: 16680352
Change-Id: Ie6b8a8bff6f9b87d058a21b07eb3447371a62b6b
 2014-08-08 22:45:00 +00:00
Adam Lesinski
c1675522b2 am ed9be6fb: am 38daa3c5: Merge "Second iteration of the UsageStats API" into lmp-dev 
* commit 'ed9be6fb4c2b575db01bd106df94585701f37341':
  Second iteration of the UsageStats API
 2014-08-08 22:44:27 +00:00
Adam Lesinski
911456c7d3 am 38daa3c5: Merge "Second iteration of the UsageStats API" into lmp-dev 
* commit '38daa3c57a87a42bfbdce3d85535ff106fe6a8b4':
  Second iteration of the UsageStats API
 2014-08-08 22:39:56 +00:00
Jeff Sharkey
a15253818d am 2729566d: am 9915904f: am bc974e19: Separate MIME icons for some office formats. 
* commit '2729566da8156faedcb1ff4cc1bf74afd26d8c65':
  Separate MIME icons for some office formats.
 2014-08-08 22:38:02 +00:00
Jeff Sharkey
b5582cfaa4 am da993ff3: am b42e4cd8: am b5468f8e: More material updates to DocumentsUI. 
* commit 'da993ff38b107e84af346a217c797f1d8c90cb67':
  More material updates to DocumentsUI.
 2014-08-08 22:37:58 +00:00
Sandeep Siddhartha
eaaaab8165 am 7a1f38c6: am eb2af5c2: am 0edd1360: Merge "Add the capture session (and its availability) in the EventPayload" into lmp-dev 
* commit '7a1f38c6ab92d0600d533996ed976fd9fb7ba0b8':
  Add the capture session (and its availability) in the EventPayload
 2014-08-08 22:37:53 +00:00
Jinsuk Kim
499e0b61fc am de953c2b: am fe9d9306: am ca4fb8cd: Merge "CEC: Content observer to handle TV Setting update" into lmp-dev 
* commit 'de953c2b1b080ed698383c41145a119f4cae4d01':
  CEC: Content observer to handle TV Setting update
 2014-08-08 22:37:49 +00:00
Dongwon Kang
ec592558da am d63ae8b9: am bc90cf2b: am e2ba5b0b: Merge "TIF: introducing TvInputSettings for put/getting user preferences from Settings." into lmp-dev 
* commit 'd63ae8b9d28a1ac4c80665d688abfe665970d025':
  TIF: introducing TvInputSettings for put/getting user preferences from Settings.
 2014-08-08 22:37:44 +00:00
Jeff Sharkey
498a8f1659 am 9915904f: am bc974e19: Separate MIME icons for some office formats. 
* commit '9915904f73a98e34444365980699541817016162':
  Separate MIME icons for some office formats.
 2014-08-08 22:31:43 +00:00
Jeff Sharkey
7d7131cf92 am b42e4cd8: am b5468f8e: More material updates to DocumentsUI. 
* commit 'b42e4cd810c328269e969cc707a2cfe7bea88f1d':
  More material updates to DocumentsUI.
 2014-08-08 22:31:39 +00:00
Sandeep Siddhartha
420ba02bce am eb2af5c2: am 0edd1360: Merge "Add the capture session (and its availability) in the EventPayload" into lmp-dev 
* commit 'eb2af5c27729d81bc2c15e726b2244774d287c22':
  Add the capture session (and its availability) in the EventPayload
 2014-08-08 22:31:33 +00:00
Jinsuk Kim
223ac18a97 am fe9d9306: am ca4fb8cd: Merge "CEC: Content observer to handle TV Setting update" into lmp-dev 
* commit 'fe9d9306e8fb547b183b7caabb883a6d009b6de9':
  CEC: Content observer to handle TV Setting update
 2014-08-08 22:31:28 +00:00
Dongwon Kang
b069c8f307 am bc90cf2b: am e2ba5b0b: Merge "TIF: introducing TvInputSettings for put/getting user preferences from Settings." into lmp-dev 
* commit 'bc90cf2bae392e5b65b50ffe9440d18ea0873fe0':
  TIF: introducing TvInputSettings for put/getting user preferences from Settings.
 2014-08-08 22:31:24 +00:00
Nancy Chen
74b57a3160 am 4f0b49fd: am 41914c87: am 7bbac19e: Merge "Better comments for the CONNECTING state." into lmp-dev 
* commit '4f0b49fd652a43b10ce8cb2d41dd43518c6e79b0':
  Better comments for the CONNECTING state.
 2014-08-08 22:29:19 +00:00
Dongwon Kang
c52ae5ef49 am c5f19b30: am c574191b: am 84e195cd: TIF: fix a regression introduced while addressing merge conflict in TIS 
* commit 'c5f19b30397bcd672c6fa5c8e7e9ca1ed5a9e0ce':
  TIF: fix a regression introduced while addressing merge conflict in TIS
 2014-08-08 22:29:15 +00:00
Jeff Sharkey
49049f62a2 am bc974e19: Separate MIME icons for some office formats. 
* commit 'bc974e19d92e72a146a3183938ebf1c11e941853':
  Separate MIME icons for some office formats.
 2014-08-08 22:28:23 +00:00
Jeff Sharkey
cad072ac48 am b5468f8e: More material updates to DocumentsUI. 
* commit 'b5468f8ec4bc42a70665c5f5581c4054afb5e1ea':
  More material updates to DocumentsUI.
 2014-08-08 22:28:18 +00:00
Sandeep Siddhartha
449709fb9d am 0edd1360: Merge "Add the capture session (and its availability) in the EventPayload" into lmp-dev 
* commit '0edd136087cb8a1b4b91dd581e347337878f10f9':
  Add the capture session (and its availability) in the EventPayload
 2014-08-08 22:23:39 +00:00
Jinsuk Kim
080b754177 am ca4fb8cd: Merge "CEC: Content observer to handle TV Setting update" into lmp-dev 
* commit 'ca4fb8cde4fe3c1dd7a4d8c572d96b0a0f5dbc30':
  CEC: Content observer to handle TV Setting update
 2014-08-08 22:23:34 +00:00
Jeff Sharkey
770a532886 Separate MIME icons for some office formats. 
Bug: 12548097
Change-Id: I11808854e0a4fae2636a04f75599e022b4a8440f
 2014-08-08 22:23:32 +00:00
Dongwon Kang
8cbd00749a am e2ba5b0b: Merge "TIF: introducing TvInputSettings for put/getting user preferences from Settings." into lmp-dev 
* commit 'e2ba5b0bfc2ecb33bf31f919f4f09957bd871534':
  TIF: introducing TvInputSettings for put/getting user preferences from Settings.
 2014-08-08 22:23:29 +00:00
Nancy Chen
97d61e0661 am 41914c87: am 7bbac19e: Merge "Better comments for the CONNECTING state." into lmp-dev 
* commit '41914c87bfd16d7f06374d217db5a8afbc417946':
  Better comments for the CONNECTING state.
 2014-08-08 22:23:00 +00:00