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

138551 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dongwon Kang
336cdf20dd Make TvView keep the volume value and set later once the connecation is made. 
Bug: 15483740
Change-Id: Id4272bffb556587707b641ec8296bc5a9e57807e
 2014-06-08 18:20:55 +09:00
Deepanshu Gupta
acb119f0a2 Merge "Build LayoutLib with Java 6" into lmp-preview-dev 2014-06-07 23:32:10 +00:00
Sailesh Nepal
8b5dd8c5d4 Merge "API: Add call service handoff trigger" 2014-06-07 21:11:17 +00:00
Deepanshu Gupta
f4058c8d6b Build LayoutLib with Java 6 
Add source and target flags to LayoutLib Bridge to enable compatibility
with Java 6.

Change-Id: I81266af758bb57df037541d6e82600e5020a3c0d
 2014-06-07 11:19:03 -07:00
Dianne Hackborn
000cdd5fe5 Merge "[system transitions] + merge all transition work into new branch for commiting to master + new task switching animations to support doc-centric recents + new default activity transitions + new app -> home (wallpaper close) + updated fragment close" into lmp-preview-dev 2014-06-07 17:33:18 +00:00
Baligh Uddin
60c78f58ab am 7c12fff1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 
* commit '7c12fff112cf0bd09022bf2e87f721fc4c8526f3':
  Import translations. DO NOT MERGE
 2014-06-07 12:33:53 +00:00
Baligh Uddin
2c0b9cf758 am 0b8dd221: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 
* commit '0b8dd221d213d876438d65d67641001f51cd494d':
  Import translations. DO NOT MERGE
 2014-06-07 12:33:48 +00:00
Baligh Uddin
97892901cd am f7e5788e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 
* commit 'f7e5788e8598531998e5934ab700c42d8ba15aa4':
  Import translations. DO NOT MERGE
 2014-06-07 12:33:44 +00:00
Igor Murashkin
09c0d2618c am f6c66902: Merge "util: Make Rational a Number/Comparable; add Range#inRange" into lmp-preview-dev 
* commit 'f6c66902392ae7fcfd44fe90fc43b08b21db2e10':
  util: Make Rational a Number/Comparable; add Range#inRange
 2014-06-07 12:26:23 +00:00
Alan Viverette
bc0fbaebec am 8f04539e: (-s ours) Fix build 
* commit '8f04539ef2c88bdaf9c89bd14b7c23d30ad8ba09':
  Fix build
 2014-06-07 12:26:17 +00:00
Todd Poynor
c42ef37e28 am 1be0bda2: Merge "BatteryManager: battery property query API update" into lmp-preview-dev 
* commit '1be0bda27ef001c41f4d4361f079eb5ca6592b04':
  BatteryManager: battery property query API update
 2014-06-07 10:01:10 +00:00
Wonsik Kim
af743eeaec Make TvInputs aware of whether it's hardware-based or not 
Bug: 15326724
Change-Id: I1f418150ba29ee50afc50a811198115fdc6f9c42
 2014-06-07 13:36:19 +09:00
Nick Kralevich
82b3201a95 resolved conflicts for merge of 13ed83ee to master 
Change-Id: Ia3739cfa7af60e6a47bf94d403df190f3f2cd082
 2014-06-06 21:13:28 -07:00
Baligh Uddin
069f94230d Merge "Import translations. DO NOT MERGE" 2014-06-07 03:10:55 +00:00
Baligh Uddin
48798325ed Merge "Import translations. DO NOT MERGE" 2014-06-07 03:10:51 +00:00
Baligh Uddin
ceb997bae0 Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-07 03:10:45 +00:00
Baligh Uddin
714ac2891c Merge "Import translations. DO NOT MERGE" 2014-06-07 03:10:42 +00:00
Baligh Uddin
7892a49615 Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-07 03:10:36 +00:00
Baligh Uddin
d29b822d9b Merge "Import translations. DO NOT MERGE" 2014-06-07 03:10:29 +00:00
Baligh Uddin
c525c9605f Merge "Import translations. DO NOT MERGE" 2014-06-07 03:10:29 +00:00
Baligh Uddin
d5cf4a6ff6 Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-07 03:10:23 +00:00
Baligh Uddin
e70fea28e6 Merge "Import translations. DO NOT MERGE" 2014-06-07 03:10:20 +00:00
Ari Sachter-Zeltzer
7e3357a56d [system transitions] 
+ merge all transition work into new branch for commiting to master
+ new task switching animations to support doc-centric recents
+ new default activity transitions
+ new app -> home (wallpaper close)
+ updated fragment close

Change-Id: If055e454e7e7bf11c7d54c8cacad8f7ec52d12d1
 2014-06-06 19:48:36 -07:00
Igor Murashkin
2f98a26bbf Merge "util: Make Rational a Number/Comparable; add Range#inRange" into lmp-preview-dev 2014-06-07 00:35:36 +00:00
Alan Viverette
e6a4613cf3 Fix build 
Change-Id: I49b6330e30710b99f9c89e2a88c95a8157a352ad
 2014-06-06 17:29:11 -07:00
Igor Murashkin
007bfb14d2 util: Make Rational a Number/Comparable; add Range#inRange 
* Also changes Rational to reduce the numerator/denominator by
its greatest common divisor at construction time (e.g. (2/4 -> 1/2)).

Bug: 15432042
Change-Id: Ib827abccf44a040667e5931cf9442afc86b57e2d
 2014-06-06 16:38:09 -07:00
Todd Poynor
407a403402 Merge "BatteryManager: battery property query API update" into lmp-preview-dev 2014-06-06 23:16:16 +00:00
Craig Mautner
3c9f70dc86 Merge "Implement maxRecents and fix TaskPersister bug" into lmp-preview-dev 2014-06-06 23:14:32 +00:00
Alan Viverette
dcdce7730b Merge "Material theme" 2014-06-06 22:49:21 +00:00
Alan Viverette
830960cce0 Material theme 
BUG: 15467097
Change-Id: I15191362e104a902895418fc615892c21db64c35
 2014-06-06 15:48:55 -07:00
Tim Murray
08d3775cbe am b43bc047: Merge "Change flags to use int instead of long." into lmp-preview-dev 
* commit 'b43bc0475490fe2a20c2ddeed1c34b55b8f8a152':
  Change flags to use int instead of long.
 2014-06-06 22:41:22 +00:00
Jeff Brown
a18d0acc1f Merge "Rename PrivateApi annotation to SystemApi." 2014-06-06 22:38:54 +00:00
Tim Murray
7fa0e6bc69 Merge "Change flags to use int instead of long." into lmp-preview-dev 2014-06-06 22:36:49 +00:00
Matt Casey
c4cbf54c29 Merge "Make MediaStore.Audio.Radio not instantiable" 2014-06-06 22:27:39 +00:00
Jeff Brown
d5a5b5a547 Rename PrivateApi annotation to SystemApi. 
Change-Id: I97b473884f81ad375d0733e4766afe091dfdd854
 2014-06-06 15:16:27 -07:00
Alan Viverette
052027dc90 am 1c097b99: (-s ours) Merge "DO NOT MERGE Material theme" into lmp-preview-dev 
* commit '1c097b996e796b5d6b1f54c7c8119cf8407bcacc':
  DO NOT MERGE Material theme
  Current page not updated when closed
 2014-06-06 22:00:04 +00:00
Alan Viverette
1abd798db9 Merge "DO NOT MERGE Material theme" into lmp-preview-dev 2014-06-06 21:56:51 +00:00
svetoslavganov
9799686df0 Merge "Current page not updated when closed" into lmp-preview-dev 2014-06-06 21:46:18 +00:00
Chris Craik
7f8d1c3f3e am 493ae7d7: Add doc for View.getElevation() 
* commit '493ae7d7aa547f366c6de244f5535ba2c0417598':
  Add doc for View.getElevation()
 2014-06-06 21:23:40 +00:00
Alan Viverette
3cb07a462b DO NOT MERGE Material theme 
BUG: 15467097
Change-Id: I15191362e104a902895418fc615892c21db64c35
 2014-06-06 14:19:53 -07:00
Jason Monk
b0dced8173 Add an API to clear the device owner. 
Only the device owner will be able to clear itself.

Change-Id: Ie3231467d92e8c5d22ec51256177793f34110432
 2014-06-06 17:03:43 -04:00
svetoslavganov
27d3e6d06f Current page not updated when closed 
Change-Id: I19845f179f9e712f0213c845c795d5e2c9ea4e29
 2014-06-06 20:59:51 +00:00
Amith Yamasani
34e0888c99 am 87590b53: Merge "Add missing abstract method override in BridgePowerManager." into lmp-preview-dev 
* commit '87590b5342c5c4b1fb7b1c6037d64cffd1806025':
  Add missing abstract method override in BridgePowerManager.
 2014-06-06 20:57:52 +00:00
Dan Sandler
8c293fecaa am 8612d151: Merge "NoMan: Rank by \'when\' instead of \'postTime\'" into lmp-preview-dev 
* commit '8612d151b32e654daf4bb673ab93e402b56dd447':
  NoMan: Rank by 'when' instead of 'postTime'
 2014-06-06 20:57:47 +00:00
Jim Miller
525f5773e3 am 31499c15: (-s ours) Merge "Hide the fingerprint API for now. DO NOT MERGE" into lmp-preview-dev 
* commit '31499c15618c382b4a85bd2f022cf8b645dd86d5':
  Hide the fingerprint API for now. DO NOT MERGE
 2014-06-06 20:57:42 +00:00
Alan Viverette
6e083aeaad am 58248d04: Merge "Update drawables to fix CTS test failures" into lmp-preview-dev 
* commit '58248d049e8b17dd60e4e94e784c09b00e0a7e9d':
  Update drawables to fix CTS test failures
 2014-06-06 20:57:37 +00:00
Alan Viverette
f7807bf566 am fe0b773c: Make the action bar dark in DarkActionBar theme 
* commit 'fe0b773cd787b7326729d06d8e54c341f5cb12a6':
  Make the action bar dark in DarkActionBar theme
 2014-06-06 20:57:29 +00:00
Amith Yamasani
e7da1c5ee1 am dbfa4569: Fix build breakage in BatteryController 
* commit 'dbfa456927c2dd9d72a008a58fca6ffc29fc1481':
  Fix build breakage in BatteryController
 2014-06-06 20:57:18 +00:00
Jason Monk
f10606a9a4 Merge "Add device-owner based setting of global proxy." 2014-06-06 20:50:23 +00:00
Jason Monk
03bc991834 Add device-owner based setting of global proxy. 
Re-hide the setGlobalProxy on the ConnectivityManager as it requires
CONNECTIVITY_INTERNAL.  Instead add a function to the DevicePolicyManager
to set the global proxy, that can only be called by the device owner.

Change-Id: I9ffb2cc4f30a6dc9b868d86f056e1fbd512d8dfc
 2014-06-06 16:43:17 -04:00