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

193680 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Gunn
d46595a673 IMS: Conference fixes 
- Set phoneaccount to Conference
- Handle conference call in DIALING state

Change-Id: I549bf664724473f0d5d4450cbc8d96f7b534f43a
Bug: 21376607
 2015-06-01 14:53:55 -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
Andrew Flynn
9d28852f61 Merge "Remove separate light/dark animated vector drawables" into mnc-dev 2015-06-01 21:11:54 +00:00
Chris Craik
8c1e287bf8 Merge "Fix RenderScript copy tracing sections" into mnc-dev 2015-06-01 20:58:10 +00:00
Andrew Flynn
2fdbe12820 Remove separate light/dark animated vector drawables 
Now that AnimatedVectorDrawables can use themed animations, SysUI no longer
needs to track separate AVDs for the carrier network change icons.

Bug: 21118142
Change-Id: Ifb6d7b5e7e3de85c10bc13183b4142fd2e6714b6
 2015-06-01 16:45:41 -04:00
Chris Tate
88fb145324 Merge "DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order." into mnc-dev 2015-06-01 20:11:57 +00:00
John Spurlock
b0db15c6d9 Merge "Next alarm clock updates." into mnc-dev 2015-06-01 20:07:40 +00:00
Andrew Flynn
78b16987df Merge "Change colors of AVD test" into mnc-dev 2015-06-01 20:04:08 +00:00
Raph Levien
cf8b3b1c56 Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev 2015-06-01 19:45:43 +00:00
Jason Monk
061e2bbf6b Merge "Be more careful with mAccessPoints usage" into mnc-dev 2015-06-01 19:45:23 +00:00
Raph Levien
5730c97480 Revert "Use getRunAdvance to position cursor" 
This reverts commit cb5499c85097450c48f66f6c08a35bab2ad5ab12.

Bug: 21549197
 2015-06-01 12:40:42 -07: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
Wale Ogunwale
4021117d0a Merge "Allow app to stop lockTaskMode if started by manifest attribute" into mnc-dev 2015-06-01 19:06:45 +00:00
Jason Monk
1904081c62 Be more careful with mAccessPoints usage 
Bug: 21559453
Change-Id: I1a0bcf7282ad1a651169dea7e8ac5bc618b580d1
 2015-06-01 15:00:57 -04: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
Wale Ogunwale
2c8c30ac3c Allow app to stop lockTaskMode if started by manifest attribute 
It is possible lockTaskMode was started by the system process
because android:lockTaskMode is set to a locking value in the
application's manifest instead of the app calling
startLockTaskMode. In this case TaskRecord.mLockTaskUid will
be 0, so we compare the callingUid to the
TaskRecord.effectiveUid instead so the app can exit lockTaskMode.

Bug: 21464182
Change-Id: Ibca6de8e4b17051d5fcbb05cde9c8aefed7216f2
 2015-06-01 11:37:57 -07:00
Winson Chung
6920474bac Merge "Ensuring that we write to disk first." into mnc-dev 2015-06-01 18:19:47 +00:00
Winson Chung
ebd77b550b Ensuring that we write to disk first. 
Change-Id: I2c55db77ab6feef1b405858aac53fb0ed3370dc2
 2015-06-01 11:15:45 -07:00
Winson Chung
a74f385ba0 Allow long-pressing task icon to show app-info. 
Bug: 17369696
 2015-06-01 18:15:09 +00:00
Yorke Lee
064fc83b81 Merge "Add ability to modify default dialer via ADB" into mnc-dev 2015-06-01 18:00:50 +00:00
Alan Viverette
0ee2c1aef9 Merge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev 2015-06-01 18:00:06 +00:00
Chris Craik
5c705d63d7 Fix RenderScript copy tracing sections 
bug:21560057

Change-Id: I3b44d04bd908d9549ef7ada5f48f5d94e239d186
 2015-06-01 10:59:35 -07:00
Yin-Chia Yeh
254ed61671 Merge "Camera2: Add missing LEGACY available keys" into mnc-dev 2015-06-01 17:53:42 +00:00
Alex Klyubin
0de6dea6fb Merge "No need to specify key size when importing." into mnc-dev 2015-06-01 17:53:29 +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 831e01a89e9636baf15d35e7f8ff5e9f290c8b87.

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
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
Alex Klyubin
37c8b411cd No need to specify key size when importing. 
The underlying Keymaster implementation no longer requires that.

Bug: 19799085
Change-Id: I6b651bac5d4825b4ed0981a49bb79aedcf79d749
 2015-06-01 09:52:16 -07: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
John Spurlock
604a5eeed7 Next alarm clock updates. 
- Add explicit user setup signal to status bar icon policy.
 - Include per-user next alarm clock info in service dump.

Bug: 21551365
Change-Id: Ib16636522bbe04d205a377567007145f146e9d39
 2015-06-01 12:32:46 -04:00
Stuart Scott
e3e314df4d Network Reset should have a lockdown like Factory Reset. 
bug:20332322
Change-Id: I7c61a011d11e89513757f112abf320bb2a785edb
(cherry picked from commit 94b038bbb291431a7b39611d72f206b07e839891)
 2015-06-01 16:31:00 +00:00
Joe Fernandez
540d0e0d83 am 583b7f2c: am 9bf0e9d0: Merge "docs: Android Dashboard - June 2015 update" into mnc-preview-docs 
* commit '583b7f2c6dacc412016c15a21f5376fc7fc0e88b':
  docs: Android Dashboard - June 2015 update
 2015-06-01 16:26:12 +00:00
Filip Gruszczynski
48fe263137 resolved conflicts for merge of a61e23f1 to mnc-dev 
Change-Id: Ief5ad11d4f97ae6dbe2d26420550dd145811becc
 2015-06-01 09:23:14 -07: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
Filip Gruszczynski
8825de1751 Merge "Revert "Revert "Fix build.""" into mnc-dev 2015-06-01 16:07:48 +00:00
Filip Gruszczynski
919f93265d Revert "Revert "Fix build."" 
This reverts commit 944a6c937cd3576ecae5c3fdd0dcf265329e6bcf.

Change-Id: I7daa255f331a1e39308eb626580aa00c63c5cb3e
 2015-06-01 16:07:36 +00:00
Joe Fernandez
583b7f2c6d am 9bf0e9d0: Merge "docs: Android Dashboard - June 2015 update" into mnc-preview-docs 
* commit '9bf0e9d03f805bbbb10b87df0586cf6953f18e98':
  docs: Android Dashboard - June 2015 update
 2015-06-01 16:06:26 +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
smain@google.com
b305410962 am 67725e2a: am 7f6da0c3: add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1 
* commit '67725e2aa47596207ebffc00e3737c609536fe93':
  add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1
 2015-06-01 16:01:30 +00:00
Filip Gruszczynski
a61e23f13b am 35a803be: Only use outsets for full screen windows. 
* commit '35a803beec9ce508fd53ab7e4111f2f9f87296c1':
  Only use outsets for full screen windows.
 2015-06-01 16:01:16 +00:00