Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
178,131 Commits 3 Branches 0 Tags
7369cc6145274b03dca40dcff1920f4e995c9dba
Commit Graph

44762 Commits

Author SHA1 Message Date
Adam Powell
dd65a916c7 am 746079e2: am 9a0799cf: Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev 
automerge: 097e383

* commit '097e3830cd33d1848da3f61a16866f2bbcb3b6d0':
  Have ViewGroups without a parent clip child visible rects to bounds
 2014-12-12 18:57:35 +00:00
Adam Powell
097e3830cd am 746079e2: am 9a0799cf: Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev 
* commit '746079e2ee516d1c7be62154992eda78e9f2ec28':
  Have ViewGroups without a parent clip child visible rects to bounds
 2014-12-12 18:49:37 +00:00
Adam Powell
746079e2ee am 9a0799cf: Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev 
* commit '9a0799cf6b7289b8127ffcb22291f5baf21b4035':
  Have ViewGroups without a parent clip child visible rects to bounds
 2014-12-12 18:43:38 +00:00
Adam Powell
9a0799cf6b Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev 2014-12-12 18:37:33 +00:00
Alan Viverette
040b761af9 am 3ead4127: am ff441883: Merge "Improve time picker accessibility" into lmp-mr1-dev automerge: 4b7f724 
* commit '3ead4127ae493508d064e106ec12f299e7116e8a':
  Improve time picker accessibility
 2014-12-12 04:26:12 +00:00
Alan Viverette
3ead4127ae am ff441883: Merge "Improve time picker accessibility" into lmp-mr1-dev 
automerge: 4b7f724

* commit '4b7f724fb23166f892781ae7daa2df76bede2134':
  Improve time picker accessibility
 2014-12-12 04:21:42 +00:00
Ruben Brunk
00b2eb2bc0 am c7c20b34: am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev automerge: 81b381b 
* commit 'c7c20b34ecbaef5c1f60115755e87dbaaf0cfb4c':
  camera2: Fix LEGACY YUV production and orientation.
 2014-12-12 04:21:07 +00:00
Ruben Brunk
c7c20b34ec am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev 
automerge: 81b381b

* commit '81b381b82e83ec742a8a6541dabbc63dae087c0a':
  camera2: Fix LEGACY YUV production and orientation.
 2014-12-12 04:09:55 +00:00
Alan Viverette
4b7f724fb2 am ff441883: Merge "Improve time picker accessibility" into lmp-mr1-dev 
* commit 'ff44188309fca037892d0ded64cfee04a3a71c42':
  Improve time picker accessibility
 2014-12-11 22:19:07 +00:00
Alan Viverette
ff44188309 Merge "Improve time picker accessibility" into lmp-mr1-dev 2014-12-11 22:11:56 +00:00
Ruben Brunk
81b381b82e am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev 
* commit 'f6ed526b3a02bac9c5912a9655e5890f332cefc6':
  camera2: Fix LEGACY YUV production and orientation.
 2014-12-11 19:55:02 +00:00
Ruben Brunk
f6ed526b3a Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev 2014-12-11 19:48:37 +00:00
Ruben Brunk
433e715cc0 camera2: Fix LEGACY YUV production and orientation. 
Bug: 18486140
Change-Id: I119e57315b67d1f485bea7f1682bfc261ae0f934
 2014-12-11 11:35:46 -08:00
Robert Greenwalt
6b58bc2ba2 am bde00a2b: Merge "Add toString in NetworkFactory." into lmp-mr1-dev automerge: 911bcea 
automerge: 46765a0

* commit '46765a0fbc015ae07be5a8e18afd66f048883462':
  Add toString in NetworkFactory.
 2014-12-11 18:15:07 +00:00
Robert Greenwalt
46765a0fbc am bde00a2b: Merge "Add toString in NetworkFactory." into lmp-mr1-dev 
automerge: 911bcea

* commit '911bceab1ead02fde9ccb6fe2651fee13aca817e':
  Add toString in NetworkFactory.
 2014-12-11 18:07:53 +00:00
Mike Lockwood
43bbe4a1e7 Merge "MidiManager: Improve Javadoc" 2014-12-11 17:26:40 +00:00
Glenn Kasten
65357bd956 Merge "Remove constructor" 2014-12-11 17:21:23 +00: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
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
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
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
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
Paul Jensen
2122e14cca Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev 2014-12-11 04:51:16 +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
Adam Powell
35da41e6c3 Have ViewGroups without a parent clip child visible rects to bounds 
getChildVisibleRect was enhanced to obey the official contracts for
clipping children and clip to padding. Unfortunately this meant that
ViewGroups with no parent have no way of checking if they will be
clipped to their own bounds and therefore should clip a child rect.

Treat orphaned view subtrees as entities that clip to the root view
bounds to preserve prior CTS guarantees.

Bug 18642973

Change-Id: I9fcbeb0e92cd6715cd9184183d36889614ed0bed
 2014-12-10 18:59:34 -08: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
Alan Viverette
302ce540a0 am 9e8fbe42: am 7171bf40: am 6c42ee47: Merge "Always call onDateChanged() when the date picker selection changes" into lmp-mr1-dev 
* commit '9e8fbe42e96180f99fb2e2c4eccaa0441eb89b75':
  Always call onDateChanged() when the date picker selection changes
 2014-12-11 01:38:48 +00:00
Dianne Hackborn
1353df5655 Fix issue #18706195: Improve label names of memory types 
Change-Id: Ia11153300e04aecd56baca9d4316ac362688d594
 2014-12-10 16:54:13 -08:00
Alan Viverette
9e8fbe42e9 am 7171bf40: am 6c42ee47: Merge "Always call onDateChanged() when the date picker selection changes" into lmp-mr1-dev 
* commit '7171bf40eca7dc0a044f0378082d7f7c1dfa2348':
  Always call onDateChanged() when the date picker selection changes
 2014-12-11 00:07:32 +00:00
Glenn Kasten
4fe8ff3166 Remove constructor 
Change-Id: Ie2c29a92a2fd7c546e314a610a2e8c2506f18511
 2014-12-10 15:40:34 -08:00
Alan Viverette
7171bf40ec am 6c42ee47: Merge "Always call onDateChanged() when the date picker selection changes" into lmp-mr1-dev 
* commit '6c42ee470307eee56a21062ad67b67878aa9392d':
  Always call onDateChanged() when the date picker selection changes
 2014-12-10 22:12:04 +00:00
Dianne Hackborn
69ff299e79 am 9b287368: am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev automerge: 7557ec1 
* commit '9b287368b05f36e322f339b82d2bb495f230ca50':
  Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#...
 2014-12-10 21:59:37 +00:00
Craig Mautner
d2a4320875 am 647130ba: am 7a17e0b6: Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev automerge: 8642803 
* commit '647130baacf4f0caf077b5bf6ce00c5e1a23107b':
  Add put/getBoolean/Array to PersistableBundle
 2014-12-10 21:59:23 +00:00
Erik Kline
0bf20bea81 am 34b3b53f: am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev automerge: 56d2e8f 
* commit '34b3b53f9c21346282cb889363024fa4c7bb558d':
  Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.
 2014-12-10 21:58:42 +00:00
Andre Eisenbach
1ee272b064 am f60f29d0: am c9149984: Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev automerge: e832393 
* commit 'f60f29d060a538bd59b79ab8bd69ca6a31d26c29':
  Prevent NullPointerException in getStringValue if no value is set
 2014-12-10 21:57:40 +00:00
Paul Jensen
e0bef71662 Fix several HTTP proxy issues with multinetworking. 
1. Send PROXY_CHANGE_ACTION broadcast when any network's proxy changes,
   not just the default network.
2. When a process is bound to a particular Network, update the proxy
   system properties to those for the bound Network, and keep them
   updated when PROXY_CHANGE_ACTION broadcasts are received.
3. Make Network.openConnection() use the proxy for the Network.

bug:17905627
bug:17420465
bug:18144582

(cherry-pick of https://android-review.googlesource.com/#/c/115170)

Change-Id: Ia2819985e6108a8c121e74c683a5646becfd0a97
 2014-12-10 15:22:12 -05:00
Alan Viverette
e6ec07fc5d Always call onDateChanged() when the date picker selection changes 
BUG: 18703635
Change-Id: I2f71aa2e3e053cc8afd1bb84641a9fb29de89c72
 2014-12-10 11:24:27 -08:00
Dianne Hackborn
9b287368b0 am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev 
automerge: 7557ec1

* commit '7557ec128f3d2e6dca42b92b2771d1cf486cbb0c':
  Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#...
 2014-12-10 19:21:58 +00:00
Craig Mautner
647130baac am 7a17e0b6: Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev 
automerge: 8642803

* commit '864280369ca45f9a93f4cfe9c1d020e0cbe0d7ed':
  Add put/getBoolean/Array to PersistableBundle
 2014-12-10 19:17:53 +00:00
Erik Kline
34b3b53f9c am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev 
automerge: 56d2e8f

* commit '56d2e8fb7b2ab6e32efea59604eb0cd72745df1b':
  Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.
 2014-12-10 19:06:50 +00:00
Nick Kralevich
7668e78601 resolved conflicts for merge of 3bae94d7 to master 
Change-Id: I381539b1494447d62290c492f2550840fe0b559c
 2014-12-10 11:03:40 -08:00
Andre Eisenbach
f60f29d060 am c9149984: Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev 
automerge: e832393

* commit 'e8323934c7dd01228b6550ac5dcad08999371a61':
  Prevent NullPointerException in getStringValue if no value is set
 2014-12-10 18:49:41 +00:00
Alan Viverette
3fc00e3139 Improve time picker accessibility 
Overrides click action description for TimePicker hour/minute selectors
and manually specifies traversal order for radial time picker nodes.

BUG: 17468036
Change-Id: I4472b42a95d762085d7a4d382feb2b9216c0d41c
 2014-12-10 09:46:49 -08:00
Ruben Brunk
fe6a5ae924 am 28089cc3: Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev automerge: 3ef5033 automerge: 6d98265 
* commit '28089cc39b0247d5e854a1a44cd8af17464b9e36':
  Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
 2014-12-10 17:44:36 +00:00
Dianne Hackborn
7557ec128f am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev 
* commit '6bdbae07cf9b3929dca471072bea7001f7996efb':
  Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#...
 2014-12-10 17:29:35 +00:00
Dianne Hackborn
6bdbae07cf Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev 2014-12-10 17:23:07 +00:00
Craig Mautner
864280369c am 7a17e0b6: Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev 
* commit '7a17e0b601c7f65a2ae0b53d8494ae1722c7a28b':
  Add put/getBoolean/Array to PersistableBundle
 2014-12-10 17:02:10 +00:00