Dirk Dougherty
5da502a5b2
am b9378d81: am 321cd18a: am 820bb4bd: am 9c50271d: am 257f6724: am 35cb4e49: Doc change: add new samples TOC groups and landing pages.
...
* commit 'b9378d8108555c920880d7ec7ec4122b04fb2960':
Doc change: add new samples TOC groups and landing pages.
2014-02-13 11:27:30 +00:00
Jean Chalard
84a3320507
Fix a crash where user data was not validated.
...
ExtractedText#partialStartOffset and #partialEndOffset are
from the app, that sets it as it sees fit. We need to
validate them so that we don't crash.
Still emit a warning if this is the case, as this is
not expected.
Bug: 9570771
Change-Id: Id9d6babd1620da39bf0e454b14d7ce716bd9d9d3
2014-02-13 19:14:24 +09:00
Wink Saville
396b9e792f
am 27bf55c8: am 16c0b295: am bba3a694: Merge "Telephony API extension v2"
...
* commit '27bf55c8159e7f883ddc839453d5a12374ddc50a':
Telephony API extension v2
2014-02-13 08:49:13 +00:00
Wink Saville
27bf55c815
am 16c0b295: am bba3a694: Merge "Telephony API extension v2"
...
* commit '16c0b295ef069e128a4e01fd2f72da06784950a1':
Telephony API extension v2
2014-02-13 08:44:55 +00:00
Baligh Uddin
35fbb9f9e5
Merge "Import translations. DO NOT MERGE"
2014-02-13 05:14:35 +00:00
Baligh Uddin
bc95e990bd
Merge "Import translations. DO NOT MERGE"
2014-02-13 05:14:33 +00:00
Wink Saville
16c0b295ef
am bba3a694: Merge "Telephony API extension v2"
...
* commit 'bba3a694b8400fd340c0400bf42ef3d79a4285b1':
Telephony API extension v2
2014-02-12 20:29:01 -08:00
Wink Saville
bba3a694b8
Merge "Telephony API extension v2"
2014-02-13 04:26:33 +00:00
Dirk Dougherty
b9378d8108
am 321cd18a: am 820bb4bd: am 9c50271d: am 257f6724: am 35cb4e49: Doc change: add new samples TOC groups and landing pages.
...
* commit '321cd18ab21966383d75ba1e9c09b0adf932383b':
Doc change: add new samples TOC groups and landing pages.
2014-02-13 03:57:19 +00:00
Dirk Dougherty
321cd18ab2
am 820bb4bd: am 9c50271d: am 257f6724: am 35cb4e49: Doc change: add new samples TOC groups and landing pages.
...
* commit '820bb4bdd358bfaac446b8ce4af5474dcfc77613':
Doc change: add new samples TOC groups and landing pages.
2014-02-13 03:53:48 +00:00
Dirk Dougherty
820bb4bdd3
am 9c50271d: am 257f6724: am 35cb4e49: Doc change: add new samples TOC groups and landing pages.
...
* commit '9c50271dc34e48d527db7da85c3b3474574faee2':
Doc change: add new samples TOC groups and landing pages.
2014-02-13 03:50:08 +00:00
Dirk Dougherty
9c50271dc3
am 257f6724: am 35cb4e49: Doc change: add new samples TOC groups and landing pages.
...
* commit '257f67249afb017c9a3d0a79e545da567aa5bd02':
Doc change: add new samples TOC groups and landing pages.
2014-02-13 03:47:02 +00:00
Dirk Dougherty
257f67249a
am 35cb4e49: Doc change: add new samples TOC groups and landing pages.
...
* commit '35cb4e49365a8a8da0607c2659399aaad9ea5a1c':
Doc change: add new samples TOC groups and landing pages.
2014-02-13 03:44:38 +00:00
Dirk Dougherty
35cb4e4936
Doc change: add new samples TOC groups and landing pages.
...
Change-Id: I2f39e82fb79d4f19362d9fe2deafdde5d87873a7
2014-02-12 19:38:51 -08:00
Craig Mautner
1c5010a566
am f24ee132: am d3df99c4: am 4b79f838: Merge "Add debug for 12987986." into klp-modular-dev
...
* commit 'f24ee13254b544b7e73ea1b28facc1996b8185ab':
Add debug for 12987986.
2014-02-13 03:34:56 +00:00
Dirk Dougherty
a97e177857
Merge commit '47d3eaf6' into manualmerge
...
Conflicts:
docs/html/design/patterns/accessibility.jd
docs/html/design/patterns/actionbar.jd
docs/html/design/patterns/compatibility.jd
docs/html/design/patterns/multi-pane-layouts.jd
docs/html/design/style/iconography.jd
Change-Id: I349cf8ebc159c0a7ef0796900e2d11fe6e0c888a
2014-02-12 19:31:15 -08:00
Guang Zhu
32569caa6a
reduce error logs from disconnected AccessibilityNodeInfo's
...
ChromeView generates a large amount of such logs; while the real
root cause is being fixed, reduce the verbosity so other
interesting logs won't get overwritten.
Bug: 10871032
Change-Id: If42116671062d7b2cc2a13384424575da499c493
2014-02-12 17:27:15 -08:00
Joe Fernandez
c462073b24
am 8853b9c4: am 577570f2: am e5dc0c39: am 5b97ec6f: am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
...
* commit '8853b9c4b478df6ac8286d3dc825aa821f375afa':
MediaRouter Developer Guide
2014-02-13 01:11:51 +00:00
Nick Kralevich
edb03c7d6d
am 4f2d02fb: am 20b5fd98: am 93994e9d: am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
...
* commit '4f2d02fb0073c4129957c0d2ac6e0c0055f4dad8':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
2014-02-13 01:11:47 +00:00
Dave Platt
2c7c0a8527
am 5137fa03: am 34cc9f90: am 53c7608a: am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"
...
* commit '5137fa03c3e416c6f68c36f3ec922621853609b1':
Finish fixing Zygote descriptor leakage problem
2014-02-13 01:11:41 +00:00
Michael Wright
111d6fef3a
Merge changes I8f4249da,I012bd99f
...
* changes:
Extract automatic brightness strategy
New ambient light level filtering for automatic brightness
2014-02-13 00:46:59 +00:00
Michael Wright
639c8becc6
Extract automatic brightness strategy
...
Pull the strategy for determining the automatic brightness levels
into its own class. This cleans up DisplayPowerController a bit and
lets us experiment with different automatic brightness strategies
more easily.
Change-Id: I8f4249da511e38f63260dbef81f97f5507aac948
2014-02-12 16:44:37 -08:00
Adam Powell
c1d388fa0a
Merge "Point to the correct voice search icons in themes"
2014-02-13 00:43:26 +00:00
Alan Viverette
76769ae02e
Add selection properties to CollectionInfo, CollectionItemInfo
...
BUG: 12552541
Change-Id: Iae10abc02eeffea7c7fcb25020b343181e1e3482
2014-02-12 16:38:10 -08:00
ztenghui
b67ca78d97
Merge "Fix one flag setting bug"
2014-02-13 00:16:37 +00:00
Craig Mautner
f24ee13254
am d3df99c4: am 4b79f838: Merge "Add debug for 12987986." into klp-modular-dev
...
* commit 'd3df99c474b8e267cead8382912b083b6f6ebe3d':
Add debug for 12987986.
2014-02-13 00:13:10 +00:00
Dirk Dougherty
47d3eaf6b1
am 958a7f72: am 35ad8886: am acec746b: am 55362018: am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs
...
* commit '958a7f725d9d01415fe33ed2ec35eec72a6d66e3':
Doc change: minor edits to support easier extraction of document summaries.
2014-02-13 00:13:06 +00:00
Joe Fernandez
8853b9c4b4
am 577570f2: am e5dc0c39: am 5b97ec6f: am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
...
* commit '577570f29919da32e2b616dbab1e52fadabcb315':
MediaRouter Developer Guide
2014-02-13 00:13:02 +00:00
Nick Kralevich
4f2d02fb00
am 20b5fd98: am 93994e9d: am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
...
* commit '20b5fd98fb9c80ed29d57d67eb706a36b02708da':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
2014-02-13 00:12:55 +00:00
Dave Platt
5137fa03c3
am 34cc9f90: am 53c7608a: am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"
...
* commit '34cc9f9056e8736143e82891ccd01a85106a4518':
Finish fixing Zygote descriptor leakage problem
2014-02-13 00:12:50 +00:00
Alan Viverette
71c6ca2a75
Merge "Update smoothScrollToPosition to move faster for large offsets"
2014-02-12 23:51:56 +00:00
Alan Viverette
5aa944d998
Merge "Fix RelativeLayout measurement"
2014-02-12 23:51:11 +00:00
Michael Wright
41a5cdf986
New ambient light level filtering for automatic brightness
...
This new filtering method maintains a ring buffer of all light sensor
measurements within the last ten seconds. Once all of the
measurements are either above the brightening threshold or below the
darkening threshold, adjust the screen brightness to the average of
the recorded measurements.
Change-Id: I012bd99f86149e02f03b05f19722aef9a07aba31
2014-02-12 15:50:54 -08:00
Alan Viverette
d5694f02d5
Fix RelativeLayout measurement
...
BUG: 12993953
Change-Id: Idf82734eb9a06ea7610e8eb42705da9f4a4639e9
2014-02-12 15:49:18 -08:00
Craig Mautner
d3df99c474
am 4b79f838: Merge "Add debug for 12987986." into klp-modular-dev
...
* commit '4b79f8380c47b0da89348e1115ea70e7898997ca':
Add debug for 12987986.
2014-02-12 23:48:15 +00:00
Craig Mautner
4b79f8380c
Merge "Add debug for 12987986." into klp-modular-dev
2014-02-12 23:44:56 +00:00
Dirk Dougherty
958a7f725d
am 35ad8886: am acec746b: am 55362018: am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs
...
* commit '35ad8886f230d4bde4ea4cb2df9f07cf213c7cd1':
Doc change: minor edits to support easier extraction of document summaries.
2014-02-12 23:43:56 +00:00
Craig Mautner
1646832219
Add debug for 12987986.
...
For bug 12987986.
Change-Id: Idc122ba369ad7566e3fee290955bf91b0f610ae1
2014-02-12 15:43:40 -08:00
Dirk Dougherty
35ad8886f2
am acec746b: am 55362018: am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs
...
* commit 'acec746b8963410d4a9324df46272ac91f846868':
Doc change: minor edits to support easier extraction of document summaries.
2014-02-12 23:37:57 +00:00
Dirk Dougherty
acec746b89
am 55362018: am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs
...
* commit '55362018c9dfadff5eb1a138a1d90187110c253e':
Doc change: minor edits to support easier extraction of document summaries.
2014-02-12 23:34:35 +00:00
Joe Fernandez
577570f299
am e5dc0c39: am 5b97ec6f: am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
...
* commit 'e5dc0c39912d6e1392e1a3324ad210e65c0105c8':
MediaRouter Developer Guide
2014-02-12 23:33:43 +00:00
Dirk Dougherty
55362018c9
am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs
...
* commit '271c8f12c88e87563ed17f4ad29610037bd300be':
Doc change: minor edits to support easier extraction of document summaries.
2014-02-12 23:30:19 +00:00
Joe Fernandez
e5dc0c3991
am 5b97ec6f: am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
...
* commit '5b97ec6fa0e166113aad2abc1107e6bd3771cc2a':
MediaRouter Developer Guide
2014-02-12 23:29:38 +00:00
John Spurlock
3024f10224
Merge "Remove unused output array in QuickSettingsModel."
2014-02-12 23:21:16 +00:00
Dirk Dougherty
271c8f12c8
Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs
2014-02-12 23:20:41 +00:00
Joe Fernandez
5b97ec6fa0
am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
...
* commit '3885b00ae12df9f56e922ceda12326e922be1414':
MediaRouter Developer Guide
2014-02-12 23:19:10 +00:00
Nick Kralevich
20b5fd98fb
am 93994e9d: am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
...
* commit '93994e9db44a30402bd596764163d81ee1b1fd30':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
2014-02-12 23:19:05 +00:00
Joe Fernandez
3885b00ae1
am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
...
* commit 'f25bc75f591fbb04733b9cc33fabee2293973b8c':
MediaRouter Developer Guide
2014-02-12 23:15:50 +00:00
Joe Fernandez
f25bc75f59
Merge "MediaRouter Developer Guide" into klp-docs
2014-02-12 23:13:01 +00:00
Nick Kralevich
93994e9db4
am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
...
* commit 'a9bb594da6aff97ba927ba67a34486d0b9c1b4a0':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
2014-02-12 15:12:08 -08:00