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

128117 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ztenghui
3c14939126 am 8a5c99c9: Merge "Fix path interpretation on curves" 
* commit '8a5c99c9e91fc86875f3c11f621a9e8a50c5831b':
  Fix path interpretation on curves
 2014-04-10 22:43:43 +00:00
ztenghui
8a5c99c9e9 Merge "Fix path interpretation on curves" 2014-04-10 22:40:35 +00:00
Raph Levien
5520fba609 am 6d954bbd: Merge "Fix build breakage" 
* commit '6d954bbdf5a5c0246ea8bfb5ed1cfb56060bbe56':
  Fix build breakage
 2014-04-10 22:29:34 +00:00
John Reck
c1776b1426 am 822bbb38: Merge "Make attachFunctor blocking" 
* commit '822bbb382fa6b6c8d1b45770e27c2c2732a7afb7':
  Make attachFunctor blocking
 2014-04-10 22:26:01 +00:00
Raph Levien
6d954bbdf5 Merge "Fix build breakage" 2014-04-10 22:24:55 +00:00
John Reck
822bbb382f Merge "Make attachFunctor blocking" 2014-04-10 22:23:22 +00:00
Raph Levien
3931949bc4 Fix build breakage 
A recent change to remove VectorDrawable methods from the public api
didn't run update-api. This should fix that build.

Change-Id: I4d86221f5ada96113f673def4b32985c6d60110a
 2014-04-10 15:15:29 -07:00
Jean-Michel Trivi
f51e113469 MediaFocusControl: fix comment 
Comment about role of audio focus isn't valid anymore.

Change-Id: I608d8cf9d5d9c4449384e2788e5eb5ea42c97eca
 2014-04-10 15:05:44 -07:00
John Reck
d3d8dafc2f Make attachFunctor blocking 
Bug: 13930200

Change-Id: I9b0cf92fd16bb30baa09b6f8d7ae22a8b2a7fd80
 2014-04-10 15:00:13 -07:00
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
Jorim Jaggi
e5c7a89463 Hide back button on keyguard and make it work for bouncer. 
Bug: 13635952
Change-Id: Ie9824dd9926c9deb0a38c8e0a6161f605a489622
 2014-04-10 21:10:22 +02: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
Ricardo Cervera
629c34ee18 docs: Added a document on debugging in Android Studio 
Change-Id: I073e1db6d7976db0f658aac4aa377877ed931aa2
 2014-04-10 11:09:24 -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
Przemyslaw Szczepaniak
5decae39b6 Remove "final" from TextToSpeechClient class. 
It hinders attempts to mock the TextToSpeechClient
class in tests.

+ javadoc typo fix

Change-Id: I5b4590824d7e89b58451bdde457a627786333373
 2014-04-10 16:17:09 +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
d35d3e5d39 Dual zygote cleanup. 
- Use different process names for the 32 / 64 bit zygote.
- Pass command line arguments correctly. The first unmatched
  argument must be passed through to the java main class.

Change-Id: I952ebbdbba941f118d992354b9bd0ada2dade417
 2014-04-10 12:15:39 +01:00