OSDN Git Service
Neil Fuller [Fri, 6 Feb 2015 17:30:45 +0000 (17:30 +0000)]
Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev
Kenny Guy [Fri, 6 Feb 2015 15:22:22 +0000 (15:22 +0000)]
Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev
Neil Fuller [Fri, 6 Feb 2015 10:03:08 +0000 (10:03 +0000)]
Avoid static initialization of Layout from TextUtils
This works around a bug in standalone (e.g. non-Zygote)
runtimes when a device is attached to a host that is running
DDM.
There is a race condition:
When the runtime receives a HELLO from DDM it calls
TextUtils.isEmpty().
Calling any TextUtils methods statically initializes
Layout. Layout has dependencies on other classes, which in
turn have dependencies on native methods that are not always
registered when the call takes place. Registration and DDM
handling are done in separate threads.
This is not a fix, merely a workaround until the race can
be resolved.
Bug:
18081539
Change-Id: If1bd3de6597bc93da381c8f86dacf40156449561
Chong Zhang [Fri, 6 Feb 2015 02:06:23 +0000 (02:06 +0000)]
Merge "reset col position to 1 on row PAC" into lmp-mr1-dev
Chong Zhang [Fri, 6 Feb 2015 00:46:06 +0000 (16:46 -0800)]
reset col position to 1 on row PAC
bug:
19284568
Change-Id: I7d439027ab6411bcd5c149580babee80dc5f9478
Alan Viverette [Fri, 6 Feb 2015 00:19:43 +0000 (00:19 +0000)]
Merge "Mutate scroll bar drawables" into lmp-mr1-dev
Alan Viverette [Thu, 5 Feb 2015 23:58:56 +0000 (15:58 -0800)]
Mutate scroll bar drawables
Bug:
19285726
Change-Id: I4bb596433c1fa1cc4e2fa53d0cdae992f9add858
Alan Viverette [Thu, 5 Feb 2015 22:06:35 +0000 (22:06 +0000)]
Merge "Update preference dialog padding to Material" into lmp-mr1-dev
Sanket Padawe [Thu, 5 Feb 2015 20:51:09 +0000 (20:51 +0000)]
Merge "Suppress phone number from logcat." into lmp-mr1-dev
John Spurlock [Thu, 5 Feb 2015 20:39:36 +0000 (20:39 +0000)]
am
ac7b9dd3: am
42d3b66f: am
e0852368: Fix a few typos in Parcel.java.
* commit '
ac7b9dd39f64118a2129c17cdc7b6c93e53e1c42':
Fix a few typos in Parcel.java.
Alan Viverette [Thu, 5 Feb 2015 20:35:07 +0000 (12:35 -0800)]
Update preference dialog padding to Material
Mostly copy/paste of the Holo with some padding fiddling to make the
EditText, which has baked-in padding, and TextView line up.
Bug:
19280124
Change-Id: I4a8ad7dcc1f1bd519f4d1c506984871a25a1db31
John Spurlock [Thu, 5 Feb 2015 20:27:59 +0000 (20:27 +0000)]
am
42d3b66f: am
e0852368: Fix a few typos in Parcel.java.
* commit '
42d3b66f48906e35244ffc9a45daae87021fc1a5':
Fix a few typos in Parcel.java.
John Spurlock [Thu, 5 Feb 2015 20:18:03 +0000 (20:18 +0000)]
am
e0852368: Fix a few typos in Parcel.java.
* commit '
e08523684d5414117f81debd4eb14bc8eb494c29':
Fix a few typos in Parcel.java.
Ruben Brunk [Thu, 5 Feb 2015 19:54:36 +0000 (19:54 +0000)]
Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev
Kenny Guy [Thu, 5 Feb 2015 19:48:38 +0000 (19:48 +0000)]
Fix mangled javadoc for setPermittedInputMethods.
Fix java doc for setPermittedInputMethods.
Bug:
19276777
Change-Id: Iecd670b35cd675ff9dd4654c9876697801eb20ac
Sanket Padawe [Thu, 5 Feb 2015 19:45:27 +0000 (11:45 -0800)]
Suppress phone number from logcat.
Bug:
19251204
Change-Id: I042bc3c0a89967eeae547b059f06cf05de005b25
Adam Lesinski [Thu, 5 Feb 2015 19:26:58 +0000 (19:26 +0000)]
Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev
Dianne Hackborn [Thu, 5 Feb 2015 19:24:15 +0000 (19:24 +0000)]
Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev
Jason Monk [Thu, 5 Feb 2015 19:19:42 +0000 (19:19 +0000)]
Merge "Ellipsize QS detail items when needed" into lmp-mr1-dev
Alan Viverette [Thu, 5 Feb 2015 19:16:57 +0000 (19:16 +0000)]
Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev
Adam Lesinski [Thu, 5 Feb 2015 19:11:03 +0000 (11:11 -0800)]
Make ArrayMap.EMPTY immutable
This is a regression from KitKat.
Bug:
19271657
Change-Id: I11b8e4dd50f6a8d2b15fef66b44aa2d72b1f0349
Alan Viverette [Thu, 5 Feb 2015 17:58:49 +0000 (09:58 -0800)]
Invalidate SubtitleView during setText()
Ensures that even if layout does not change, the view is redrawn.
Bug:
19277437
Change-Id: I078ee3176c2bac6c754a0e2f378f97370ecef76a
Jason Monk [Thu, 5 Feb 2015 16:54:58 +0000 (11:54 -0500)]
Ellipsize QS detail items when needed
Bug:
19262637
Change-Id: I395125a7c00e558e914aff9cf9c48a363435a9b2
Kenny Guy [Thu, 5 Feb 2015 12:34:43 +0000 (12:34 +0000)]
Merge "Only switch user if current user is being wiped" into lmp-mr1-dev
Ruben Brunk [Thu, 5 Feb 2015 01:26:17 +0000 (17:26 -0800)]
camera2: Make legacy error handling more robust.
- Relax internal timeout for JPEG captures in LEGACY mode.
- Make RequestThreadManager.quit() idempotent to avoid queuing
messages on a dead thread's handler.
- Catch RuntimeExceptions from other Camera1 API methods to
allow proper cleanup + release of Camera1 API client.
Bug:
19255187
Change-Id: I6cb08bb6b832b0d0df6ee6e8983c35de2df4a408
Alan Viverette [Thu, 5 Feb 2015 01:15:01 +0000 (17:15 -0800)]
Move layer-list to be top-level element in seek bar progress
There is a bug in <scale>, but this works around it for now. Removes
the previous fix, which broke the initial state due to the level not
propagating when the current drawable was swapped out.
Bug:
19269656
Change-Id: Ibe586ef4ea326a7ce7516ca42a369c5386c24359
Zhijun He [Thu, 5 Feb 2015 01:10:28 +0000 (01:10 +0000)]
Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev
Alan Viverette [Thu, 5 Feb 2015 00:47:16 +0000 (00:47 +0000)]
Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev
Alan Viverette [Thu, 5 Feb 2015 00:44:02 +0000 (16:44 -0800)]
Allow top-level drawable container in progressDrawable
Bug:
19269656
Change-Id: I82a49d1565f5c49320872f1489ce0f630ac85bd0
Alan Viverette [Thu, 5 Feb 2015 00:20:14 +0000 (00:20 +0000)]
Merge "Replace ic_clear with vector icon" into lmp-mr1-dev
George Mount [Wed, 4 Feb 2015 22:37:04 +0000 (14:37 -0800)]
Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
Bug
19254085
Change-Id: I22d4c4e3d1d754ab96741eb0e0290d1ecfc05552
John Spurlock [Wed, 4 Feb 2015 20:47:40 +0000 (15:47 -0500)]
Fix a few typos in Parcel.java.
Change-Id: Ic1674fc72f08a0f3536b4870a5ce7d14ee6fcc16
Alan Viverette [Wed, 4 Feb 2015 22:43:03 +0000 (14:43 -0800)]
Replace ic_clear with vector icon
Fixes the clear icon being really tiny.
Bug:
19248473
Change-Id: I2c87aa9e055d04d96fa6ccf458cfcc642a4d55ab
Zhijun He [Wed, 4 Feb 2015 21:55:14 +0000 (13:55 -0800)]
Camera2: relax the EV compensation requirements
FULL and LIMITED is allowed to advertise [0,0], which indicates that the
exposure compensation is not supported.
Bug:
19219128
Change-Id: I6020a771201d754351f76617f68c06363fac78e8
Christopher Tate [Wed, 4 Feb 2015 21:48:29 +0000 (13:48 -0800)]
Always re-establish kernel alarms when considering new alarm set
As a backstop against missed alarm delivery / wakeups or clock slew,
make sure to always schedule a kernel alarm for the next alarm events
of interest when we've reexamined the set of deliverable alarms.
Bug
19201933
Change-Id: I3cd37a63dfb0c8258941497d4ba516ed00e2edad
Kenny Guy [Wed, 4 Feb 2015 17:55:42 +0000 (17:55 +0000)]
Only switch user if current user is being wiped
Only try and switch to owner if the current user
is being removed.
Bug:
19252449
Change-Id: I0143d87360db0834876821cbf52fec4933ecbd35
Wonsik Kim [Tue, 3 Feb 2015 23:39:57 +0000 (23:39 +0000)]
Merge "audio: allow audio port cache update even when audio patches contain invalidated sources/sinks" into lmp-mr1-dev
Lajos Molnar [Tue, 3 Feb 2015 22:55:21 +0000 (14:55 -0800)]
camera2: limit flexYUV array size in DngCreator
corrected overread
Bug:
19211135
Change-Id: I373b84dd9e2dc6219a305bf2d0308119668fab2a
Paul Jensen [Tue, 3 Feb 2015 21:08:58 +0000 (21:08 +0000)]
Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev
Paul Jensen [Mon, 2 Feb 2015 16:03:03 +0000 (11:03 -0500)]
Facilitate network validation on networks with a per-network PAC.
On networks with a per-network PAC, Network.openConnection(URL) will
fetch using NO_PROXY. This will fail on networks where Internet
access is only permitted via the proxy. Always failing network
validation has the potential to disable WiFi auto-join. Instead
of performing the normal connectivity check, instead attempt to
fetch the PAC, as this is meant to succeed with NO_PROXY.
bug:
19143573
Change-Id: Ia482f5c046d338c27daf42571f20851dfa36671c
Svetoslav [Sat, 31 Jan 2015 04:28:41 +0000 (20:28 -0800)]
Fix broken activation of the selected view in accessibility mode.
We were using an approximation to determine where to send a pair of down
and up events to click on the view that has accessibility focus. We were
doing reverse computation to figuring out which portion of the view is
not covered by interactive views and get a point in this region. However,
determining whether a view is interactive is not feasible in general since
for example may override onTouchEvent. This results in views not being
activated or which is worse wrong views being activated.
This change swithes to a new approach to activate views in accessibility
mode which is guaranteed to always work except the very rare case of a
view that overrides dispatchTouchEvent (which developers shouldn't be
doing). The new approach is to flag the down and up events pair sent
by the touch explorer as targeting the accessibility focused view. Such
events are dispatched such that views predecessors of the accessibility
focus do not handle them guaranteeing that these events reach the accessibiliy
focused view. Once the accessibiliy focused view gets such an event it clears
the flag and the event is dispatched following the normal event dispatch
semantics.
The new approach is semantically equivalent to requesting the view to perform
a click accessiblitiy action but is more generic as it is not affected by
views not implementing click action support correctly.
bug:
18986806
bug:
18889611
Change-Id: Id4b7b886c9fd34f7eb11e606636d8e3bab122869
Joe Fernandez [Mon, 2 Feb 2015 19:24:38 +0000 (19:24 +0000)]
am
d14b6432: am
eba583e3: docs: February 2015 Dashboard updates
automerge:
c6ca860
* commit '
c6ca8600a4257b25d2ffd1ab6abe02089d06b3d7':
docs: February 2015 Dashboard updates
Jorim Jaggi [Mon, 2 Feb 2015 19:19:23 +0000 (19:19 +0000)]
Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev
Jorim Jaggi [Mon, 2 Feb 2015 13:45:39 +0000 (14:45 +0100)]
Send accessibility event when bouncer is shown
Bug:
18996476
Change-Id: I0e402aa198263807e3013c7fb151f28d049ea51a
Joe Fernandez [Mon, 2 Feb 2015 17:44:26 +0000 (17:44 +0000)]
am
d14b6432: am
eba583e3: docs: February 2015 Dashboard updates
* commit '
d14b64323ff92be9db804d66a1146693c27150a6':
docs: February 2015 Dashboard updates
Joe Fernandez [Mon, 2 Feb 2015 17:20:35 +0000 (17:20 +0000)]
am
eba583e3: docs: February 2015 Dashboard updates
* commit '
eba583e3930891f7a8a0e48a961a4a2471fc757c':
docs: February 2015 Dashboard updates
Joe Fernandez [Mon, 2 Feb 2015 16:48:42 +0000 (08:48 -0800)]
docs: February 2015 Dashboard updates
Change-Id: I1936395193ec4c382b2492f992149fa7a29c9282
Tyler Gunn [Mon, 2 Feb 2015 15:48:52 +0000 (15:48 +0000)]
Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev
Jon Larimer [Sat, 31 Jan 2015 05:19:19 +0000 (05:19 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation automerge:
5c9d0de automerge:
9e7e8af automerge:
27d099a
automerge:
4a82635
* commit '
4a826358e769e697ec329cf14edeb049981a11a9':
Jon Larimer [Sat, 31 Jan 2015 05:03:24 +0000 (05:03 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation automerge:
5c9d0de automerge:
9e7e8af
automerge:
27d099a
* commit '
27d099a7e128744b7a11ce09b469a3396e872d33':
Jon Larimer [Sat, 31 Jan 2015 03:39:19 +0000 (03:39 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation automerge:
5c9d0de
automerge:
9e7e8af
* commit '
9e7e8afbb934742cb7996b22e32f94c1c09704af':
Joe Fernandez [Sat, 31 Jan 2015 03:04:16 +0000 (03:04 +0000)]
am
1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge:
f02a8d9
automerge:
cacf7da
* commit '
cacf7da1c4d078641f099bab717e155609c5dc99':
docs: training intent doc error update
Deepanshu Gupta [Sat, 31 Jan 2015 03:02:42 +0000 (03:02 +0000)]
am
3d5535cf: Merge "Limited AppCompat support" into lmp-dev
automerge:
7789447
* commit '
7789447bd97c851b7a09623a417300590e5439d5':
Limited AppCompat support
Deepanshu Gupta [Sat, 31 Jan 2015 03:01:20 +0000 (03:01 +0000)]
am
1d59871e: Merge "Resource resolution fixes." into lmp-dev
automerge:
7e683bd
* commit '
7e683bdaddff77a24a36d420c5782b47795c5ccb':
Resource resolution fixes.
Joe Fernandez [Sat, 31 Jan 2015 02:50:57 +0000 (02:50 +0000)]
am
1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs
automerge:
f02a8d9
* commit '
f02a8d9ffcd2f14c069b23d588ff2083cc53062d':
docs: training intent doc error update
Joe Fernandez [Sat, 31 Jan 2015 01:59:54 +0000 (01:59 +0000)]
am
1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs
* commit '
1a9bf5c10049e99398a80b985e22ea1bfd737bcd':
docs: training intent doc error update
Wonsik Kim [Fri, 30 Jan 2015 08:48:51 +0000 (17:48 +0900)]
audio: allow audio port cache update even when audio patches contain invalidated sources/sinks
When an audio device disconnects from Android, custom audio patches
containing the device become invalidated.
AudioManager::updateAudioPortCache() used to fail in that case, but
it causes onAudioPortListUpdated() event never gets called so that
the creator of the custom audio patch cannot update it. Let
updateAudioPortCached() succeed even in the case so that the entity
that created the audio patch can get notified.
Bug:
18909299
Change-Id: If4f6ed73f69213d792117fb42aec103ae2e50b79
Joe Fernandez [Sat, 31 Jan 2015 01:00:15 +0000 (01:00 +0000)]
Merge "docs: training intent doc error update" into lmp-docs
Rich Slogar [Wed, 28 Jan 2015 23:22:24 +0000 (15:22 -0800)]
docs: training intent doc error update
b/
18386294
Change-Id: Id0fb07e567e0f698e786ac57a19c60895f4d6fc1
Deepanshu Gupta [Sat, 31 Jan 2015 00:54:10 +0000 (00:54 +0000)]
am
3d5535cf: Merge "Limited AppCompat support" into lmp-dev
* commit '
3d5535cfb7755c20619529649b025c4682013b85':
Limited AppCompat support
Deepanshu Gupta [Sat, 31 Jan 2015 00:54:07 +0000 (00:54 +0000)]
am
1d59871e: Merge "Resource resolution fixes." into lmp-dev
* commit '
1d59871e4e8a3a657dab3931d684706c45630a2f':
Resource resolution fixes.
Deepanshu Gupta [Sat, 31 Jan 2015 00:50:34 +0000 (00:50 +0000)]
Merge "Limited AppCompat support" into lmp-dev
Deepanshu Gupta [Sat, 31 Jan 2015 00:48:56 +0000 (00:48 +0000)]
Merge "Resource resolution fixes." into lmp-dev
Joe Fernandez [Sat, 31 Jan 2015 00:14:39 +0000 (00:14 +0000)]
am
5c37c8e6: am
d801a123: am
2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
* commit '
5c37c8e66227b15d471047e7c4c986cf3c67876a':
docs: studio emulator platform update
Jon Larimer [Sat, 31 Jan 2015 00:05:54 +0000 (00:05 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
automerge:
5c9d0de
* commit '
5c9d0de174caf151937f19aa6898f60bce3fb4f4':
Fix build breakage in older branches by avoiding <> notation
Joe Fernandez [Fri, 30 Jan 2015 23:41:10 +0000 (23:41 +0000)]
am
d801a123: am
2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
* commit '
d801a1238392b8c7a8e0131cee89370143363046':
docs: studio emulator platform update
Joe Fernandez [Fri, 30 Jan 2015 23:34:44 +0000 (23:34 +0000)]
am
2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
* commit '
2b68ab3adda1ecce045b7b56b8c37ab4d960d2b4':
docs: studio emulator platform update
Joe Fernandez [Fri, 30 Jan 2015 23:24:43 +0000 (23:24 +0000)]
Merge "docs: studio emulator platform update" into lmp-docs
Jon Larimer [Fri, 30 Jan 2015 22:24:43 +0000 (22:24 +0000)]
am
feb362a5: am
a0d3bfbe: am
5c9d0de1: am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
feb362a5d194b30226caf2efbaae77991007c65c':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 22:18:34 +0000 (22:18 +0000)]
am
a0d3bfbe: am
5c9d0de1: am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
a0d3bfbe8736fd638621ae48371b6e4e237ed4b1':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 22:11:56 +0000 (22:11 +0000)]
am
5c9d0de1: am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
5c9d0de174caf151937f19aa6898f60bce3fb4f4':
Fix build breakage in older branches by avoiding <> notation
Stuart Scott [Fri, 30 Jan 2015 22:09:37 +0000 (22:09 +0000)]
Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev
Jon Larimer [Fri, 30 Jan 2015 22:01:50 +0000 (22:01 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
545dd853bffbf778a0a44816ac6ed381b13f2158':
Fix build breakage in older branches by avoiding <> notation
Jinsuk Kim [Fri, 30 Jan 2015 22:00:39 +0000 (22:00 +0000)]
Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev
Jinsuk Kim [Fri, 30 Jan 2015 21:58:18 +0000 (21:58 +0000)]
Revert "CEC: Let playback device switch TV input after bootup"
This reverts commit
8913a0e1e8559d96e82b1ff408dd312ed279021b.
Change-Id: Ibfabdd94206141274a69040e0ed90ba29aeae75b
Jon Larimer [Fri, 30 Jan 2015 21:54:31 +0000 (21:54 +0000)]
am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
9a425aa71c0ae6fb8c9c84d3e71321a44433d861':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 21:44:17 +0000 (21:44 +0000)]
am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
159aa73574804967aded45d06b70df5a8dd64a58':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 21:28:59 +0000 (21:28 +0000)]
am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
d403180997898c98f0be15b810c4c9dd9002f92c':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 19:30:57 +0000 (19:30 +0000)]
am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
48c95c4370533bf27e537cbca1e64d060a016c5f':
Fix build breakage in older branches by avoiding <> notation
Jason Monk [Fri, 30 Jan 2015 18:27:52 +0000 (18:27 +0000)]
Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev
Jason Monk [Fri, 30 Jan 2015 18:02:27 +0000 (13:02 -0500)]
Fix QS bluetooth tile accessibility issue
Bluetooth tile was not announcing its state when the top half was
clicked. This is because if handleUpdateState was triggered on
the view before it became dual then it would not get all of the dual
accessibility information. So if the dual state changes on a tile
make sure to call handleUpdateState so it can be handled appropriately.
Bug:
19155633
Change-Id: Ifd053c67d8ddd3230086517c9d479069556e8b56
Jason Monk [Fri, 30 Jan 2015 16:30:29 +0000 (11:30 -0500)]
Fix expandSettingsPanel status bar call
Use the same mechanism as the two finger gesture to get it to open
correctly.
Bug:
19196800
Change-Id: I952e14d3ccd796889ed54cb98c017542a25f28c9
Alan Viverette [Fri, 30 Jan 2015 03:15:06 +0000 (03:15 +0000)]
Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev
Legler Wu [Thu, 29 Jan 2015 07:07:39 +0000 (15:07 +0800)]
[DS] Correct the access method for telephony system property
Revise the method to access telephony system property.
Add several PROPERTY_XXX_XXX_MSIM for MSIM type system properties. If
caller use the old one, it will be dispatched to new one and get by
default phone id.
Ex. PROPERTY_ICC_OPERATOR_NUMERIC
Bug:
18675498
Change-Id: I008a7390fefbbcd9f6569f059d48eedf1da28de0
Christopher Ferris [Fri, 30 Jan 2015 02:29:26 +0000 (02:29 +0000)]
Merge "Fix wrap property creation when truncating." into lmp-mr1-dev
Rich Slogar [Fri, 30 Jan 2015 01:58:22 +0000 (01:58 +0000)]
am
f4fa2acb: am
6ccb72e6: am
e0063faa: Merge "docs: linux requirements update" into lmp-docs
* commit '
f4fa2acb22acdf2ddb536fd1e7e5b9df51d6a787':
docs: linux requirements update
Scott Rowe [Fri, 30 Jan 2015 01:53:53 +0000 (01:53 +0000)]
am
8f5714d3: am
a3031211: am
b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs
* commit '
8f5714d3e1f29c0ec761c3471a12d2f486bbaee3':
docs: Card View for Android TV training
Scott Rowe [Fri, 30 Jan 2015 01:53:48 +0000 (01:53 +0000)]
am
2d1c5dc8: am
e4249f29: am
87a1bf09: docs: b/
19193358 Android TV overscan instructions: settings reversed in text
* commit '
2d1c5dc8ef3dfa8e4eea25197b38b654d7e8cc9d':
docs: b/
19193358 Android TV overscan instructions: settings reversed in text
Rich Slogar [Fri, 30 Jan 2015 01:49:12 +0000 (01:49 +0000)]
am
6ccb72e6: am
e0063faa: Merge "docs: linux requirements update" into lmp-docs
* commit '
6ccb72e685da6769d43545c21182ca44e039da3e':
docs: linux requirements update
Scott Rowe [Fri, 30 Jan 2015 01:44:43 +0000 (01:44 +0000)]
am
a3031211: am
b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs
* commit '
a303121168f1e3cfe62f6836a38ba1a33f3e336d':
docs: Card View for Android TV training
Scott Rowe [Fri, 30 Jan 2015 01:44:39 +0000 (01:44 +0000)]
am
e4249f29: am
87a1bf09: docs: b/
19193358 Android TV overscan instructions: settings reversed in text
* commit '
e4249f29ea56f35aab1337323a0e55992ee9247f':
docs: b/
19193358 Android TV overscan instructions: settings reversed in text
Rich Slogar [Fri, 30 Jan 2015 01:41:58 +0000 (01:41 +0000)]
am
e0063faa: Merge "docs: linux requirements update" into lmp-docs
* commit '
e0063faa8707e2424a33625aaf2228540fa67e85':
docs: linux requirements update
Scott Rowe [Fri, 30 Jan 2015 01:37:23 +0000 (01:37 +0000)]
am
b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs
* commit '
b86c3b80db09da85b50c1809520bbf893cb83d93':
docs: Card View for Android TV training
Scott Rowe [Fri, 30 Jan 2015 01:37:21 +0000 (01:37 +0000)]
am
87a1bf09: docs: b/
19193358 Android TV overscan instructions: settings reversed in text
* commit '
87a1bf097078e43dc9e7c060daf8d835afd7bf6d':
docs: b/
19193358 Android TV overscan instructions: settings reversed in text
Rich Slogar [Fri, 30 Jan 2015 01:32:17 +0000 (01:32 +0000)]
Merge "docs: linux requirements update" into lmp-docs
Scott Rowe [Fri, 30 Jan 2015 01:30:43 +0000 (01:30 +0000)]
Merge "docs: Card View for Android TV training" into lmp-docs
Alan Viverette [Fri, 30 Jan 2015 01:21:21 +0000 (17:21 -0800)]
Avoid bug in LinearLayout measurement
Reverts to Holo-style layout where the View divider masks the bug.
Uses a 0-height divider to avoid visual changes.
Bug:
19201079
Change-Id: Ib9e701815c57b23d5ba7173f8de553e90e27ed11
Amit Mahajan [Fri, 30 Jan 2015 00:52:49 +0000 (00:52 +0000)]
Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen by user." into lmp-mr1-dev
Sailesh Nepal [Fri, 30 Jan 2015 00:31:11 +0000 (00:31 +0000)]
Merge "Fix crash when making emergency calls" into lmp-mr1-dev
Christopher Tate [Fri, 30 Jan 2015 00:06:17 +0000 (00:06 +0000)]
Merge "Don't run full-data backups when backup is disabled" into lmp-mr1-dev
OSDN Git Service
