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

127999 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
8809f186ea am 4b1a7c20: Fix build breakage 
* commit '4b1a7c203d5e32c8b2dc7f4f54f28559ca31860a':
  Fix build breakage
 2014-04-10 21:36:32 +00:00
John Reck
f039afd192 am a47c3cc5: Merge "Remove sync flush" 
* commit 'a47c3cc5375777a9adbc0dba95e6f133541f8d28':
  Remove sync flush
 2014-04-10 21:36:29 +00:00
Jorim Jaggi
584a7aa62c resolved conflicts for merge of ff0978fd to master-lockscreen-dev 
Change-Id: I03881da30db8189005d50812e5528ed07cebd437
 2014-04-10 23:34:07 +02:00
Alan Viverette
4b1a7c203d Fix build breakage 
Change-Id: I73d9ff5f38986b7acf83b85c1989203f472bc5fd
 2014-04-10 14:28:30 -07:00
John Reck
a47c3cc537 Merge "Remove sync flush" 2014-04-10 21:13:08 +00:00
Selim Cinek
ff0978fd16 Merge "Further improved NotificationStackScroller" 2014-04-10 21:01:28 +00:00
Jianing Wei
a0b2be85b8 am dcb495ff: Merge "Camera2 API: enable burst capture and repeating burst." 
* commit 'dcb495ff86b1322256585dbd5eda92949a1e8a4f':
  Camera2 API: enable burst capture and repeating burst.
 2014-04-10 19:54:58 +00:00
Jianing Wei
dcb495ff86 Merge "Camera2 API: enable burst capture and repeating burst." 2014-04-10 19:51:57 +00:00
Alan Viverette
53461fa2a0 am de5a29de: Merge "Cleaning up VectorDrawable" 
* commit 'de5a29deaed1c527a78441189e64a40cdf3d82d3':
  Cleaning up VectorDrawable
 2014-04-10 19:50:07 +00:00
Jianing Wei
d2c3a825cd Camera2 API: enable burst capture and repeating burst. 
*  Enable sending out burst requests, canceling, and flushing.
*  Enable onCaptureStarted, onResultReceived for bursts.
*  Enable onCaptureSequenceCompleted by tracking frame number.

Change-Id: Ica2b031cac7ad90f9c4b74a78e6185e627195340
Bug-ID: 10749500
 2014-04-10 19:50:04 +00:00
Svetoslav
dd137a85d3 resolved conflicts for merge of 6be2f952 to master-lockscreen-dev 
Conflicts:
	core/java/android/view/IWindowManager.aidl
	tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java

Change-Id: Idcbc581294cc52b53eabefd61e5c20cbcea611db
 2014-04-10 12:48:07 -07:00
Adrian Roos
0c5c18a2be Merge "Implement camera affordance" into master-lockscreen-dev 2014-04-10 19:43:41 +00:00
Alan Viverette
de5a29deae Merge "Cleaning up VectorDrawable" 2014-04-10 19:38:24 +00:00
Selim Cinek
1685e634fb Further improved NotificationStackScroller 
The top card is now collapsed during the pulldown of
the notification shade and expanded during the transition.
The scrollstate is also reset once the shade is closed.

Change-Id: Ibf17eef1f338d674c545e5bf55261e60db62b2ce
 2014-04-10 21:37:46 +02:00
Svetoslav
6be2f95202 Merge "Adding render stats APIs to UiAutomation (framework)." 2014-04-10 19:32:59 +00:00
Chris Wren
93a03d9b24 am 2bb8dde4: Merge "support the people extra on the notification object" 
* commit '2bb8dde44be10212ec453d435aaad27177714f5e':
  support the people extra on the notification object
 2014-04-10 19:20:07 +00:00
Chris Wren
2bb8dde44b Merge "support the people extra on the notification object" 2014-04-10 19:18:31 +00:00
Chris Wren
dde753079f support the people extra on the notification object 
currently supported URIs:
  content://com.android.contacts/contacts/lookup/*
  tel:*

Change-Id: I833eee3f2ee40aa8cb2cfad135bdd6cb2c0eb792
 2014-04-10 15:18:25 -04:00
Alan Viverette
4b3988d159 Cleaning up VectorDrawable 
Use argb evaluation method from animation package, lazily create paint,
set default for stroke line cap and join. Fix scaling to bounds. Fix
drawable in test app.

Change-Id: I245d5d6acc6ba9806743ab2bf9bf99aff3649c39
 2014-04-10 11:21:15 -07:00
John Reck
8ca3eecc2b Remove sync flush 
Bug: 13952590
 It was attempting to flush state changes after the canvas was
 destroyed, which caused layer updates to crash.

 Due to the removal of SetDisplayListData, the sync mode isn't able
 to do anything ever, so remove it.

Change-Id: I1e18ce288d81fd47cc6e612afda9476f75ecef2e
 2014-04-10 10:46:55 -07:00
Jorim Jaggi
65b68aa76a Merge "Limit notifications on lockscreen to a maximum 4." into master-lockscreen-dev 2014-04-10 17:43:39 +00:00
Baligh Uddin
ddcb8c6562 am 2271a91c: (-s ours) am cd5e3f85: (-s ours) am da6b9599: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '2271a91c327cee8a6c1dffcbfd3419c95d56c37e':
  Import translations. DO NOT MERGE
 2014-04-10 16:02:22 +00:00
Baligh Uddin
2271a91c32 am cd5e3f85: (-s ours) am da6b9599: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'cd5e3f85fc9228b943ee8dfda0951e068953596c':
  Import translations. DO NOT MERGE
 2014-04-10 15:58:38 +00:00
Baligh Uddin
cd5e3f85fc am da6b9599: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'da6b9599c77230c689d63e32ca80b62f60f18c27':
  Import translations. DO NOT MERGE
 2014-04-10 15:55:25 +00:00
Baligh Uddin
3243040cdc am 8c22e367: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '8c22e3674258261d9870f48e752572d438838fe1':
  Import translations. DO NOT MERGE
 2014-04-10 15:55:04 +00:00
Baligh Uddin
da6b9599c7 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-10 15:51:37 +00:00
Baligh Uddin
8c22e36742 Merge "Import translations. DO NOT MERGE" 2014-04-10 15:51:35 +00:00
Baligh Uddin
ecbc8098a4 Merge "Import translations. DO NOT MERGE" into master-lockscreen-dev 2014-04-10 15:51:33 +00:00
Adrian Roos
5e25caae7a Implement camera affordance 
Makes camera on lockscreen work again.

Bug: 13635952
Change-Id: Iec6324651a23289932a5e9816332b6727c23d096
 2014-04-10 17:37:08 +02:00
Jorim Jaggi
d4a57440ca Limit notifications on lockscreen to a maximum 4. 
All the other notifications are going to be collapsed in a "n more"
card.

Bug: 13635952
Change-Id: I18471c7b18d05d27e92c49ee8214605f1a151927
 2014-04-10 16:51:15 +02:00
Paul Lawrence
17f2fdd018 am 9502f990: Merge "Allow encryption when keyguard is set to pattern or no protection" 
* commit '9502f990899ef576879048ec5147d403158ad89d':
  Allow encryption when keyguard is set to pattern or no protection
 2014-04-10 14:33:29 +00:00
Paul Lawrence
9502f99089 Merge "Allow encryption when keyguard is set to pattern or no protection" 2014-04-10 14:30:53 +00:00
Narayan Kamath
f441656870 am edd6d9e3: am 3603970d: am 940e76fd: am b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes" 
* commit 'edd6d9e3a87d47b42d9119b70d1f442c3fa98c35':
  Removed android.debug.JNITest from preloaded-classes
 2014-04-10 11:31:15 +00:00
Narayan Kamath
edd6d9e3a8 am 3603970d: am 940e76fd: am b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes" 
* commit '3603970d3a8a2215027e96c4861e1ab9eec86f79':
  Removed android.debug.JNITest from preloaded-classes
 2014-04-10 11:28:34 +00:00
Narayan Kamath
3603970d3a am 940e76fd: am b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes" 
* commit '940e76fd378cebcd0d83099a5c31bc1e2bbeb2ba':
  Removed android.debug.JNITest from preloaded-classes
 2014-04-10 11:25:56 +00:00
Narayan Kamath
940e76fd37 am b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes" 
* commit 'b827f78e7acee3a604c315615268edf7098dc184':
  Removed android.debug.JNITest from preloaded-classes
 2014-04-10 11:21:33 +00:00
Narayan Kamath
b827f78e7a Merge "Removed android.debug.JNITest from preloaded-classes" 2014-04-10 11:18:28 +00:00
Narayan Kamath
2a6599d335 am f148f36d: am 9e289d70: am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs" 
* commit 'f148f36d140e995ec8f755e60bbb0b37f33c3da7':
  System services detect and register app CPU ABIs
 2014-04-10 09:47:21 +00:00
Narayan Kamath
954a4666ab am d11f223c: resolved conflicts for merge of 286a247e to master 
* commit 'd11f223c535ed9ce628fe5aaf0fd5692dd0cf9e4':
  Re-implement native library search and copies.
 2014-04-10 09:47:18 +00:00
Narayan Kamath
f148f36d14 am 9e289d70: am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs" 
* commit '9e289d70a8baaed0030413b5991653792e2a816d':
  System services detect and register app CPU ABIs
 2014-04-10 09:45:18 +00:00
Narayan Kamath
d11f223c53 resolved conflicts for merge of 286a247e to master 
Change-Id: I63df9d482da3ce2ac851959223b9180020ffad0c
 2014-04-10 10:38:31 +01:00
Narayan Kamath
9e289d70a8 am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs" 
* commit '1d26a3f1efd0d965e8751e8515608c31789bdbe2':
  System services detect and register app CPU ABIs
 2014-04-10 09:26:59 +00:00
Narayan Kamath
286a247e4c am 0fd40cb1: am 80413c9f: Merge "Re-implement native library search and copies." 
* commit '0fd40cb100bccbd5d9ad6109ca39c818a857f889':
  Re-implement native library search and copies.
 2014-04-10 09:26:44 +00:00
Narayan Kamath
1d26a3f1ef am 09e13cc5: Merge "System services detect and register app CPU ABIs" 
* commit '09e13cc5f9f98382376eb49bfa6ceb94a50d37a1':
  System services detect and register app CPU ABIs
 2014-04-10 09:23:33 +00:00
Narayan Kamath
0fd40cb100 am 80413c9f: Merge "Re-implement native library search and copies." 
* commit '80413c9fe10acf36eaecd139198c7fc17e8af2e6':
  Re-implement native library search and copies.
 2014-04-10 09:23:30 +00:00
Narayan Kamath
09e13cc5f9 Merge "System services detect and register app CPU ABIs" 2014-04-10 09:20:22 +00:00
Narayan Kamath
80413c9fe1 Merge "Re-implement native library search and copies." 2014-04-10 09:19:38 +00:00
Jessica Hummel
e61981c06b am e5e8444c: Merge "Allow setting the active admin across users." 
* commit 'e5e8444ce864e7ac5d07308b9a5c5ca2caaa4e0a':
  Allow setting the active admin across users.
 2014-04-10 08:41:51 +00:00
Jessica Hummel
e5e8444ce8 Merge "Allow setting the active admin across users." 2014-04-10 08:16:28 +00:00
Jessica Hummel
6d36b60beb Allow setting the active admin across users. 
This is required so that provisioning can call it from the primary user when it sets up the mdm on the managed profile.

Change-Id: I185af168754aa4aeae61f1d4522c1794681cb400
 2014-04-10 08:15:42 +00:00