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

137704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yuhao Zheng
cfdecb3b91 Merge "WifiService and WifiPasspointService hook up" 2014-06-02 23:54:11 +00:00
Yuhao Zheng
daa618e3cd WifiService and WifiPasspointService hook up 
- add a reference to passpoint service in wifi state machine
- break dependency loop at boot phase

Change-Id: I34c0ce55efa5235ebaba1fa6772f559d608ee5ba
 2014-06-02 16:48:37 -07:00
Alan Viverette
5a4af17e27 Merge "Clean up drawable theming APIs" into lmp-preview-dev 2014-06-02 23:41:59 +00:00
Alan Viverette
6dbe51b50e Clean up drawable theming APIs 
Removes APIs for themed creation of a drawable from a stream, since
that doesn't involve any inflation. Also cleans up tinting methods
left over from previous clean up.

BUG: 15089957
Change-Id: I2af7aa9a6d351ae61b33ee1216c674fae1bffe11
Signed-off-by: Alan Viverette <alanv@google.com>
 2014-06-02 16:39:04 -07:00
John Reck
84a4c887a0 Remove GLRenderer 
Change-Id: I180286417c1a354fc7eb1eadb1884ac6add0795c
 2014-06-02 16:33:52 -07:00
Jinsuk Kim
d79b39220d Merge "Added missing entries in the cec device array" 2014-06-02 23:24:56 +00:00
Robert Greenwalt
3192dec321 Refactor NetworkFactory. 
Make NetworkFactory a concrete class and divide responsibilites between it and NetworkAgent.
Factory will track requests and by default give a single connect/disconnect api for ease
of use.  Then NetworkAgent is created and destroyed as needed with very simple logic.

Change-Id: I401c14a6e5466f2fc63b04219b97ff85bb9af291
 2014-06-02 16:19:08 -07:00
Robert Greenwalt
8f3799867d Merge "Rewrite startUsingNetworkFeature for new API" 2014-06-02 23:12:29 +00:00
Dianne Hackborn
0bec638839 Merge "Some battery stats history fixes." into lmp-preview-dev 2014-06-02 22:57:41 +00:00
Raph Levien
596f0b1a03 Merge "Support fallbacks for custom typefaces (Minikin)" into lmp-preview-dev 2014-06-02 22:54:58 +00:00
John Reck
982e28cafd Merge "Cleanup" 2014-06-02 22:44:50 +00:00
George Mount
cdd5c8f34b Merge "Delay sending shared element position until after layout." into lmp-preview-dev 2014-06-02 22:42:45 +00:00
John Reck
ce444ca400 Cleanup 
Change-Id: Ie366390272724a2c1dfda99b0e85806b7a612744
 2014-06-02 15:12:36 -07:00
Fabrice Di Meglio
b3d5856e68 am f3c294df: Merge "Code cleaning" into lmp-preview-dev 
* commit 'f3c294df46bab8f50bead51e70f562778b8c5deb':
  Code cleaning
 2014-06-02 22:10:36 +00:00
Fabrice Di Meglio
47297e8f82 am 8dead81f: Merge "Code cleaning" into lmp-preview-dev 
* commit '8dead81f3b1548d0d3f84a585b389baf8d415e99':
  Code cleaning
 2014-06-02 22:10:31 +00:00
Craig Mautner
8d2a604ce4 am 39317b97: Merge "Compare task userId with userId profiles." into lmp-preview-dev 
* commit '39317b9742cf796557583f6678a7443a991414f7':
  Compare task userId with userId profiles.
 2014-06-02 22:10:30 +00:00
Vinit Deshpande
c638a61d99 am 357a441e: (-s ours) Merge "DO NOT MERGE: Accomoditing API Review feedback for WifiScanner" into lmp-preview-dev 
* commit '357a441e5be26a642238e2fd13e88f35f6e25a65':
  DO NOT MERGE: Accomoditing API Review feedback for WifiScanner
 2014-06-02 22:10:30 +00:00
John Spurlock
fd881f8973 am 20d26282: Merge "Update global actions bug report item." into lmp-preview-dev 
* commit '20d26282b31dcd7f7d258c3878f15b42211b23d0':
  Update global actions bug report item.
 2014-06-02 22:10:29 +00:00
Adrian Roos
bba9a212a0 Remove now defunct touch analysis facility 
Bug: 15381470
Change-Id: I2ab252e4c0122d79c9a78b3df643bfd46a105cf0
 2014-06-02 23:48:29 +02:00
Adam Powell
08c06495cc Merge "Add an internal method for setting optical insets." into lmp-preview-dev 2014-06-02 21:36:55 +00:00
Jorim Jaggi
03bce432aa Merge "Hide header when notifications collide with it on Keyguard." into lmp-preview-dev 2014-06-02 21:35:04 +00:00
Jorim Jaggi
457cc35608 Hide header when notifications collide with it on Keyguard. 
Bug: 15163546
Change-Id: If4f39786916df75537959a8104823353c475448f
 2014-06-02 21:34:33 +00:00
Adam Powell
dbb06e0c8c Add an internal method for setting optical insets. 
This will allow views to calculate their own optical insets
e.g. during measurement. Candidate for public API down the road once
it proves itself for framework views.

Change-Id: I098d7b7b52e5aaf7eccc8ef34d79791d127d8c77
 2014-06-02 14:24:47 -07:00
Raph Levien
44e3da3c28 Merge "Check for NULL on TypefaceImpl unref" into lmp-preview-dev 2014-06-02 21:17:49 +00:00
Jae Seo
3c784d6359 Merge "Put TV Input Framework under android.media.tv, including TvContract" into lmp-preview-dev 2014-06-02 21:03:58 +00:00
Fabrice Di Meglio
b75a69f9b3 Merge "Code cleaning" into lmp-preview-dev 2014-06-02 20:50:43 +00:00
Fabrice Di Meglio
4ec0038243 Merge "Code cleaning" into lmp-preview-dev 2014-06-02 20:49:37 +00:00
Craig Mautner
481acb86e4 Merge "Compare task userId with userId profiles." into lmp-preview-dev 2014-06-02 20:40:16 +00:00
George Mount
d265bd7446 Delay sending shared element position until after layout. 
Bug 15380396

Also updated fade duration to 300ms now that shared element
transition can take place before fade.

Change-Id: I9053615c83b9e0938b015645de0eb6c1534cbb34
 2014-06-02 13:39:14 -07:00
Raph Levien
a0cba0fde3 Check for NULL on TypefaceImpl unref 
It's possible for a TypefaceImpl to contain a null pointer, which was
causing crashes on unref. This patch just checks for NULL.

Fixes bug 15104801 "Aviate Launcher crashes on startup - Hammerhead L
AAV49B"

Change-Id: Idf9f176c54bf81ff3daacc0b33e95aa9d8bbe57f
 2014-06-02 13:37:34 -07:00
vandwalle
0dcecc1cab Merge "handle removal of self added configurations" 2014-06-02 20:03:13 +00:00
Vinit Deshpande
d5d9e73a1a Merge "DO NOT MERGE: Accomoditing API Review feedback for WifiScanner" into lmp-preview-dev 2014-06-02 20:00:12 +00:00
Dianne Hackborn
fc0641340f Some battery stats history fixes. 
- Now the full wake history uses the history tag if it can.
  Hopefully this will still result in a consistent history,
  since that isn't really want the tag is for...  but the
  current implementation in places will probably make this work.

- Possibly fix a bug with inconsistent state between partial
  history snapshots: after a snapshot is printed, don't allow
  any more batching into the most recent history entry, so the
  next snapshot will not miss anything that might get placed
  into it soon after.

Also rework command line arguments for enable/disable to make these
commands instead of options.

Change-Id: Ia33445cad1538bf8df549cef284f1e736efbc079
 2014-06-02 12:42:12 -07:00
John Spurlock
66268f5d32 Merge "Update global actions bug report item." into lmp-preview-dev 2014-06-02 19:17:35 +00:00
John Spurlock
887aa0024f Update global actions bug report item. 
New icon, update title to match confirm dialog, new status
line for build information.

Remove redundant QS tile.

Bug:15385554
Change-Id: Idc36dc9ce1cabfa61fd8acac56dc3a70d5dc6645
 2014-06-02 15:01:58 -04:00
Yuhao Zheng
597b637070 Merge "More ANQP parsing" 2014-06-02 18:38:45 +00:00
Mike Lockwood
9dc96cf0fc am a0183b02: am 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE." 
* commit 'a0183b02e4c6f53587519b445a546192b4a20146':
  MtpDatabase JNI: Fixed incorrect method name in ALOGE.
 2014-06-02 18:32:26 +00:00
Mike Lockwood
307a37c2af am 1ac54ec6: am 750e78bb: am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()." 
* commit '1ac54ec69bfcda2638b05c7daa4300ec5749e7b8':
  MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
 2014-06-02 18:32:20 +00:00
Mike Lockwood
a0183b02e4 am 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE." 
* commit '8868d1290afd96997fef671f4a7a4c7bbf94fa1a':
  MtpDatabase JNI: Fixed incorrect method name in ALOGE.
 2014-06-02 18:28:51 +00:00
Mike Lockwood
1ac54ec69b am 750e78bb: am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()." 
* commit '750e78bb7626e2e0d5c8feed4a6e4fbe7fe9b5da':
  MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
 2014-06-02 18:28:42 +00:00
Mike Lockwood
8868d1290a am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE." 
* commit '1c725866da02c3e1f62fb416ea3450caed406f2a':
  MtpDatabase JNI: Fixed incorrect method name in ALOGE.
 2014-06-02 18:25:35 +00:00
Mike Lockwood
750e78bb76 am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()." 
* commit '27eb205e21e7715764084085f382d690e0406c63':
  MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
 2014-06-02 18:25:28 +00:00
Mike Lockwood
1c725866da Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE." 2014-06-02 18:21:17 +00:00
Mike Lockwood
27eb205e21 Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()." 2014-06-02 18:20:39 +00:00
John Reck
776512d4b6 am feccbdc4: Merge "Add setStartValue to RNA" into lmp-preview-dev 
* commit 'feccbdc4d0bee3eb4c395bd93ba51cbc6616527a':
  Add setStartValue to RNA
 2014-06-02 18:19:44 +00:00
John Reck
82e71a756e Merge "Add setStartValue to RNA" into lmp-preview-dev 2014-06-02 18:13:14 +00:00
Raph Levien
88554f5f7d am dfc40743: Merge "Revert ascent/descent/lineGap of Roboto to Roboto v1 values" into lmp-preview-dev 
* commit 'dfc40743fda406614a2200a31e8a670b7fa46cd8':
  Revert ascent/descent/lineGap of Roboto to Roboto v1 values
 2014-06-02 18:08:19 +00:00
Raph Levien
a9efb28408 Merge "Revert ascent/descent/lineGap of Roboto to Roboto v1 values" into lmp-preview-dev 2014-06-02 18:04:45 +00:00
Jae Seo
d5cc4a281e Put TV Input Framework under android.media.tv, including TvContract 
Bug: 15345342
Change-Id: I665ca23f0f074ce29cb2e047109b209178532107
 2014-06-02 11:02:52 -07:00
John Reck
c6b3264e16 Add setStartValue to RNA 
Bug: 15198607
 Should be good-enough for Ripples to use for pseudo-chaining
 support.

Change-Id: Ia8666928ccb69ae401cb583751632a52bd928b63
 2014-06-02 11:00:09 -07:00