Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
194,848 Commits 3 Branches 0 Tags
251058ea464526ea3153ef8b9e4538733b95e84d
Commit Graph

52406 Commits

Author SHA1 Message Date
Raph Levien
251058ea46 am fb2cdc4c: Merge "Revert "Revert "Use getRunAdvance to position cursor""" into mnc-dev 
* commit 'fb2cdc4ca131ff95179414854eca02a098a29a8a':
  Revert "Revert "Use getRunAdvance to position cursor""
 2015-06-01 22:09:11 +00:00
Alan Viverette
95b120939f am e0e5c1cf: Merge "Clean up AbsListView constructor" into mnc-dev 
* commit 'e0e5c1cf1965302fcf177eaade372313504ea53a':
  Clean up AbsListView constructor
 2015-06-01 22:09:06 +00:00
Raph Levien
fb2cdc4ca1 Merge "Revert "Revert "Use getRunAdvance to position cursor""" into mnc-dev 2015-06-01 21:56:36 +00:00
Alan Viverette
e0e5c1cf19 Merge "Clean up AbsListView constructor" into mnc-dev 2015-06-01 21:56:36 +00:00
Abodunrinwa Toki
0571dcd815 am bdd500ec: Merge "Fix FloatingToolbar look and animation for RTL." into mnc-dev 
* commit 'bdd500ecd4ceea7d4e4a06ece08c9b9fd5d8aec5':
  Fix FloatingToolbar look and animation for RTL.
 2015-06-01 21:36:31 +00:00
Eino-Ville Talvala
c9314290f3 am 14438d12: Merge "Camera2: Add tangential distortion coefficients" into mnc-dev 
* commit '14438d122c1e7ab88a6169bca13a35d50e76e91e':
  Camera2: Add tangential distortion coefficients
 2015-06-01 21:36:26 +00:00
Raph Levien
edb27f14ec Revert "Revert "Use getRunAdvance to position cursor"" 
This reverts commit 5730c97480.
 2015-06-01 14:34:47 -07: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
50bbdadad4 am cf8b3b1c: Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev 
* commit 'cf8b3b1c56b5aaaa8552c1bc9bb88c8a1285f99f':
  Revert "Use getRunAdvance to position cursor"
 2015-06-01 19:55:22 +00:00
Raph Levien
cf8b3b1c56 Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev 2015-06-01 19:45:43 +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
b4a1864b6c am 1e47a8e0: Merge "Cleanup Keyguard handling when turning off screen" into mnc-dev 
* commit '1e47a8e096fc28dcab0a55bc4f2e6b747bfb1a07':
  Cleanup Keyguard handling when turning off screen
 2015-06-01 19:17:09 +00:00
Filip Gruszczynski
f729add9e6 am 29c840eb: am 11d50c9c: am 06756f35: Dismiss or cancel in SwipeDismissLayout on screen off. 
* commit '29c840ebb08d97451fd5a5923ad20d7bf1990048':
  Dismiss or cancel in SwipeDismissLayout on screen off.
 2015-06-01 19:17:04 +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
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
c3f51ca6af am 0ee2c1ae: Merge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev 
* commit '0ee2c1aef93987663968dbfd693cc5eda06c8244':
  Prevent crash when ColorStateList has unresolved attrs
 2015-06-01 18:15:26 +00:00
Yin-Chia Yeh
49824dec6b am 254ed616: Merge "Camera2: Add missing LEGACY available keys" into mnc-dev 
* commit '254ed616712866518225dbc156182f39339e76a4':
  Camera2: Add missing LEGACY available keys
 2015-06-01 18:15:20 +00:00
Andres Morales
57f5f21173 am 0fddb1a6: Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev 
* commit '0fddb1a63109e2d4a92327ea1ffc74307292be48':
  Revert "[partition checking] re-enable bootimage/bootloader, add recovery"
 2015-06-01 18:15:10 +00:00
Chien-Yu Chen
ea339b138f am 61bae6d8: Merge "Camera2: update docs for reprocess timestamp" into mnc-dev 
* commit '61bae6d8de096c8982074ac507554fda42a802a5':
  Camera2: update docs for reprocess timestamp
 2015-06-01 18:15:05 +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
Alan Viverette
7eceda3020 Clean up AbsListView constructor 
Change-Id: I5ebe0074849228e5c7fd629df6d1055c867debc8
 2015-06-01 10:47:29 -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
fcf730053d am 9be801c8: Merge "Don\'t ignore explicit dividerHeight of 0 specified in XML" into mnc-dev 
* commit '9be801c8269358ded8e4bed6103ca2346da7e179':
  Don't ignore explicit dividerHeight of 0 specified in XML
 2015-06-01 17:43:56 +00: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
Filip Gruszczynski
06756f352d Dismiss or cancel in SwipeDismissLayout on screen off. 
Fix for situation where you palm the device while swiping away an
ambiactive activity (or rather, when you swipe slightly an ambiactive
activity during palm gesture). This would make the activity stay in half
dismissed state. Instead when the screen goes off, we either dismiss or
cancel the dismissal.

Change-Id: I82e699c00c25bc97dd95bc6473a17e5817f7667a
 2015-06-01 10:09:45 -07:00
Alan Viverette
7f1fb67046 am 242b9c4e: Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev 
* commit '242b9c4eee9d42d02fd2259ffe2124234653aaf2':
  Fix row/column order when unparcelling CollectionItemInfo
 2015-06-01 16:45:48 +00:00
Stuart Scott
ba2a4e4a92 am e3e314df: Network Reset should have a lockdown like Factory Reset. 
* commit 'e3e314df4d52881225326d426a76e3e7f1bc40d3':
  Network Reset should have a lockdown like Factory Reset.
 2015-06-01 16:45:42 +00:00
Alan Viverette
242b9c4eee Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev 2015-06-01 16:39:10 +00:00
Abodunrinwa Toki
6c5ac8e9e6 Fix FloatingToolbar look and animation for RTL. 
- Fix positioning issues which causes the toolbar to appear cut
since it extends beyond its containing window.
- Fix the open/close overflow animations to open to left (instead
  or right) for RTL.

Bug: 21455067
Change-Id: I799b74c67c96b03bca4b2c9fbb6e1165b651ac7f
 2015-06-01 17:35:34 +01:00
Stuart Scott
e3e314df4d Network Reset should have a lockdown like Factory Reset. 
bug:20332322
Change-Id: I7c61a011d11e89513757f112abf320bb2a785edb
(cherry picked from commit 94b038bbb2)
 2015-06-01 16:31:00 +00:00
Mady Mellor
a8fa3e50ea am 3aa33b3d: Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev 
* commit '3aa33b3da04774d76e1a65b749667450dc81532b':
  Update button to BUTTON_STYLUS_PRIMARY
 2015-06-01 16:24:56 +00:00
Mady Mellor
e531d8135d am ef24bc00: Merge "Update stylus button press recognition in View to use new MotionEvent APIs" into mnc-dev 
* commit 'ef24bc00399ceb627e9780f05eb68f955e6bd495':
  Update stylus button press recognition in View to use new MotionEvent APIs
 2015-06-01 16:24:51 +00:00
Mady Mellor
16ca42fddf am cac7b2b1: Merge "Update stylus button press recognition in GestureDetector to use new APIs" into mnc-dev 
* commit 'cac7b2b17505dd3d84966ff15abf5e5343783dee':
  Update stylus button press recognition in GestureDetector to use new APIs
 2015-06-01 16:24:46 +00:00
Mady Mellor
3aa33b3da0 Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev 2015-06-01 16:17:37 +00:00
Mady Mellor
ef24bc0039 Merge "Update stylus button press recognition in View to use new MotionEvent APIs" into mnc-dev 2015-06-01 16:16:20 +00:00
Mady Mellor
cac7b2b175 Merge "Update stylus button press recognition in GestureDetector to use new APIs" into mnc-dev 2015-06-01 16:16:00 +00:00
Alan Viverette
faeac960cc Fix row/column order when unparcelling CollectionItemInfo 
Bug: 21527853
Change-Id: I02a75b9395a4d573f5fd49abcbd282b35e2c8f3c
 2015-06-01 09:03:27 -07:00
Filip Gruszczynski
31e530bb5b am 99bcc3ee: Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev 
* commit '99bcc3eee23ed8bd15bd108d068d6f9f694e4393':
  Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""
 2015-06-01 15:52:55 +00:00
Filip Gruszczynski
99bcc3eee2 Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev 2015-06-01 15:42:42 +00:00
Neil Fuller
d37bdedb74 am 3b7f9615: Merge "Fix javadocs based on recent case consistency change" into mnc-dev 
* commit '3b7f9615b70c7e62a018eb1abf0a52c8ba3e4d27':
  Fix javadocs based on recent case consistency change
 2015-06-01 12:19:34 +00:00
Neil Fuller
3b7f9615b7 Merge "Fix javadocs based on recent case consistency change" into mnc-dev 2015-06-01 12:04:44 +00:00
Neil Fuller
a5e389ddd2 Fix javadocs based on recent case consistency change 
Commit a40d2447b6f516116135ee7f126579771ba98a2c made the
case consistently "as for the beginning of a sentence".
This updates the docs to reflect that. Previously the
result depended on the string returned (e.g. "Tomorrow"
was capitalized in English) and the casing varied
within and between locales.

Bug: 20247811
(cherry-picked from commit 0e1c0e11e4)

Change-Id: I7b48958725b32b13bee00347585472f8073e7761
 2015-06-01 13:02:18 +01:00