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

153781 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
0761b1b5eb am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '89b196958fee07475765bd3c458098464ba16f2e':
  Put in real "code" (aka marketing) name.
 2014-10-09 00:14:54 +00:00
Jeff Brown
704998abba Merge "Ensure we correctly unblank displays when added." into lmp-dev 2014-10-09 00:14:40 +00:00
Deepanshu Gupta
985d59d7e3 am 908a4f9a: am 4f133894: Exclude KXmlParser from LayoutLib. 
* commit '908a4f9a4372a9627e821b5800936095b0f0b5b0':
  Exclude KXmlParser from LayoutLib.
 2014-10-09 00:14:31 +00:00
Jeff Sharkey
b01a5ba2b7 am 562262cc: Merge "Bring along more ApplicationInfo fields." into lmp-dev 
* commit '562262cc89838529316ff2f3e511c0d876b08677':
  Bring along more ApplicationInfo fields.
 2014-10-09 00:14:25 +00:00
Geoff Mendal
db5b94d405 am f121892b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'f121892bc8c73b06086f8ebc059dd86f680b5197':
  Import translations. DO NOT MERGE
 2014-10-09 00:13:25 +00:00
smain@google.com
b880707c7f am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below 
* commit '63cd4977fd72de401f347ba159a71fe3d04399b3':
  fix unclickable link due to overlay from offset dev below
 2014-10-09 00:10:06 +00:00
smain@google.com
63cd4977fd am 770c3c5e: fix unclickable link due to overlay from offset dev below 
* commit '770c3c5ed52f354fe04ced31aaa56ba57a028955':
  fix unclickable link due to overlay from offset dev below
 2014-10-09 00:04:57 +00:00
Tim Kilbourn
99e9095430 Don't start SearchDialog on television. 
Bug: 17654744
Change-Id: Ie76405d648b7ac34a70465e275315f9cf277a3fe
 2014-10-08 17:01:42 -07:00
smain@google.com
9f928944fa Merge "update droiddoc option to include api level 21 for javadoc tagging" into lmp-dev 2014-10-08 23:58:34 +00:00
smain@google.com
770c3c5ed5 fix unclickable link due to overlay from offset dev below 
Change-Id: I59bedd0e928d578a3bd030caa4add4cfa96db83f
 2014-10-08 16:54:21 -07:00
Christopher Tate
6dea8de709 Merge "Actually tell the widget service that restore is starting" into lmp-dev 2014-10-08 23:31:31 +00:00
smain@google.com
12c50e0ed0 update droiddoc option to include api level 21 for javadoc tagging 
Change-Id: Ifdb09267b0cdab4cd89aaea455de6270481ff230
 2014-10-08 16:23:34 -07:00
RoboErik
a78601dc19 Merge "Ensure metadata bundles are unparceled before making them available" into lmp-dev 2014-10-08 22:30:05 +00:00
Christopher Tate
c0a30bcfae Merge "Turn on dimension validation in wallpaper restore" into lmp-dev 2014-10-08 21:48:10 +00:00
Filip Gruszczynski
49e2371a27 Merge "Log exception when creating Activity in ActivityUnitTestCase." into lmp-sprout-dev 2014-10-08 21:12:25 +00:00
Georgi Nikolov
6eb0f4808d Merge "BUG 17887323: Need to turn off DEBUG log spam in Job Scheduler" into lmp-dev 2014-10-08 20:50:47 +00:00
Ye Wen
de73afe268 Merge "Make MmsServiceBroker more robust to MmsService crashes" into lmp-dev 2014-10-08 20:47:06 +00:00
Adam Lesinski
59d208ddc1 Merge "Remove UsageEvents#resetToStart() as it doesn't work" into lmp-dev 2014-10-08 20:34:55 +00:00
Ye Wen
724dbbd733 Make MmsServiceBroker more robust to MmsService crashes 
Retry connecting to MmsService when disconnected or upon each API call
if disconnected.

b/17862188

Change-Id: Iecfb0a6ffb59b94f6c1121bf00ba2db438ed7001
 2014-10-08 13:12:04 -07:00
Geoff Mendal
293b883c75 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-08 19:56:41 +00:00
Geoff Mendal
49c5ddd677 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-08 19:53:12 +00:00
Adam Lesinski
54e064bcea Remove UsageEvents#resetToStart() as it doesn't work 
After completely iterating over a UsageEvents object, the internal parcel
is recycled. If resetToStart is called then, it does nothing.

Bug:17909428
Change-Id: I7bc68d3429e4621a50dedbfc1789576d44dbb3be
 2014-10-08 12:33:16 -07:00
Christopher Tate
431906b34f Turn on dimension validation in wallpaper restore 
Bug 17906491

Change-Id: I4c76c3197df95b51a6e44d1fe2d522b6c05284e5
 2014-10-08 12:19:48 -07:00
Quddus Chong
8f25f390e5 am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. 
* commit '9df3d67bdc7c1fa79d0daab1f2ae5f69a476f8dd':
  docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
 2014-10-08 19:08:31 +00:00
Mike Lockwood
3910f53c5e Merge "bootanimation: Tweak parameters for pcm_open for playing boot sounds." into lmp-dev 2014-10-08 19:07:23 +00:00
Jeff Brown
0033a86c25 Ensure we correctly unblank displays when added. 
A previous change introduced a regression in the case where
a device has been added but is initially blanked.  Because
we made changes to defer certain work until we escape the
critical section when making changes to the global display
state, we forgot to apply these changes when displays are
initially added.

This causes problems with HDMI displays remaining blanked
after they are plugged in.

Added a quick fix to ensure we perform the work when adding
a display although we don't bother trying to defer it outside
of the critical section.

Bug: 17909838
Change-Id: If5373d20d8827b7f4330a8cf49f8de64ca3f0740
 2014-10-08 12:06:39 -07:00
Geoff Mendal
50053dbf28 Import translations. DO NOT MERGE 
Change-Id: I30dfc9ade88728eaa4ee1d1a9921c3f69d9e349b
Auto-generated-cl: translation import
 2014-10-08 12:05:39 -07:00
Geoff Mendal
3306875740 Import translations. DO NOT MERGE 
Change-Id: I38a6ea57b8a5cde20e80427bcb46caf0b1048d2c
Auto-generated-cl: translation import
 2014-10-08 11:53:40 -07:00
Georgi Nikolov
326f230ceb BUG 17887323: Need to turn off DEBUG log spam in Job Scheduler 
Change-Id: Ida7af915c5b616216692493434b63c521398dfb0
 2014-10-08 11:50:50 -07:00
Eino-Ville Talvala
ef773e3569 Merge changes Id09663d8,Ie88f3750 into lmp-dev 
* changes:
  Camera2: Docs cleanup, especially units and range
  camera2: Update docs only for legacy devices
 2014-10-08 18:48:31 +00:00
Eino-Ville Talvala
fd3e2892f2 Camera2: Docs cleanup, especially units and range 
- Add entries for units and range into javadoc
- Fix up existing units entries and add new ones
- Fix up range entries to be consistent for enums
- Add range entries where it makes sense
- Minor fix to javadoc gen to allow for code indentation
- Lots of edits for consistency, especially to
  available* entries.

Bug: 16525650

Change-Id: Id09663d897ec98122073e6e13719731ec0de4dad
 2014-10-08 11:28:59 -07:00
Joe Fernandez
e4ce2aa32d am a5119ae7: am 59c04ece: am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs 
* commit 'a5119ae776e10d023cae456a0bd5ca1c41e37910':
  docs: Wear UI Lib training fixes
 2014-10-08 18:16:41 +00:00
Dan Sandler
9eef874923 am 2200f86f: All (er, L) is finally revealed. 
* commit '2200f86f800876d005f911e6864708fa9772d03a':
  All (er, L) is finally revealed.
 2014-10-08 18:16:01 +00:00
Deepanshu Gupta
c4ad87539a am b8a20e68: am 11b14e39: (-s ours) LayoutLib: Use ICU\'s line break algo. [DO NOT MERGE] 
* commit 'b8a20e682d60b0cec3b9f5f6adb9a69e980a68ea':
  LayoutLib: Use ICU's line break algo. [DO NOT MERGE]
 2014-10-08 18:15:56 +00:00
Jon Eklund
cb13564554 am 318f0fe4: AudioService: Fix monitorRotation for landscape applications 
* commit '318f0fe43bdc4b2f6764edd91d6b78d9875ffdeb':
  AudioService: Fix monitorRotation for landscape applications
 2014-10-08 18:15:42 +00:00
Rich Slogar
033c759c2f am fdbbed60: am 916a6ea3: am 6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular-docs 
* commit 'fdbbed6090d47c5ebbf254dfda7a87ef154c8a2c':
  docs:64 bit image and skd update
 2014-10-08 18:15:33 +00:00
Jim Miller
af37450f41 am 52403d6f: Merge "Fix "Wrong password" message shown when using BT keyboard." into lmp-dev 
* commit '52403d6f8e9a0e31a0f880a9cd297aeb35c29c8e':
  Fix "Wrong password" message shown when using BT keyboard.
 2014-10-08 18:15:24 +00:00
Christopher Tate
6067d79807 Actually tell the widget service that restore is starting 
Before beginning a full-system restore we need to tell the widget service,
so that it can properly start remapping IDs from the ground state.

Bug 17869323

Change-Id: I152257563f5b52cae67244e936bc2c44ced7618d
 2014-10-08 18:14:02 +00:00
Svetoslav
3dd06d9005 Merge "Restored widget provider id not properly updated." into lmp-dev 2014-10-08 18:09:55 +00:00
Quddus Chong
9df3d67bdc am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. 
* commit '7f567e4a1c561f60c6d31f6709508f5ec5a6ba88':
  docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
 2014-10-08 18:01:05 +00:00
Dianne Hackborn
89b196958f Merge "Put in real "code" (aka marketing) name." into lmp-dev 2014-10-08 17:59:19 +00:00
Quddus Chong
7f567e4a1c docs: Changed date of GMS v6.1 (Manchego) release to October 2014. 
Change-Id: I710c0eab6913988d8bc70ded344a2d60fa594d92
 2014-10-08 10:51:21 -07:00
RoboErik
82df2c0839 Ensure metadata bundles are unparceled before making them available 
Bundles can't be read from multiple threads safely. This adds locking
around a read that had been previously overlooked and ensures that
unparcel is called on the metadata before it is even available to
other threads.

bug:17894033
Change-Id: I9a4b86a0d0af05b1dcba28a52df2e7a87c685704
 2014-10-08 10:41:12 -07:00
Deepanshu Gupta
908a4f9a43 am 4f133894: Exclude KXmlParser from LayoutLib. 
* commit '4f133894a6e98d8d30557ea42cec92cfb21fa5c9':
  Exclude KXmlParser from LayoutLib.
 2014-10-08 17:34:12 +00:00
Jeff Sharkey
562262cc89 Merge "Bring along more ApplicationInfo fields." into lmp-dev 2014-10-08 17:25:39 +00:00
Jeff Sharkey
7f1a57a3e7 Bring along more ApplicationInfo fields. 
When we added scan paths, we forgot to bring them along through
Parcel and copy constructor.

Bug: 17900178
Change-Id: I0ee9374f909d375768045976fd88cee7431f7d4d
 2014-10-08 10:14:53 -07:00
Deepanshu Gupta
4f133894a6 Exclude KXmlParser from LayoutLib. 
The class was incorrectly being included in the LayoutLib.

Change-Id: I3c86662efa068019fe9165f2fc49a00d0a1b7f2d
 2014-10-08 10:12:11 -07:00
Geoff Mendal
f121892bc8 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-08 16:18:16 +00:00
Geoff Mendal
e95638f5ec Import translations. DO NOT MERGE 
Change-Id: I2d79cf76ea811b54f906bf6d76d9887b804dcd4e
Auto-generated-cl: translation import
 2014-10-08 08:56:53 -07:00
Geoff Mendal
6c3a23ddad Import translations. DO NOT MERGE 
Change-Id: I94aa8de0fe7a191d0312dbbb9f2b583c7afbdade
Auto-generated-cl: translation import
 2014-10-08 08:31:15 -07:00