kmccormick
90bdbe8c99
am 30aee7fc: am feb1347b: Merge "Doc update: new reg error code + snippet" into lmp-docs
...
* commit '30aee7fccbbcbdd09ca9393636316813e222ba62':
Doc update: new reg error code + snippet
2014-11-13 22:29:45 +00:00
kmccormick
30aee7fccb
am feb1347b: Merge "Doc update: new reg error code + snippet" into lmp-docs
...
* commit 'feb1347b2b411be03c640e8d61bfc3b428932e31':
Doc update: new reg error code + snippet
2014-11-13 22:24:44 +00:00
kmccormick
feb1347b2b
Merge "Doc update: new reg error code + snippet" into lmp-docs
2014-11-13 22:21:03 +00:00
Jeff Sharkey
628d2606f7
Merge "Move ringtone redirection to MediaPlayer." into lmp-mr1-dev
2014-11-13 22:16:15 +00:00
Abhijith Shastry
fb8db1c84b
Merge "new sms/mms carrier app API" into lmp-mr1-dev
2014-11-13 22:15:46 +00:00
Alan Viverette
95b3144782
Make indeterminate progress alpha consistent with determinate
...
Both should match the default disabledAlpha for controls.
BUG: 15900514
Change-Id: Ie7c801bc208a14f14926d38b462f49d1f91b28d0
2014-11-13 14:04:32 -08:00
Jeff Sharkey
3b566b8470
Move ringtone redirection to MediaPlayer.
...
Way back in API 1 we defined Settings.System.DEFAULT_NOTIFICATION_URI
which redirects through SettingsProvider before finally ariving at
the real underlying ContentProvider, usually MediaStore.
With new SELinux rules, we're no longer allowing the system_server
to hold open FDs to shared storage devices, which causes these
proxied openFile() calls to fail.
To work around this, teach MediaPlayer to resolve the final ringtone
Uri without going through the system.
Bug: 18226181
Change-Id: I40c68617c952c0bb3e939e5084f5b68a35e31ae3
2014-11-13 13:52:41 -08:00
Yuncheol Heo
417a95685e
CEC: Fix a bug in HdmiPortInfo.createFromParcel().
...
- Added equals() for the testing.
Bug: 18376178
Change-Id: Icc7d5fe78b3132bf51754fc3bb0d5a40e0d3b20a
2014-11-14 06:43:31 +09:00
Geoff Mendal
aba61dc19d
am 85e5c196: (-s ours) am a81b1cad: (-s ours) am 4cc7bbc9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit '85e5c1968bf05c19307e5663c5b5afd062ca8753':
Import translations. DO NOT MERGE
2014-11-13 21:10:08 +00:00
Jeff Brown
5e94e19c1f
am c69191c1: am cb906677: am 24c1d664: Merge "Remove an unnecessary condition from previous change." into lmp-sprout-dev
...
* commit 'c69191c195819bdbefef151fd13bdbef03aab741':
Remove an unnecessary condition from previous change.
2014-11-13 21:10:02 +00:00
Jeff Brown
36ed887fa3
am 3415634c: am 72f1e3b9: am 1cbff0e3: Merge "Improve screen brightness boost behavior." into lmp-sprout-dev
...
* commit '3415634c2e8a8979291dd60b89f2985e31e5e2f4':
Improve screen brightness boost behavior.
2014-11-13 21:09:56 +00:00
Renato Mangini
70955365b7
am 46112fe1: am 7e582533: am ee291ca2: am 6f41522d: am c9fc837f: Add new samples to what\'s new page.
...
* commit '46112fe18b0fa9d8d9c330191184a5e1e1b914ec':
Add new samples to what's new page.
2014-11-13 21:09:51 +00:00
Geoff Mendal
85e5c1968b
am a81b1cad: (-s ours) am 4cc7bbc9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit 'a81b1cad2bc3c8eca7ae4046f79058daf02dc82c':
Import translations. DO NOT MERGE
2014-11-13 21:05:48 +00:00
Jeff Brown
c69191c195
am cb906677: am 24c1d664: Merge "Remove an unnecessary condition from previous change." into lmp-sprout-dev
...
* commit 'cb906677fc65fd1b43f6dc3b8e029711ec8e86dc':
Remove an unnecessary condition from previous change.
2014-11-13 21:05:37 +00:00
Jeff Brown
3415634c2e
am 72f1e3b9: am 1cbff0e3: Merge "Improve screen brightness boost behavior." into lmp-sprout-dev
...
* commit '72f1e3b9c9992bfc3449c5441bc8e50e7b05f083':
Improve screen brightness boost behavior.
2014-11-13 21:05:31 +00:00
Renato Mangini
46112fe18b
am 7e582533: am ee291ca2: am 6f41522d: am c9fc837f: Add new samples to what\'s new page.
...
* commit '7e582533f37eb11c0036ade8bd221bf518e38471':
Add new samples to what's new page.
2014-11-13 21:05:26 +00:00
Alan Viverette
df68999dc7
Don't dismiss AutoCompleteTextView on focus change while temp detached
...
This is consistent with how TextView handles focus changes while
temporarily detached and prevents the suggestion popup from being
dismissed during layout when the AutoCompleteTextView is used
within a ListView.
BUG: 18364277
Change-Id: I8ca6fb9dba63b49a84a60a606bc441446c083cee
2014-11-13 12:59:37 -08:00
Geoff Mendal
a81b1cad2b
am 4cc7bbc9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit '4cc7bbc9fd937c6f25962fd6971e77773114aff2':
Import translations. DO NOT MERGE
2014-11-13 20:58:23 +00:00
Jeff Brown
cb906677fc
am 24c1d664: Merge "Remove an unnecessary condition from previous change." into lmp-sprout-dev
...
* commit '24c1d664c4f95a8c997bfc4683844e05b788c3db':
Remove an unnecessary condition from previous change.
2014-11-13 20:58:19 +00:00
Jeff Brown
72f1e3b9c9
am 1cbff0e3: Merge "Improve screen brightness boost behavior." into lmp-sprout-dev
...
* commit '1cbff0e310b0fba6b25ca1c1e14eaefeabdee0d9':
Improve screen brightness boost behavior.
2014-11-13 20:58:15 +00:00
Renato Mangini
7e582533f3
am ee291ca2: am 6f41522d: am c9fc837f: Add new samples to what\'s new page.
...
* commit 'ee291ca2ce4092aaae556ebda46daf7337506f74':
Add new samples to what's new page.
2014-11-13 20:58:03 +00:00
ztenghui
5e7a29f677
Fix the starting pen's position when a path close.
...
We have to cache the starting point for the latest "move", then apply it after
we close the path.
b/18214929
Change-Id: I8e8e5c810d720a1c194b8f59d74867a0efbb7662
2014-11-13 12:55:16 -08:00
Zoltan Szatmary-Ban
26ac6a6fd0
Shutdown backup manager service when device owner is set
...
Bug: 16641441
Change-Id: I3fe54e43324c15dabd56834a923e8e8cb4eea98d
2014-11-13 20:49:43 +00:00
Raph Levien
44cb2432e9
Fudge clipRect in TextView for extra cursor width
...
There are a number of cases (most commonly cursor at start of line in
RTL direction) where the cursor extends past the right edge of the
clipRect. This patch adds approximately 1dp on the right side of the
clip, so that the cursor doesn't get clipped.
Bug: 18035274
Change-Id: I489825a91750742c28e445f54f9d27000accbcfb
2014-11-13 12:48:40 -08:00
John Spurlock
eba075e5db
am 338bc5a4: Merge "Zen: Update condition text for current condition." into lmp-mr1-dev
...
automerge: 1a68ba6
* commit '1a68ba6b85473565de174f72beeb7734e49e0fa0':
Zen: Update condition text for current condition.
2014-11-13 20:39:04 +00:00
Jeff Sharkey
1eac0a0105
am 51151dcc: Merge "Make package verifier broadcasts foreground." into lmp-mr1-dev
...
automerge: 3f8b53c
* commit '3f8b53cc6282ba01bdb2b438ef6ce7a1f78792e2':
Make package verifier broadcasts foreground.
2014-11-13 20:37:48 +00:00
John Spurlock
c8117e3151
QS: Update detail item keyline.
...
The keylines have changed, the item detail text should align
with the default notification template.
Change-Id: I098c9b7831f1e8eda3e5567edba58e6c19a6ca2f
2014-11-13 15:36:16 -05:00
Jeff Sharkey
22510ef274
Fix NPE in DropBoxManagerService.dump()
...
Bug: 18374803
Change-Id: Id1f66a0887d1584f97b127e837a4fad31f7d9d57
2014-11-13 12:28:46 -08:00
John Spurlock
1a68ba6b85
am 338bc5a4: Merge "Zen: Update condition text for current condition." into lmp-mr1-dev
...
* commit '338bc5a41854d40dfb35ec2865024d3b2737a864':
Zen: Update condition text for current condition.
2014-11-13 20:26:11 +00:00
Jeff Sharkey
3f8b53cc62
am 51151dcc: Merge "Make package verifier broadcasts foreground." into lmp-mr1-dev
...
* commit '51151dcc9498232452e69e945ce6322ef8a77d44':
Make package verifier broadcasts foreground.
2014-11-13 20:21:56 +00:00
John Spurlock
338bc5a418
Merge "Zen: Update condition text for current condition." into lmp-mr1-dev
2014-11-13 20:20:25 +00:00
Jeff Sharkey
51151dcc94
Merge "Make package verifier broadcasts foreground." into lmp-mr1-dev
2014-11-13 20:17:32 +00:00
Jeff Sharkey
13cf7917af
Make package verifier broadcasts foreground.
...
We're using ordered broadcasts (sigh!) for package verification, and
we could be stuck behind dozens of other background broadcasts, so
hoist into foreground queue.
Bug: 18356768
Change-Id: Ib4abf771db0147f8fbd7227f32297602816c84ae
2014-11-13 12:14:30 -08:00
Yin-Chia Yeh
7144b5d2cf
Camera: doc update for independent 3A
...
Bug: 18281970
Change-Id: I12f8b4fcbabe473b076464eaf9b7617a5ec586d3
2014-11-13 11:52:45 -08:00
Simranjit Singh Kohli
adc62efba6
am 91b5550e: am fdcdb742: Merge "[RemoveAccount API]: Adding support for intent." into lmp-mr1-dev
...
* commit '91b5550ee724bf0e41149decd55fd9ca2a3b3797':
[RemoveAccount API]: Adding support for intent.
2014-11-13 19:32:47 +00:00
Wale Ogunwale
442175076f
am 21f16a47: am 28d3c245: Merge "Cancel or drop key events if activity is stopped." into lmp-mr1-dev
...
* commit '21f16a475d0a212f9d3fb36659de5a59c2f80484':
Cancel or drop key events if activity is stopped.
2014-11-13 19:26:57 +00:00
Simranjit Singh Kohli
91b5550ee7
am fdcdb742: Merge "[RemoveAccount API]: Adding support for intent." into lmp-mr1-dev
...
* commit 'fdcdb7429e3f150818e8df561a62328444b102c5':
[RemoveAccount API]: Adding support for intent.
2014-11-13 19:24:10 +00:00
Simranjit Singh Kohli
fdcdb7429e
Merge "[RemoveAccount API]: Adding support for intent." into lmp-mr1-dev
2014-11-13 19:18:30 +00:00
Wale Ogunwale
21f16a475d
am 28d3c245: Merge "Cancel or drop key events if activity is stopped." into lmp-mr1-dev
...
* commit '28d3c245a1dde4aa5294192bec9980d8a93b0489':
Cancel or drop key events if activity is stopped.
2014-11-13 19:07:19 +00:00
Yabin Cui
d493fa6d79
am 537888be: Merge "kill HAVE_LOCALTIME_R"
...
* commit '537888be7d5cfa6bfa9ddd459a622ea208339735':
kill HAVE_LOCALTIME_R
2014-11-13 19:05:06 +00:00
Jean-Michel Trivi
3c922dd7f2
am 84c803f8: am 136f5415: Merge "Support for delayed audio focus" into lmp-mr1-dev
...
* commit '84c803f85db1117e1a31e74aa46f9089a3b54cf5':
Support for delayed audio focus
2014-11-13 19:03:43 +00:00
Adam Powell
31de5dbe1e
am e2820ed9: am 87bc2acf: Merge "Optimize setting padding and backgrounds for views" into lmp-mr1-dev
...
* commit 'e2820ed9636368884b09347ce49658757b696b71':
Optimize setting padding and backgrounds for views
2014-11-13 19:03:37 +00:00
Wale Ogunwale
28d3c245a1
Merge "Cancel or drop key events if activity is stopped." into lmp-mr1-dev
2014-11-13 19:00:07 +00:00
Jean-Michel Trivi
84c803f85d
am 136f5415: Merge "Support for delayed audio focus" into lmp-mr1-dev
...
* commit '136f54153e412485feae39cf3fe86392f01a2bd6':
Support for delayed audio focus
2014-11-13 18:57:49 +00:00
Adam Powell
e2820ed963
am 87bc2acf: Merge "Optimize setting padding and backgrounds for views" into lmp-mr1-dev
...
* commit '87bc2acfd3e874ff94fd3da948c329d2547a2bfc':
Optimize setting padding and backgrounds for views
2014-11-13 18:57:43 +00:00
Alan Viverette
4612740ddc
Implement Material-style delegate for CalendarView
...
BUG: 18266649
Change-Id: Ifd749328754b82dc43259ca7dadb472e449bdfff
2014-11-13 10:50:37 -08:00
Jean-Michel Trivi
136f54153e
Merge "Support for delayed audio focus" into lmp-mr1-dev
2014-11-13 18:47:34 +00:00
Alan Viverette
827015edb3
Prevent NPE when computing FastScroller position with no visible items
...
BUG: 18371212
Change-Id: I90b1f540cdc6095e18242b879c50e8060de662ee
2014-11-13 10:26:53 -08:00
Sander Alewijnse
8c41156178
Add extra to enable device admins to skip removal of system apps.
...
Bug:17369849
Change-Id: Ibc1c0f480c436c7075725f79ffaaf92832c1154a
2014-11-13 18:16:28 +00:00
Jon Eklund
283a9d9e15
AudioRecorder read buffer overflow
...
Since function was changed from byte-native to short-native,
it's no longer necessary to multiply offset by sizeof(short).
Bug 18367580
Change-Id: I669d860334ba40e46c04e534d7008b9e2401d8cd
2014-11-13 10:15:58 -08:00