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

115358 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
4dcf23b6f5 am 64fedb77: add new video button to some pages 
* commit '64fedb7725f082ce6bde94c3599d2e7c203ae077':
  add new video button to some pages
 2013-11-20 20:39:15 +00:00
Scott Main
64fedb7725 add new video button to some pages 
Change-Id: Ie1f1875d041ff662aee709cd5f7d3110e438d0d5
 2013-11-20 12:34:43 -08:00
Baligh Uddin
521b85f4e6 am 853251e7: (-s ours) Import translations. DO NOT MERGE 
* commit '853251e74f3e603f3431a3317b4d27ee042a4eb1':
  Import translations. DO NOT MERGE
 2013-11-20 09:37:51 -08:00
Baligh Uddin
853251e74f Import translations. DO NOT MERGE 
Change-Id: I0e8d6e841629716aecaea4bc1f326c1c2cba95c4
Auto-generated-cl: translation import
 2013-11-20 09:17:20 -08:00
Dirk Dougherty
a9a39d6ca2 am acca12fa: Merge "Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs." into klp-docs 
* commit 'acca12faea5fc1c9de63fdc08ae4d6bc0bad864a':
  Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs.
 2013-11-20 02:16:21 +00:00
Dirk Dougherty
acca12faea Merge "Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs." into klp-docs 2013-11-20 02:13:48 +00:00
Dirk Dougherty
5f0462a4f5 Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs. 
Change-Id: Ia75712323563cf56f0224822cb7977f3421f8527
 2013-11-19 17:55:49 -08:00
Katie McCormick
26574688b6 am 39711934: Merge "Doc update: redo of new API Console steps." into klp-docs 
* commit '39711934023b088887a08d833674170938f82a7d':
  Doc update: redo of new API Console steps.
 2013-11-20 01:10:37 +00:00
Katie McCormick
3971193402 Merge "Doc update: redo of new API Console steps." into klp-docs 2013-11-20 01:07:56 +00:00
Katie McCormick
6b372626e9 Doc update: redo of new API Console steps. 
Fixes for:

b/11713745
b/11712882
b/10669388
b/10641901

Change-Id: I071eba31d51f0e29b9be4a7f7ede0f01c7a52838
 2013-11-19 16:17:17 -08:00
Christopher Tate
e370534267 am b0183f0a: Harden against transiently unavailable backup transports 
* commit 'b0183f0ae311966cff0e10e8139c56f97288d1f2':
  Harden against transiently unavailable backup transports
 2013-11-19 11:46:48 -08:00
Christopher Tate
b0183f0ae3 Harden against transiently unavailable backup transports 
The init & clear operations are particularly important to ensure
delivery when at all possible, so we retry those periodically
if the transport is unavailable when we first attempt them.

Now with 100% less build break.

Bug 11716868

Change-Id: I2af4e93788068cfac97c0a48d3568c561eefa23d
 2013-11-19 11:24:46 -08:00
Joe Fernandez
dcf78a0541 am de4a8d85: Merge "Systrace doc updates" into klp-docs 
* commit 'de4a8d851b18ac032f044fa39e5db2529dd33911':
  Systrace doc updates
 2013-11-19 19:12:24 +00:00
Joe Fernandez
de4a8d851b Merge "Systrace doc updates" into klp-docs 2013-11-19 19:09:05 +00:00
Joe Fernandez
25ef208d7c Systrace doc updates 
Update to reflect new user interface and command line options
in Android 4.3+. Also add section on using application-level
tracing.

Fixes for bugs:
b/7306847
b/10113361
b/9425766
b/7306847
b/9262485

Change-Id: Ia1c2a54fa2edc12cd68da27055aebe7ec47df745
 2013-11-19 10:48:39 -08:00
Dave Langemak
d220d8202e am c04aa87e: Merge "Fix incorrent page range parsing when custom print options used." into klp-dev 
* commit 'c04aa87e4ac41b6c65dceb7b20d7a7f92c2efec1':
  Fix incorrent page range parsing when custom print options used.
 2013-11-19 08:34:57 -08:00
Craig Mautner
be462affdb am 096de3c3: Merge "Notify apps when insets change." into klp-dev 
* commit '096de3c3017bb9b9e5e1ed9ad790b7fedab95433':
  Notify apps when insets change.
 2013-11-19 08:34:53 -08:00
Dave Langemak
c04aa87e4a Merge "Fix incorrent page range parsing when custom print options used." into klp-dev 2013-11-19 16:33:22 +00:00
Craig Mautner
096de3c301 Merge "Notify apps when insets change." into klp-dev 2013-11-19 16:32:00 +00:00
Jeff Sharkey
eb4dc749de am 6d0d4b5b: Merge "Mask OOBE when filtering recent documents." into klp-dev 
* commit '6d0d4b5b5a66ea348c2cdd89a89d4ab7f0483829':
  Mask OOBE when filtering recent documents.
 2013-11-19 00:11:15 -08:00
Jeff Sharkey
6d0d4b5b5a Merge "Mask OOBE when filtering recent documents." into klp-dev 2013-11-19 08:08:13 +00:00
Sascha Prueter
c7f7d1bf18 am f7044fec: Merge "Trying to unbreak build..." into klp-dev 
* commit 'f7044fecee3ad1e2b2bfdd67c25b0c1536c83e18':
  Trying to unbreak build...
 2013-11-18 23:27:07 -08:00
Sascha Prueter
f7044fecee Merge "Trying to unbreak build..." into klp-dev 2013-11-19 07:23:34 +00:00
Sascha Prueter
d5965cb506 Trying to unbreak build... 
Revert "Harden against transiently unavailable backup transports"

This reverts commit 8f98252afea3fd0e68693635ec21b6004a52fa69.

Change-Id: I3aabb80f1a5932d530bce6b82d4b30c6cd1cdd5a
 2013-11-19 06:51:21 +00:00
Christopher Tate
1e964ed808 am d6bbc544: Merge "Harden against transiently unavailable backup transports" into klp-dev 
* commit 'd6bbc54423c0fb70e9e0415b3e8c12a435d715a1':
  Harden against transiently unavailable backup transports
 2013-11-18 18:44:47 -08:00
Christopher Tate
d6bbc54423 Merge "Harden against transiently unavailable backup transports" into klp-dev 2013-11-19 02:41:54 +00:00
Jeff Sharkey
e2515ac296 Mask OOBE when filtering recent documents. 
There is a data ownership issue related to recent documents Cursors,
and the loader and UI threads can end up traversing the same Cursor
at runtime.  This change masks OOBE crashes caused by this race until
we have time to fix cleanly.

Bug: 11736668
Change-Id: I2039a5edcf341fcaedacc2f08bde96fc5a271782
 2013-11-18 17:41:56 -08:00
Dirk Dougherty
08ee31a224 am ce3f3a8d: Merge "Add link to HCE dev guide." into klp-docs 
* commit 'ce3f3a8d35a4fb23c907937cb8283532e321c8ad':
  Add link to HCE dev guide.
 2013-11-19 01:33:25 +00:00
Dirk Dougherty
ce3f3a8d35 Merge "Add link to HCE dev guide." into klp-docs 2013-11-19 01:30:53 +00:00
Craig Mautner
4c5eb224de Notify apps when insets change. 
Activities that handle their own configuration get layout when hidden
and the configuration changes but not when the content insets change
if they are hidden. They need to get a fresh layout for both
situations.

Fixes bug 11544694.

Change-Id: Iff3a9adb72ea7dfc3e5cd38e1b9cd7cf2006f8f5
 2013-11-18 16:49:42 -08:00
Deepanshu Gupta
5a0fd1fd0f am 9d5a9434: Merge "Update ICU_Delegate methods. DO NOT MERGE" into klp-dev 
* commit '9d5a9434d3fe65d32aae0a400502dde8357f0ec7':
  Update ICU_Delegate methods. DO NOT MERGE
 2013-11-18 16:22:41 -08:00
Deepanshu Gupta
9d5a9434d3 Merge "Update ICU_Delegate methods. DO NOT MERGE" into klp-dev 2013-11-19 00:19:01 +00:00
Christopher Tate
8f98252afe Harden against transiently unavailable backup transports 
The init & clear operations are particularly important to ensure
delivery when at all possible, so we retry those periodically
if the transport is unavailable when we first attempt them.

Bug 11716868

Change-Id: I4860fe3d4e99618b2cd194c83162bd7cbd5a83a9
 2013-11-18 16:12:38 -08:00
Dirk Dougherty
63bb9185d4 am abb4d2da: Doc change: edit line length above button. 
* commit 'abb4d2da4374eb5e5e7a750e4b60a9145b1b1058':
  Doc change: edit line length above button.
 2013-11-18 23:49:48 +00:00
Dirk Dougherty
abb4d2da43 Doc change: edit line length above button. 
Change-Id: I7fd5c192b93846e91e0069c287776996c3f01ab8
 2013-11-18 15:45:30 -08:00
Adam Lesinski
1abead425c am 245408d2: Merge "Do not hold direct ref BatteryStatsImpl" into klp-dev 
* commit '245408d29018fee4b1231e52f5da1edcc3283c4a':
  Do not hold direct ref BatteryStatsImpl$Uid$Proc
 2013-11-18 13:29:25 -08:00
Adam Lesinski
245408d290 Merge "Do not hold direct ref BatteryStatsImpl$Uid$Proc" into klp-dev 2013-11-18 21:26:32 +00:00
John Spurlock
c65dfef3f5 am afc76f28: Merge "Use scaled display size in wallpaper constraint." into klp-dev 
* commit 'afc76f28b93f931069bb58c4f9b524d5a99b1604':
  Use scaled display size in wallpaper constraint.
 2013-11-18 12:52:58 -08:00
John Spurlock
afc76f28b9 Merge "Use scaled display size in wallpaper constraint." into klp-dev 2013-11-18 20:49:16 +00:00
Adam Lesinski
2cd3fb5aa7 Do not hold direct ref BatteryStatsImpl$Uid$Proc 
BatteryStatsImpl can reset its collected data, including
removing a BatteryStatsImpl$Uid$Proc object. If a ProcessRecord
has a direct reference, then the battery stats for a process
will be recorded in an old Proc object and prevent GC, causing
a memory leak.

bug:11087238
Change-Id: I19a9cd9d8361c10446a8ebdd5c0860b56c442209
 2013-11-18 12:29:34 -08:00
John Spurlock
d6e836c4a0 Use scaled display size in wallpaper constraint. 
Bug:11596190
Change-Id: Icc81beeea2e71144c2e5330b047e4781a23d7449
 2013-11-18 14:14:49 -05:00
Baligh Uddin
4dee4e1cb3 am 35fb6cdf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '35fb6cdf14549dac07585ae791b27e2c069bf176':
  Import translations. DO NOT MERGE
 2013-11-18 10:53:25 -08:00
Baligh Uddin
2cf27e7111 am d7b40520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'd7b4052049cba6c793367f6b5a8c3837f06faf1e':
  Import translations. DO NOT MERGE
 2013-11-18 10:53:21 -08:00
Baligh Uddin
35fb6cdf14 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-18 18:51:24 +00:00
Baligh Uddin
d7b4052049 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-18 18:51:01 +00:00
Robert Greenwalt
a8a448da25 am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev 
* commit 'e568672c9e57e1d7066e95ba547a1ae568409226':
  Fix NPE in ConnectivityService
 2013-11-18 10:29:51 -08:00
Robert Greenwalt
e568672c9e Merge "Fix NPE in ConnectivityService" into klp-dev 2013-11-18 18:27:23 +00:00
Deepanshu Gupta
0baec410c2 Update ICU_Delegate methods. DO NOT MERGE 
Bug: 11435966
Change-Id: Ib8ed2011fe62b2496795075b33b9ca7d5907b87a
 2013-11-18 10:20:37 -08:00
Deepanshu Gupta
ea04da7a18 am 9570ed56: Merge "Add libphonenumber to layoutlib.jar. DO NOT MERGE" into klp-dev 
* commit '9570ed561296dd5a0753198706cde152b00f1b24':
  Add libphonenumber to layoutlib.jar. DO NOT MERGE
 2013-11-18 10:11:50 -08:00
Deepanshu Gupta
42453ede33 am 599105a9: Merge "Fix NPE in layoutlib. DO NOT MERGE" into klp-dev 
* commit '599105a92ceb24f0f09beb11be18126ae4e8efdf':
  Fix NPE in layoutlib. DO NOT MERGE
 2013-11-18 10:11:47 -08:00