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

6487 Commits

Author SHA1 Message Date
Chris Wren
d05a2d8833 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:23:27 +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
Evan Charlton
eac3ad3f83 Merge "Expose CallState.NEW" into master-nova 2014-04-10 17:54:44 +00:00
Evan Charlton
e9aa1aaa25 Expose CallState.NEW 
Expose CallState.NEW so that we have a state before DIALING. Immediately
transitioning calls to DIALING is wrong, because that shouldn't happen
until the CallService is actually dialing.

Bug: 13902624

Change-Id: Id5ee0d4d050deb2f3038f3de8fdd265caa75f7b2
 2014-04-10 09:27:07 -07:00
Zhijun He
fe522bdeb6 am 9ce83761: Merge "Camera2: Add MANUAL capture intent" 
* commit '9ce83761cc9908e6acad8af5ad45574163b28b19':
  Camera2: Add MANUAL capture intent
 2014-04-10 02:13:15 +00:00
Zhijun He
e30adb762a Camera2: Add MANUAL capture intent 
Change-Id: I6a3ba818cc7d13e0fcf0d90a16c53884b6cc20ab
 2014-04-09 19:04:31 -07:00
Alan Viverette
9ddf8ef184 am 5062649a: Merge "Update list item text appearance" 
* commit '5062649abac9bf873123fe560fbb7b0748b30a54':
  Update list item text appearance
 2014-04-10 00:00:48 +00:00
Alan Viverette
5062649aba Merge "Update list item text appearance" 2014-04-09 23:54:24 +00:00
Alan Viverette
55565ecd46 Update list item text appearance 
Adds a new attribute for secondary list item text and points
the Gingerbread and Holo themes to use TextAppearance.Small for
compatibility's sake.

Change-Id: I8e78a908b699baae6d1f5b3623fd7b5648b99b77
 2014-04-09 16:52:54 -07:00
Alan Viverette
d722e59984 am 514d4aaf: Merge "Update supported Drawable tinting modes and docs" 
* commit '514d4aaf53abf6671b0fe8be6d8a2d6b2a69b887':
  Update supported Drawable tinting modes and docs
 2014-04-09 20:12:03 +00:00
Alan Viverette
514d4aaf53 Merge "Update supported Drawable tinting modes and docs" 2014-04-09 20:08:46 +00:00
Alan Viverette
2f8ba8f7fa Update supported Drawable tinting modes and docs 
Change-Id: I9c20d2bc4dc499f91c21a348871cf209c1065ba6
 2014-04-09 13:00:17 -07:00
Zhijun He
36f317025a am d178496b: Camera2: Make colorFilterArrangement public 
* commit 'd178496b7e823efdc9c9780ab1d980207a36a19a':
  Camera2: Make colorFilterArrangement public
 2014-04-09 01:15:39 +00:00
Zhijun He
d178496b7e Camera2: Make colorFilterArrangement public 
It will be used by DNG

Also fix a typo in spec.

Change-Id: I8427df6b28149c0f8ced27b110efe96dd38357f4
 2014-04-09 00:50:00 +00:00
Alan Viverette
09a5a07c6d am 91c8f753: Merge "Theming for more VectorDrawable attrs, add attrs to test app" 
* commit '91c8f753ab841342a904fa3efa81f4c6edf2b72a':
  Theming for more VectorDrawable attrs, add attrs to test app
 2014-04-09 00:46:29 +00:00
Alan Viverette
afc5defd58 am 2989c2cb: Merge "Make Drawable hotspot APIs public" 
* commit '2989c2cb5c649a0035db18f5f7f25ae5c34d2721':
  Make Drawable hotspot APIs public
 2014-04-09 00:46:20 +00:00
Jae Seo
a876b32617 am 121db9e8: Merge "Unhide TvInputSession" 
* commit '121db9e8525163a867915adfd23a08cf1300d4fa':
  Unhide TvInputSession
 2014-04-09 00:46:13 +00:00
Amith Yamasani
c686d9abaf am 5784b398: Merge "Launcher APIs and broadcasts for managed profiles" 
* commit '5784b39843bd3d6112352ff3b736a6498107911c':
  Launcher APIs and broadcasts for managed profiles
 2014-04-09 00:45:52 +00:00
Alan Viverette
7f1ab7a43f Theming for more VectorDrawable attrs, add attrs to test app 
BUG: 13878079
Change-Id: Ibcc8d67446c44cd8f681230fc484c7dc7411ffab
 2014-04-08 17:12:43 -07:00
Alan Viverette
2989c2cb5c Merge "Make Drawable hotspot APIs public" 2014-04-08 23:38:23 +00:00
Alan Viverette
860126b78a Make Drawable hotspot APIs public 
Change-Id: I8377ed735f73f7083636947aa08a5427f1dc3bf6
 2014-04-08 16:37:19 -07:00
Jae Seo
121db9e852 Merge "Unhide TvInputSession" 2014-04-08 23:00:51 +00:00
Jae Seo
4aef7a5699 Unhide TvInputSession 
This is necessary for the SDK build.

Change-Id: I64fb6b7e6cc3147edbfff0c34cd6af7f45a82364
 2014-04-08 22:42:13 +00:00
Amith Yamasani
5784b39843 Merge "Launcher APIs and broadcasts for managed profiles" 2014-04-08 22:04:20 +00:00
Jae Seo
9210e8cb23 am 3957091b: Initial round of Television Input Framework 
* commit '3957091ba8f08c02b5e781098cb955a5f697a1ff':
  Initial round of Television Input Framework
 2014-04-08 20:43:49 +00:00
Jae Seo
3957091ba8 Initial round of Television Input Framework 
This provides APIs to control and create individual television inputs on
the system which will later be hosted by television applications.

Change-Id: I6866d28e78175a1bff2c32a85c5d77e94d0cd60c
 2014-04-08 13:35:21 -07:00
Kenny Guy
f328cd6c5e am cfd3cd6d: Merge "Pipe notifications from related users to listeners." 
* commit 'cfd3cd6df375793d714fe3b6570791e377cab1e5':
  Pipe notifications from related users to listeners.
 2014-04-08 18:07:42 +00:00
Kenny Guy
cfd3cd6df3 Merge "Pipe notifications from related users to listeners." 2014-04-08 17:59:27 +00:00
Ying Wang
27e0f545e5 am 777a8e0a: Expose APIs used to be hidden due to Doclava bug. 
* commit '777a8e0aec6d8fd4813e75a39c5611c5cb660f9f':
  Expose APIs used to be hidden due to Doclava bug.
 2014-04-08 17:59:15 +00:00
Amith Yamasani
4f58263d02 Launcher APIs and broadcasts for managed profiles 
UserManager
- Corp badging
- Querying list of managed profiles

Launcher API
- LauncherApps and Service to proxy changes in managed profile
  to the launcher in the primary profile
- Querying and launching launchable apps across profiles

Change-Id: Id8f7b4201afdfb5f414d04156d7b81300119289e
 2014-04-08 10:51:05 -07:00
Ying Wang
777a8e0aec Expose APIs used to be hidden due to Doclava bug. 
If a class inherits public fields from a hidden interface, they should
be exposed as APIs. A good example is the dozens of constants
java.util.zip.ZipFile inherits form java.util.zip.ZipConstants.

Bug: 13721174
Change-Id: I83cf13c174edf4422bc8ab2be275a47b214e1fa9
 2014-04-08 10:39:55 -07:00
Kenny Guy
a263e4e438 Pipe notifications from related users to listeners. 
For Listeners built against L or greater
Send notifications from related users to listeners.
Return notifications from related users getAllActiveNotifications
Cancel notifications from related users in cancelAllNotifications
Deprecate StatusBarNotification.getUserId() and expose getUser()
as APIs should use UserHandles.
Deprecate cancelNotification that takes package, id and tag
in favour of one that takes key.

Fix bug that notifications from related users didn't
trigger sounds.

Change-Id: I1b1c20c9f305b8f3c4047bc5720d8e99cdedfe70
 2014-04-08 18:38:38 +01:00
Yohei Yukawa
110553b3c9 am 59fee2d5: Merge "Allow IMEs to start/stop receiving onUpdateCursor callback" 
* commit '59fee2d5534965f0986e68e0c3562da5e65e6c45':
  Allow IMEs to start/stop receiving onUpdateCursor callback
 2014-04-08 06:26:09 +00:00
Yohei Yukawa
59fee2d553 Merge "Allow IMEs to start/stop receiving onUpdateCursor callback" 2014-04-08 05:48:45 +00:00
Sailesh Nepal
75c11006d2 Merge "Add InCallCall class to communicate with InCallService" into master-nova 2014-04-08 05:14:37 +00:00
Sailesh Nepal
6043793d3e Add InCallCall class to communicate with InCallService 
Change-Id: I3916e33e184f57bb6e58ed93a26b866d3ce0e7df
 2014-04-07 22:10:27 -07:00
Alan Viverette
4d3c957b77 am a75ee14e: Update APIs to fix build 
* commit 'a75ee14e6739ddc243d0ba905f48e9c22323c9fd':
  Update APIs to fix build
 2014-04-08 02:07:27 +00:00
Alan Viverette
a75ee14e67 Update APIs to fix build 
Change-Id: Id3c0401a60ff35cd9a07ecb46fb377a00829cf90
 2014-04-07 18:59:51 -07:00
Alan Viverette
a489851ae8 am 365fdc5c: Merge "Revert action bar theme attribute" 
* commit '365fdc5c5bb761c450948345702beb3a1763ad9a':
  Revert action bar theme attribute
 2014-04-07 20:29:01 +00:00
Alan Viverette
bbc6f3e631 Revert action bar theme attribute 
BUG: 13878093
Change-Id: I7cc4e270854f66d604a6e22eafbeef37c968fdae
 2014-04-07 13:21:38 -07:00
George Mount
a9364665d6 am 6fd0ef7f: Merge "Add Transitions useful for Activity transitions." 
* commit '6fd0ef7f7367ce6e2272e9c517793d502fe7f8da':
  Add Transitions useful for Activity transitions.
 2014-04-07 16:22:45 +00:00
George Mount
65c87ff167 am dde10d07: Merge "Implement "Back" for Activity Transitions." 
* commit 'dde10d073f819e78c0b26d7f37ed10f01b45125c':
  Implement "Back" for Activity Transitions.
 2014-04-07 16:22:41 +00:00
George Mount
d6107a3170 Add Transitions useful for Activity transitions. 
Slide: transition in and out of the edge of the scene.
Explode: transition to the scene borders

Moved capability from Fade to Visibility.

Change-Id: Ibeb0d8f751c990edc467570d9665fbe251af2703
 2014-04-07 09:14:09 -07:00
George Mount
cb4b7d999e Implement "Back" for Activity Transitions. 
Change-Id: Iceaf888f57f2c7598f9291687ac9ad76d55bd82c
 2014-04-07 09:00:13 -07:00
Alexandra Gherghina
2ea79b063d am 45849beb: Merge "Introduces intents for adding and removing a managed profile." 
* commit '45849beb3bd0d9f4494bdcce919dcf995bcb881b':
  Introduces intents for adding and removing a managed profile.
 2014-04-07 12:36:25 +00:00
Alexandra Gherghina
45849beb3b Merge "Introduces intents for adding and removing a managed profile." 2014-04-07 12:26:56 +00:00
Alexandra Gherghina
c17d7e0d64 Introduces intents for adding and removing a managed profile. 
Change-Id: I6b8b7a314ea52bfd0c750da94066156e73a0f2f5
 2014-04-07 12:38:24 +01:00
Etienne Le Grand
4f49f593c1 am fa1d2417: Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" 
* commit 'fa1d2417d296e28a48a8c4a5cfb932172edbdd65':
  Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
 2014-04-05 06:28:37 +00:00
Etienne Le Grand
fa1d2417d2 Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" 
This reverts commit fd53d8352a4617941b0a0449390aa562a01ea1d3.

Change-Id: I1c6322d1d992147bb5ef201238374966128c1a61
(cherry picked from commit 819239e5bec90ee3c861ac45fffac4a832a183a1)
 2014-04-05 06:14:24 +00:00
Etienne Le Grand
b39f93ca69 am ded26473: am bdfe3841: am fd53d835: Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor 
* commit 'ded264733036bb566c54da5b771d63f57213c84e':
  Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
 2014-04-05 04:01:33 +00:00