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

178103 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
ad69082b50 docs: Fixes to watch faces docs. 
Bug: 18705470
Bug: 18702859
Bug: 18713266

Change-Id: I67f159f3b54a03f08aa1cd4bf3aa40eec4a34631
 2014-12-11 09:17:45 -08:00
Mike Lockwood
78beecffc3 MidiManager: Improve Javadoc 
Change-Id: Ia1c457de96152029676676464f1ebb896e58bea8
 2014-12-11 09:15:23 -08:00
Robert Greenwalt
911bceab1e am bde00a2b: Merge "Add toString in NetworkFactory." into lmp-mr1-dev 
* commit 'bde00a2b5c8c506b79e0724021a0711bde207c25':
  Add toString in NetworkFactory.
 2014-12-11 17:03:57 +00:00
Robert Greenwalt
bde00a2b5c Merge "Add toString in NetworkFactory." into lmp-mr1-dev 2014-12-11 16:59:13 +00:00
Selim Cinek
efa38cd361 Merge "Fixed a bug where the pattern may become invisible" into lmp-mr1-dev 
automerge: f8dc9d7

* commit 'f8dc9d7b3d496593c6c6dddcd42cae13ac508876':
  Fixed a bug where the pattern may become invisible
 2014-12-11 15:12:37 +00:00
Selim Cinek
7988ef9c4d Merge "Fixed a bug where the empty shade and dismiss views would animate" into lmp-mr1-dev 
automerge: 372eb38

* commit '372eb38c17b8bcd304985d7a36168c175f625016':
  Fixed a bug where the empty shade and dismiss views would animate
 2014-12-11 15:11:17 +00:00
Selim Cinek
2e34adc24c Merge "Fixed a bug where the background could become transparent" into lmp-mr1-dev 
automerge: 8f51c4c

* commit '8f51c4c5e51e1581ba9892bc095453b8fc315f7b':
  Fixed a bug where the background could become transparent
 2014-12-11 15:10:06 +00:00
Selim Cinek
f8dc9d7b3d Merge "Fixed a bug where the pattern may become invisible" into lmp-mr1-dev 2014-12-11 14:09:44 +00:00
Selim Cinek
372eb38c17 Merge "Fixed a bug where the empty shade and dismiss views would animate" into lmp-mr1-dev 2014-12-11 14:09:00 +00:00
Selim Cinek
8f51c4c5e5 Merge "Fixed a bug where the background could become transparent" into lmp-mr1-dev 2014-12-11 14:08:10 +00:00
Narayan Kamath
fbba3f411b am bc59ca4b: am 31462128: Merge "Avoid tearing down process groups twice." 
automerge: 0602404

* commit '06024047258b01ad70f7d88e5773d8dc9b8d59fd':
  Avoid tearing down process groups twice.
 2014-12-11 10:39:09 +00:00
Narayan Kamath
5e41c66881 am 37da3f0d: am 7bd28de5: Merge "Remove some crufty "core" tests." 
automerge: c1c4edf

* commit 'c1c4edf129d984be20aa79af2d5d6f8d881e2f26':
  Remove some crufty "core" tests.
 2014-12-11 10:37:44 +00:00
Narayan Kamath
0602404725 am bc59ca4b: am 31462128: Merge "Avoid tearing down process groups twice." 
* commit 'bc59ca4bdbd993c1eb5c2a74f9b35857619da285':
  Avoid tearing down process groups twice.
 2014-12-11 10:35:28 +00:00
Narayan Kamath
c1c4edf129 am 37da3f0d: am 7bd28de5: Merge "Remove some crufty "core" tests." 
* commit '37da3f0d28815a5dfbea929fc173d89cb62bd318':
  Remove some crufty "core" tests.
 2014-12-11 10:35:19 +00:00
Narayan Kamath
6fe0fd69a1 am 15cd6302: Merge "Avoid tearing down process groups twice." into lmp-mr1-dev 
* commit '15cd63027bc8413659114714068a665869a4b3b2':
  Avoid tearing down process groups twice.
 2014-12-11 10:34:09 +00:00
Narayan Kamath
bc59ca4bdb am 31462128: Merge "Avoid tearing down process groups twice." 
* commit '314621287801ba4c71467aad4702114eeb4d9951':
  Avoid tearing down process groups twice.
 2014-12-11 10:28:10 +00:00
Narayan Kamath
37da3f0d28 am 7bd28de5: Merge "Remove some crufty "core" tests." 
* commit '7bd28de5781293b1b2b4224762bd909d097adbda':
  Remove some crufty "core" tests.
 2014-12-11 10:28:04 +00:00
Paul Jensen
87dfb9ec25 am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev automerge: d9d48cc 
automerge: 8f58207

* commit '8f58207319fc2b73f83874892a544f8cf59cf7e9':
  Fix several HTTP proxy issues with multinetworking.
 2014-12-11 10:25:47 +00:00
Pavel Zhamaitsiak
072c7638af am fda0ff02: Merge "Add missing member to string conversion - helps in debugging." into lmp-mr1-dev automerge: b07de8d 
automerge: de67144

* commit 'de6714474d9d54c5ba0d6a83eafe5ecb96bf337e':
  Add missing member to string conversion - helps in debugging.
 2014-12-11 10:24:36 +00:00
vandwalle
a353a3b48a am b897f013: Merge "adjust network switching thresholds Bug:18589301" into lmp-mr1-dev automerge: 76dc7a1 
automerge: dca701a

* commit 'dca701a8fac49f2cd440dd95aae510aef412fdf4':
  adjust network switching thresholds Bug:18589301
 2014-12-11 10:23:14 +00:00
smain@google.com
984972fadc am 9a6d1d9f: am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs automerge: e04a9fc automerge: bac113b 
automerge: c73a65d

* commit 'c73a65d61892542ece0dd9b95000048517f36c02':
  add helpouts widget to wave 3 pages
 2014-12-11 10:21:47 +00:00
Luan Nguyen
671dd81eeb am 25964a85: am 7e1b348a: am 4221d7e4: docs: Fix link for moved Android Studio index. automerge: 75ec24e automerge: 8470943 
automerge: f5b8651

* commit 'f5b865101d6f47aa5ef49cbd6b121d897116356c':
  docs: Fix link for moved Android Studio index.
 2014-12-11 10:20:17 +00:00
Dianne Hackborn
460797b398 am 84adc43a: Merge "Fix issue #18706195: Improve label names of memory types" into lmp-mr1-dev automerge: 0f050ea 
automerge: b56e98d

* commit 'b56e98da8b0486485a57803e5ef9e9333a510641':
  Fix issue #18706195: Improve label names of memory types
 2014-12-11 10:18:41 +00:00
Yohann Roussel
59cf734f9e resolved conflicts for merge of d67bb501 to master 
Change-Id: I40698ce1e382cb41eec7af5ea49ac0e2f997d555
 2014-12-11 11:10:50 +01:00
Narayan Kamath
3146212878 Merge "Avoid tearing down process groups twice." 2014-12-11 09:15:06 +00:00
Narayan Kamath
7bd28de578 Merge "Remove some crufty "core" tests." 2014-12-11 09:14:15 +00:00
Narayan Kamath
15cd63027b Merge "Avoid tearing down process groups twice." into lmp-mr1-dev 2014-12-11 09:08:43 +00:00
Paul Jensen
8f58207319 am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev 
automerge: d9d48cc

* commit 'd9d48cc9c7ab0d1590918e199917968eafc48288':
  Fix several HTTP proxy issues with multinetworking.
 2014-12-11 05:49:18 +00:00
Pavel Zhamaitsiak
de6714474d am fda0ff02: Merge "Add missing member to string conversion - helps in debugging." into lmp-mr1-dev 
automerge: b07de8d

* commit 'b07de8d172e7c7b663dec0dd14f7d6dba168aa4c':
  Add missing member to string conversion - helps in debugging.
 2014-12-11 05:47:45 +00:00
Paul Jensen
d9d48cc9c7 am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev 
* commit '2122e14cca3edc5099b90d8768b34d7a0e9fe148':
  Fix several HTTP proxy issues with multinetworking.
 2014-12-11 04:55:52 +00:00
Pavel Zhamaitsiak
b07de8d172 am fda0ff02: Merge "Add missing member to string conversion - helps in debugging." into lmp-mr1-dev 
* commit 'fda0ff020d2ce63e4010e24d5f4bebf7fbe026c5':
  Add missing member to string conversion - helps in debugging.
 2014-12-11 04:55:47 +00:00
Paul Jensen
2122e14cca Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev 2014-12-11 04:51:16 +00:00
Pavel Zhamaitsiak
fda0ff020d Merge "Add missing member to string conversion - helps in debugging." into lmp-mr1-dev 2014-12-11 04:47:20 +00:00
vandwalle
dca701a8fa am b897f013: Merge "adjust network switching thresholds Bug:18589301" into lmp-mr1-dev 
automerge: 76dc7a1

* commit '76dc7a1abe2d69013dbc8238292d239ac1287e2c':
  adjust network switching thresholds Bug:18589301
 2014-12-11 03:41:48 +00:00
smain@google.com
c73a65d618 am 9a6d1d9f: am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs automerge: e04a9fc 
automerge: bac113b

* commit 'bac113bbcbe7780ca658f09019e5118ec851cd07':
  add helpouts widget to wave 3 pages
 2014-12-11 03:39:57 +00:00
Luan Nguyen
f5b865101d am 25964a85: am 7e1b348a: am 4221d7e4: docs: Fix link for moved Android Studio index. automerge: 75ec24e 
automerge: 8470943

* commit '847094397ebac9ab2c5bb7e11844fd2b533bd209':
  docs: Fix link for moved Android Studio index.
 2014-12-11 03:38:41 +00:00
vandwalle
76dc7a1abe am b897f013: Merge "adjust network switching thresholds Bug:18589301" into lmp-mr1-dev 
* commit 'b897f013b558596964e33b39c0e9678998c281dc':
  adjust network switching thresholds Bug:18589301
 2014-12-11 03:25:00 +00:00
vandwalle
b897f013b5 Merge "adjust network switching thresholds Bug:18589301" into lmp-mr1-dev 2014-12-11 03:18:42 +00:00
Robert Greenwalt
6b746b5e14 Add toString in NetworkFactory. 
Needed some additional logging to track down this bug
so add toString to capture the state.

bug:18569575
Change-Id: I4047b8f8797bac09bcff31e99d9cb117abb04df4
 2014-12-10 19:04:50 -08:00
smain@google.com
bac113bbcb am 9a6d1d9f: am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs automerge: e04a9fc 
* commit '9a6d1d9fba9f32bd7d7f215637c4ae932d550f57':
  add helpouts widget to wave 3 pages
 2014-12-11 03:04:20 +00:00
Luan Nguyen
847094397e am 25964a85: am 7e1b348a: am 4221d7e4: docs: Fix link for moved Android Studio index. automerge: 75ec24e 
* commit '25964a854a0f41a74136c7dbc1c459ba6ef0e20b':
  docs: Fix link for moved Android Studio index.
 2014-12-11 03:04:14 +00:00
smain@google.com
9a6d1d9fba am c0f96532: am 8cd0bb2d: Merge "add helpouts widget to wave 3 pages" into lmp-docs 
automerge: e04a9fc

* commit 'e04a9fcc2edc4b2527c8233e16f823cec6fb58cc':
  add helpouts widget to wave 3 pages
 2014-12-11 02:56:17 +00:00
Luan Nguyen
25964a854a am 7e1b348a: am 4221d7e4: docs: Fix link for moved Android Studio index. 
automerge: 75ec24e

* commit '75ec24e26900fa6e0def1f5e946be41614d8e520':
  docs: Fix link for moved Android Studio index.
 2014-12-11 02:54:57 +00:00
Dianne Hackborn
b56e98da8b am 84adc43a: Merge "Fix issue #18706195: Improve label names of memory types" into lmp-mr1-dev 
automerge: 0f050ea

* commit '0f050ea40204242387eac8f7f5949ea16c143515':
  Fix issue #18706195: Improve label names of memory types
 2014-12-11 02:10:23 +00:00
Dianne Hackborn
0f050ea402 am 84adc43a: Merge "Fix issue #18706195: Improve label names of memory types" into lmp-mr1-dev 
* commit '84adc43a70302278eea4d9c198e14c88d6432f9c':
  Fix issue #18706195: Improve label names of memory types
 2014-12-11 02:05:11 +00:00
Dianne Hackborn
84adc43a70 Merge "Fix issue #18706195: Improve label names of memory types" into lmp-mr1-dev 2014-12-11 01:58:51 +00:00
Alan Viverette
9f2d0d27ac am 934d8d85: am daec5943: Fix build automerge: aaf2e19 
* commit '934d8d85be221b86cb5097625c0f48391b3a71b2':
  Fix build
 2014-12-11 01:40:26 +00:00
Alan Viverette
6a9fb4b6dd am 7d0aed2d: am 4e137437: Merge "Update tint filter after setting gradient drawable state" into lmp-mr1-dev automerge: c211857 
* commit '7d0aed2d2c0c2fd4bcaa0e786efd6134ae162d07':
  Update tint filter after setting gradient drawable state
 2014-12-11 01:40:17 +00:00
Winson Chung
e9a8205b5d am 4e4fd0f7: am e405e59e: Merge "Fixing major regressions in Recents with multi-user. (Bug 18574950)" into lmp-mr1-dev automerge: b485445 
* commit '4e4fd0f7216cefa9a7e010625bd5b2375277bcdc':
  Fixing major regressions in Recents with multi-user. (Bug 18574950)
 2014-12-11 01:40:10 +00:00
Shishir Agrawal
f864e44901 am 23172c70: am 960dcceb: Merge "Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev automerge: 951dcdd 
* commit '23172c706b0422ec2cc5bb9e1988a3bd2944a257':
  Adding a new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming.
 2014-12-11 01:39:54 +00:00