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

149347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Dongwon Kang
18642f7d54 am c574191b: am 84e195cd: TIF: fix a regression introduced while addressing merge conflict in TIS 
* commit 'c574191b3a134613314c0ccb240c56bd19230dc5':
  TIF: fix a regression introduced while addressing merge conflict in TIS
 2014-08-08 22:22:55 +00:00
Jeff Sharkey
c29dd61cbf More material updates to DocumentsUI. 
All assets cut as alpha variants so we apply desired tinting at
runtime.  Small script to automatically generate XML resources.

Bug: 15836082, 16658537
Change-Id: I803b3f0bf6f121194a5445fd1c6600fabaf28f60
 2014-08-08 22:22:39 +00:00
Nancy Chen
3fc948b48a am 7bbac19e: Merge "Better comments for the CONNECTING state." into lmp-dev 
* commit '7bbac19ecafb8f87dabf2025996ccb73e18ea05f':
  Better comments for the CONNECTING state.
 2014-08-08 22:15:09 +00:00
Dongwon Kang
b9cc15c85c am 84e195cd: TIF: fix a regression introduced while addressing merge conflict in TIS 
* commit '84e195cdf794b590a070accded45e228fe1fbfd3':
  TIF: fix a regression introduced while addressing merge conflict in TIS
 2014-08-08 22:15:02 +00:00
Jay Shrauner
9e1bf86a76 am 4b90885d: am 4b9535e2: am d6b5cd19: Merge "Rename Internet calls SIP calls" into lmp-dev 
* commit '4b90885debeccb153134c0468aaa24f59a7e3dc5':
  Rename Internet calls SIP calls
 2014-08-08 21:52:27 +00:00
Jay Shrauner
f4748b3fb1 am 4b9535e2: am d6b5cd19: Merge "Rename Internet calls SIP calls" into lmp-dev 
* commit '4b9535e27b94f201229596f66d26766c2195da6a':
  Rename Internet calls SIP calls
 2014-08-08 21:46:38 +00:00
Jay Shrauner
d8336e73c9 am d6b5cd19: Merge "Rename Internet calls SIP calls" into lmp-dev 
* commit 'd6b5cd19fdd58c90ce51b397c621c1d89aa2e187':
  Rename Internet calls SIP calls
 2014-08-08 21:39:02 +00:00
Dongwon Kang
c566ca54b1 TIF: fix a regression introduced while addressing merge conflict in TIS 
Plus, a small code refactoring on DO_CREATE_SESSION for lower indentation
depth.

Bug: 16833301
Change-Id: Id0cb2df26015ea8286a1cf03024c44fa15f2628e
 2014-08-08 21:36:38 +00:00
Svetoslav
4412771589 am 01c2a68a: am 32c7fd28: am 3b94d0d8: Merge "Polish the new cross-profile app widget APIs" into lmp-dev 
* commit '01c2a68a4ebdc01ff8bc4c6789f3d99ce997d82a':
  Polish the new cross-profile app widget APIs
 2014-08-08 21:24:52 +00:00
Svetoslav
22a30049ec am 32c7fd28: am 3b94d0d8: Merge "Polish the new cross-profile app widget APIs" into lmp-dev 
* commit '32c7fd28e08de69592e210cb8cbe2cef1adf1308':
  Polish the new cross-profile app widget APIs
 2014-08-08 21:20:44 +00:00
Svetoslav
5873861ccb am 3b94d0d8: Merge "Polish the new cross-profile app widget APIs" into lmp-dev 
* commit '3b94d0d84b69717829fec51653e83580d3148fb8':
  Polish the new cross-profile app widget APIs
 2014-08-08 21:17:01 +00:00
ztenghui
f0d5c7bc5a am c04a21f8: am bbbe3d7b: am 6ab0f21f: Merge "Update attrs / public.xml for VectorDrawable opacity removal" into lmp-dev 
* commit 'c04a21f84b466ea54d46f4fd3bb26fb0b7c6f90c':
  Update attrs / public.xml for VectorDrawable opacity removal
 2014-08-08 21:16:51 +00:00
ztenghui
475a8d8496 am bbbe3d7b: am 6ab0f21f: Merge "Update attrs / public.xml for VectorDrawable opacity removal" into lmp-dev 
* commit 'bbbe3d7b575ba1275c4f92c7b0d72c3430cc20a2':
  Update attrs / public.xml for VectorDrawable opacity removal
 2014-08-08 21:12:37 +00:00
ztenghui
1b41552385 am 6ab0f21f: Merge "Update attrs / public.xml for VectorDrawable opacity removal" into lmp-dev 
* commit '6ab0f21f2c838da710659e9cc5e2d5813d16ca49':
  Update attrs / public.xml for VectorDrawable opacity removal
 2014-08-08 21:08:29 +00:00
Winson Chung
265b6fc548 am 8aa64bdf: am 0ecbe9d6: am 14176afa: Merge "Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622)" into lmp-dev 
* commit '8aa64bdf9fb4d37fda6590b709f63204693bde17':
  Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622)
 2014-08-08 21:06:14 +00:00
Amith Yamasani
186be6de26 am 794fca97: am a7d2f72f: am c35d3ebb: Merge "No need to send PRE_BOOT_COMPLETED for new users" into lmp-dev 
* commit '794fca977de17415e06946c23b71e8bd19d24b78':
  No need to send PRE_BOOT_COMPLETED for new users
 2014-08-08 21:06:09 +00:00
Winson Chung
64d58eb9e1 am 0ecbe9d6: am 14176afa: Merge "Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622)" into lmp-dev 
* commit '0ecbe9d6882d1d4138d4b9ca390c96c7014b692c':
  Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622)
 2014-08-08 21:00:30 +00:00
Amith Yamasani
6ac9592eee am a7d2f72f: am c35d3ebb: Merge "No need to send PRE_BOOT_COMPLETED for new users" into lmp-dev 
* commit 'a7d2f72ffcdcd15ed4a22f57c1a5cff8d1756587':
  No need to send PRE_BOOT_COMPLETED for new users
 2014-08-08 21:00:26 +00:00
Winson Chung
f62ff50168 am 14176afa: Merge "Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622)" into lmp-dev 
* commit '14176afa349fb17ba6327e12882e503fd84f41a0':
  Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622)
 2014-08-08 20:56:09 +00:00
Amith Yamasani
377d926096 am c35d3ebb: Merge "No need to send PRE_BOOT_COMPLETED for new users" into lmp-dev 
* commit 'c35d3ebb1381e52db1929206524a72d258ba6aea':
  No need to send PRE_BOOT_COMPLETED for new users
 2014-08-08 20:56:04 +00:00
John Reck
a4f68ee546 am dda54735: am 3a7d5fa9: am 4f215996: Fix damage for layers for projection receivers 
* commit 'dda547354b5c7bcf631735311165ce1c63459c20':
  Fix damage for layers for projection receivers
 2014-08-08 20:51:16 +00:00
John Reck
9883ac77f6 am 3a7d5fa9: am 4f215996: Fix damage for layers for projection receivers 
* commit '3a7d5fa9d07d4638470ae466b8e392c392650da8':
  Fix damage for layers for projection receivers
 2014-08-08 20:48:01 +00:00
John Reck
972466f7e9 am 4f215996: Fix damage for layers for projection receivers 
* commit '4f2159960c7a8921834677f748d7018774685a21':
  Fix damage for layers for projection receivers
 2014-08-08 20:43:52 +00:00
Dongwon Kang
9dfd731db5 Merge "TIF: introducing TvInputSettings for put/getting user preferences from Settings." into lmp-dev 2014-08-08 20:34:05 +00:00
Dongwon Kang
4d933a0ef0 TIF: introducing TvInputSettings for put/getting user preferences from Settings. 
Reference:
  - Settings.Secure.ENABLED_INPUT_METHODS
  - InputMethodSettings

Bug: 16876078
Change-Id: I72c1770517052188694f21c10da383338edc8ee2
 2014-08-08 21:36:50 +00:00
John Spurlock
df6a28475b am ba5c934c: am fa8faa9b: am 508dc373: Merge "New api to sync zen mode state from listeners." into lmp-dev 
* commit 'ba5c934c7e3562df7492b77ecb7904847011eedf':
  New api to sync zen mode state from listeners.
 2014-08-08 20:25:07 +00:00
John Reck
a7c2ea20c4 Fix damage for layers for projection receivers 
Bug: 16880228

Change-Id: I59ab760a21f49cc2cac0d8936b173cff292e6114
 2014-08-08 20:24:34 +00:00
John Spurlock
fd99d03430 am fa8faa9b: am 508dc373: Merge "New api to sync zen mode state from listeners." into lmp-dev 
* commit 'fa8faa9b47b091be53da695b950c9d803699f1a4':
  New api to sync zen mode state from listeners.
 2014-08-08 20:21:24 +00:00
John Spurlock
f36a999bf4 am 508dc373: Merge "New api to sync zen mode state from listeners." into lmp-dev 
* commit '508dc373dd3eda0da7ff104fd60acbd1338ae718':
  New api to sync zen mode state from listeners.
 2014-08-08 20:16:53 +00:00
Dake Gu
cc11a1106f am dc0781b5: am ffbf66b6: am afb539e6: Merge "Transition: remap if views in calling activity became invalid" into lmp-dev 
* commit 'dc0781b5518be0bcfce6a5e8f63a819b59ef1b0e':
  Transition: remap if views in calling activity became invalid
 2014-08-08 19:56:51 +00:00
Alan Viverette
1ed8e75a72 am 1bdf2c19: am 68bb1bfc: am 4f048817: Merge "Don\'t make ripples respond to selection state" into lmp-dev 
* commit '1bdf2c192c55fc9bb195417df53327e08c61d726':
  Don't make ripples respond to selection state
 2014-08-08 19:56:47 +00:00
Andrew Lee
a8a7498a7e am 8f74ec09: am 295e0c8a: am 9ce25877: Aidl changes related to VideoCallProvider in Ims. 
* commit '8f74ec097106258e077ae6e14bfbd09006fa4bcb':
  Aidl changes related to VideoCallProvider in Ims.
 2014-08-08 19:56:42 +00:00
Dake Gu
24ef06f9d3 am ffbf66b6: am afb539e6: Merge "Transition: remap if views in calling activity became invalid" into lmp-dev 
* commit 'ffbf66b6e4e0c7de293156e32aff73f61127db2a':
  Transition: remap if views in calling activity became invalid
 2014-08-08 19:51:10 +00:00
Alan Viverette
1bc83bd2f4 am 68bb1bfc: am 4f048817: Merge "Don\'t make ripples respond to selection state" into lmp-dev 
* commit '68bb1bfcd9ae87db421d50d66f6125ca8e1d199d':
  Don't make ripples respond to selection state
 2014-08-08 19:51:06 +00:00
Andrew Lee
8afa54206e am 295e0c8a: am 9ce25877: Aidl changes related to VideoCallProvider in Ims. 
* commit '295e0c8a7a4ee8757630a7a21a8459a4e67aaa5b':
  Aidl changes related to VideoCallProvider in Ims.
 2014-08-08 19:50:57 +00:00