Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
197,592 Commits 3 Branches 0 Tags
371dee33dfc287c5bbf04fccffdc373716462e88
Commit Graph

53066 Commits

Author SHA1 Message Date
Abodunrinwa Toki
6c60a64760 am 4af95ede: am d9b74249: am bdd500ec: Merge "Fix FloatingToolbar look and animation for RTL." into mnc-dev 
* commit '4af95ede5bec291975221eb55d9c9c492d772acd':
  Fix FloatingToolbar look and animation for RTL.
 2015-06-01 23:43:05 +00:00
Eino-Ville Talvala
e4d1343ce6 am 0c421419: am a2956f6e: am 14438d12: Merge "Camera2: Add tangential distortion coefficients" into mnc-dev 
* commit '0c4214191fa93ff3c628a8461d6bd6ef2bb54d3a':
  Camera2: Add tangential distortion coefficients
 2015-06-01 23:42:59 +00:00
Abodunrinwa Toki
4af95ede5b am d9b74249: am bdd500ec: Merge "Fix FloatingToolbar look and animation for RTL." into mnc-dev 
* commit 'd9b7424923662e465fe2cf155cb7a9e6eef434c0':
  Fix FloatingToolbar look and animation for RTL.
 2015-06-01 23:22:06 +00:00
Eino-Ville Talvala
0c4214191f am a2956f6e: am 14438d12: Merge "Camera2: Add tangential distortion coefficients" into mnc-dev 
* commit 'a2956f6e059e8565a0f6d48ea3c85cc827bffdb4':
  Camera2: Add tangential distortion coefficients
 2015-06-01 23:22:00 +00:00
Abodunrinwa Toki
bdd500ecd4 Merge "Fix FloatingToolbar look and animation for RTL." into mnc-dev 2015-06-01 21:31:20 +00:00
Eino-Ville Talvala
14438d122c Merge "Camera2: Add tangential distortion coefficients" into mnc-dev 2015-06-01 21:26:12 +00:00
Raph Levien
99d3c95a17 am 590e3221: am c73314bc: am cf8b3b1c: Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev 
* commit '590e32212c8121ead4439d19062dd3c3ddfa0f92':
  Revert "Use getRunAdvance to position cursor"
 2015-06-01 20:20:18 +00:00
Raph Levien
590e32212c am c73314bc: am cf8b3b1c: Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev 
* commit 'c73314bcb18f6879bb6f9923912ab38a0c831637':
  Revert "Use getRunAdvance to position cursor"
 2015-06-01 20:06:24 +00:00
Raph Levien
cf8b3b1c56 Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev 2015-06-01 19:45:43 +00:00
Jorim Jaggi
9bf54150d5 am 6c498829: am c8d5901b: am 1e47a8e0: Merge "Cleanup Keyguard handling when turning off screen" into mnc-dev 
* commit '6c49882975578158048f600d3dc69040db12dc5b':
  Cleanup Keyguard handling when turning off screen
 2015-06-01 19:41:55 +00:00
Filip Gruszczynski
e3e5f7dd86 am f02ace9b: am 49895c6e: am 29c840eb: am 11d50c9c: am 06756f35: Dismiss or cancel in SwipeDismissLayout on screen off. 
* commit 'f02ace9b9b13a51ce1561d4c2b3b47874003070d':
  Dismiss or cancel in SwipeDismissLayout on screen off.
 2015-06-01 19:41:50 +00:00
Raph Levien
5730c97480 Revert "Use getRunAdvance to position cursor" 
This reverts commit cb5499c850.

Bug: 21549197
 2015-06-01 12:40:42 -07:00
Jorim Jaggi
6c49882975 am c8d5901b: am 1e47a8e0: Merge "Cleanup Keyguard handling when turning off screen" into mnc-dev 
* commit 'c8d5901bc83814c0dab281fc108de643cdd7b09d':
  Cleanup Keyguard handling when turning off screen
 2015-06-01 19:29:19 +00:00
Filip Gruszczynski
f02ace9b9b am 49895c6e: am 29c840eb: am 11d50c9c: am 06756f35: Dismiss or cancel in SwipeDismissLayout on screen off. 
* commit '49895c6eadcca35bfe4369b53c8fc2e13a603520':
  Dismiss or cancel in SwipeDismissLayout on screen off.
 2015-06-01 19:29:14 +00:00
Jorim Jaggi
1e47a8e096 Merge "Cleanup Keyguard handling when turning off screen" into mnc-dev 2015-06-01 19:13:11 +00:00
Filip Gruszczynski
29c840ebb0 am 11d50c9c: am 06756f35: Dismiss or cancel in SwipeDismissLayout on screen off. 
* commit '11d50c9cc6f9990af5b9abf2058f6b7d4a5c8ae0':
  Dismiss or cancel in SwipeDismissLayout on screen off.
 2015-06-01 19:09:57 +00:00
Alan Viverette
3f761f77df am 217974cb: am c6296a76: am 0ee2c1ae: Merge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev 
* commit '217974cbe7e7dc68d352a0d7820a170a5d5a532c':
  Prevent crash when ColorStateList has unresolved attrs
 2015-06-01 19:05:32 +00:00
Yin-Chia Yeh
b5f23b1c37 am ccb8616a: am 21f55342: am 254ed616: Merge "Camera2: Add missing LEGACY available keys" into mnc-dev 
* commit 'ccb8616ab382e4f33a1416ab09baa593a2af3dbd':
  Camera2: Add missing LEGACY available keys
 2015-06-01 19:05:25 +00:00
Andres Morales
5720e80e52 am ab21d60c: am 9250d972: am 0fddb1a6: Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev 
* commit 'ab21d60c240fb2ef773cf4dda1ff5a4e7f4592d3':
  Revert "[partition checking] re-enable bootimage/bootloader, add recovery"
 2015-06-01 19:05:12 +00:00
Chien-Yu Chen
2ed89ecb3e am e573a5e2: am a56dee8e: am 61bae6d8: Merge "Camera2: update docs for reprocess timestamp" into mnc-dev 
* commit 'e573a5e23f393f780c8015bdbac37a1646f40f6f':
  Camera2: update docs for reprocess timestamp
 2015-06-01 19:05:03 +00:00
Alan Viverette
3a163e29c4 am c820559a: am af3134ae: am 9be801c8: Merge "Don\'t ignore explicit dividerHeight of 0 specified in XML" into mnc-dev 
* commit 'c820559a916ff4bc245b7eb15a2109c00bb6f174':
  Don't ignore explicit dividerHeight of 0 specified in XML
 2015-06-01 19:04:57 +00:00
Alan Viverette
b5c87cb27e am b88314ad: am 508b6d2d: am 242b9c4e: Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev 
* commit 'b88314ad72669c2b91f2e5c6edf73f8ed02f0024':
  Fix row/column order when unparcelling CollectionItemInfo
 2015-06-01 19:04:51 +00:00
Mady Mellor
2177544c1a am fae785fc: am 8de52276: am 3aa33b3d: Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev 
* commit 'fae785fccf151aab7fba0daa701915f9e223fdfe':
  Update button to BUTTON_STYLUS_PRIMARY
 2015-06-01 19:04:27 +00:00
Mady Mellor
793933903f am ee8ac623: am 8c189479: am ef24bc00: Merge "Update stylus button press recognition in View to use new MotionEvent APIs" into mnc-dev 
* commit 'ee8ac623edee9352fdbf2f653af564a9df8514d2':
  Update stylus button press recognition in View to use new MotionEvent APIs
 2015-06-01 19:04:22 +00:00
Mady Mellor
c837fdace7 am 36ffd6d6: am ed836dec: am cac7b2b1: Merge "Update stylus button press recognition in GestureDetector to use new APIs" into mnc-dev 
* commit '36ffd6d6b68d577903a3a71f8742779379e6d54c':
  Update stylus button press recognition in GestureDetector to use new APIs
 2015-06-01 19:04:15 +00:00
Filip Gruszczynski
36f5c7dd42 am 183f8fa4: am 21605b33: am 99bcc3ee: Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev 
* commit '183f8fa450ededc74dad717664e02ec804e8fe76':
  Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""
 2015-06-01 19:03:59 +00:00
Filip Gruszczynski
11d50c9cc6 am 06756f35: Dismiss or cancel in SwipeDismissLayout on screen off. 
* commit '06756f352d2046246bc147fa1f55d1dfbfcb37f5':
  Dismiss or cancel in SwipeDismissLayout on screen off.
 2015-06-01 18:57:21 +00:00
Alan Viverette
217974cbe7 am c6296a76: am 0ee2c1ae: Merge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev 
* commit 'c6296a76869422fd698ada889a74bc3129792db5':
  Prevent crash when ColorStateList has unresolved attrs
 2015-06-01 18:51:48 +00:00
Yin-Chia Yeh
ccb8616ab3 am 21f55342: am 254ed616: Merge "Camera2: Add missing LEGACY available keys" into mnc-dev 
* commit '21f55342d60e54c9e899aa746cf1a848f2910e61':
  Camera2: Add missing LEGACY available keys
 2015-06-01 18:51:43 +00:00
Andres Morales
ab21d60c24 am 9250d972: am 0fddb1a6: Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev 
* commit '9250d9727b5a71267cb33b535bdd959c1c03b11a':
  Revert "[partition checking] re-enable bootimage/bootloader, add recovery"
 2015-06-01 18:51:32 +00:00
Chien-Yu Chen
e573a5e23f am a56dee8e: am 61bae6d8: Merge "Camera2: update docs for reprocess timestamp" into mnc-dev 
* commit 'a56dee8edecddfe298d348c4006de6dea0e92374':
  Camera2: update docs for reprocess timestamp
 2015-06-01 18:51:27 +00:00
Alan Viverette
c820559a91 am af3134ae: am 9be801c8: Merge "Don\'t ignore explicit dividerHeight of 0 specified in XML" into mnc-dev 
* commit 'af3134ae74538bf716da8ecdc0a07f29e5bdc145':
  Don't ignore explicit dividerHeight of 0 specified in XML
 2015-06-01 18:51:12 +00:00
Alan Viverette
b88314ad72 am 508b6d2d: am 242b9c4e: Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev 
* commit '508b6d2d576b1bdd528362fbb069961a9a65c2fb':
  Fix row/column order when unparcelling CollectionItemInfo
 2015-06-01 18:50:46 +00:00
Stuart Scott
c96a66dd03 am 378c2cbf: am e3e314df: Network Reset should have a lockdown like Factory Reset. 
* commit '378c2cbf2ebc2e3668da7d5a285fe3ec6b9d7ee8':
  Network Reset should have a lockdown like Factory Reset.
 2015-06-01 18:50:39 +00:00
Mady Mellor
fae785fccf am 8de52276: am 3aa33b3d: Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev 
* commit '8de52276a1f5faf83ea8147f0ddee74195279bba':
  Update button to BUTTON_STYLUS_PRIMARY
 2015-06-01 18:50:15 +00:00
Mady Mellor
ee8ac623ed am 8c189479: am ef24bc00: Merge "Update stylus button press recognition in View to use new MotionEvent APIs" into mnc-dev 
* commit '8c189479a02dfae2874a622dd79abcbcded0c809':
  Update stylus button press recognition in View to use new MotionEvent APIs
 2015-06-01 18:50:09 +00:00
Mady Mellor
36ffd6d6b6 am ed836dec: am cac7b2b1: Merge "Update stylus button press recognition in GestureDetector to use new APIs" into mnc-dev 
* commit 'ed836decd81c2b8d894bf2fd658f45a761f795cd':
  Update stylus button press recognition in GestureDetector to use new APIs
 2015-06-01 18:50:04 +00:00
Filip Gruszczynski
183f8fa450 am 21605b33: am 99bcc3ee: Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev 
* commit '21605b3395372b1ee1dd645bb8d9e50c7e7e9460':
  Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""
 2015-06-01 18:49:47 +00:00
Alan Viverette
0ee2c1aef9 Merge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev 2015-06-01 18:00:06 +00:00
Yin-Chia Yeh
254ed61671 Merge "Camera2: Add missing LEGACY available keys" into mnc-dev 2015-06-01 17:53:42 +00:00
Andres Morales
0fddb1a631 Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev 2015-06-01 17:50:58 +00:00
Chien-Yu Chen
61bae6d8de Merge "Camera2: update docs for reprocess timestamp" into mnc-dev 2015-06-01 17:50:58 +00:00
Andres Morales
c97b92e346 Revert "[partition checking] re-enable bootimage/bootloader, add recovery" 
This reverts commit 831e01a89e.

Change-Id: I48bf74631b842178964d25906b2790f18632e32a
 2015-06-01 17:50:43 +00:00
Alan Viverette
50ba321fbc Prevent crash when ColorStateList has unresolved attrs 
Bug: 21471789
Change-Id: Ieba6ab62b5e82eb716934a65efb6bfef2fc4e15a
 2015-06-01 10:48:55 -07:00
Yin-Chia Yeh
71c605c54a Camera2: Add missing LEGACY available keys 
Add missing available characteristics keys.

Bug: 20883751
Change-Id: I6f07deca4b469de720f44a663ce9140658c346f1
 2015-06-01 10:44:04 -07:00
Alan Viverette
9be801c826 Merge "Don't ignore explicit dividerHeight of 0 specified in XML" into mnc-dev 2015-06-01 17:33:21 +00:00
Alan Viverette
7b2f86488c Don't ignore explicit dividerHeight of 0 specified in XML 
Also minor cleanup and adding annotations.

Bug: 21420748
Change-Id: I89edcd3ce423ad75a4028bebf0dcd828b9619c15
 2015-06-01 10:30:21 -07:00
Erik Kline
2ef2de83d9 am 413cd5a3: am 8ef5ac13: am ab069235: Treat RTM_DELNEIGH as a transition to NUD_NONE 
* commit '413cd5a329a9d747bff4a7187c2daf9636f37049':
  Treat RTM_DELNEIGH as a transition to NUD_NONE
 2015-06-01 17:26:54 +00:00
Barnaby James
3c022ea9ea am fab12f20: am 4ead90a1: am 6fad7e7f: Merge "Minor VoiceInteractor documentation fixes." into mnc-dev 
* commit 'fab12f200a1420d13ac03fbd22b29e5fbca9624f':
  Minor VoiceInteractor documentation fixes.
 2015-06-01 17:25:39 +00:00
Yohei Yukawa
38f59f80a6 am 64f5d4f0: am d9597642: am 512234f1: Merge "Close input session when the view is detached from the window." into mnc-dev 
* commit '64f5d4f0311d9ac61a432d4a37948c55ae42bc2c':
  Close input session when the view is detached from the window.
 2015-06-01 17:24:47 +00:00