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

143361 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
eb4b8a27e3 AudioService: wait for init completed to handle media server restart 
Bug: 16458506.
Change-Id: I25804e6e7209d52fd5dd6c622cae85d1e7d2317f
 2014-07-22 11:55:42 -07:00
Andrew Solovay
c3032874dc am 3a14c289: am a2beba70: am 170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs 
* commit '3a14c2890e9821a36399b042261d75ee4dfdf71f':
  docs: Removed reference to a sample notepad app.
 2014-07-22 18:53:11 +00:00
Andrew Solovay
3a14c2890e am a2beba70: am 170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs 
* commit 'a2beba70b947a948c2a12513c8bdda4d403c2fd6':
  docs: Removed reference to a sample notepad app.
 2014-07-22 18:47:26 +00:00
Andrew Solovay
a2beba70b9 am 170556f8: Merge "docs: Removed reference to a sample notepad app." into klp-modular-docs 
* commit '170556f82bd009cf5a74a53d7ba61221d74d36e9':
  docs: Removed reference to a sample notepad app.
 2014-07-22 18:41:21 +00:00
Robert Ly
47495df6a6 am fb8e254a: am 1c723ea8: Merge "docs: update links and add new wear design materials" into klp-modular-docs 
* commit 'fb8e254a1a66fc707a1c52d4cced699339f15685':
  docs: update links and add new wear design materials
 2014-07-22 17:18:52 +00:00
Robert Ly
817a31afa3 am c9cf4521: am 0b5f9c2f: docs: remove android translation plugin doc 
* commit 'c9cf452179ed6c413712607fd60ba2eaa910d95b':
  docs: remove android translation plugin doc
 2014-07-22 17:18:47 +00:00
Robert Ly
fb8e254a1a am 1c723ea8: Merge "docs: update links and add new wear design materials" into klp-modular-docs 
* commit '1c723ea84ee4299fa07687cb2881e3695bd14d3c':
  docs: update links and add new wear design materials
 2014-07-22 17:12:14 +00:00
Robert Ly
c9cf452179 am 0b5f9c2f: docs: remove android translation plugin doc 
* commit '0b5f9c2f6890ed8aa16d1cb630aa415bf7c908c0':
  docs: remove android translation plugin doc
 2014-07-22 17:12:10 +00:00
Robert Ly
0b5f9c2f68 docs: remove android translation plugin doc 
Change-Id: Ia21049e3250e98a419f5249693b218c1d5e58fd1
 2014-07-22 17:07:12 +00:00
Baligh Uddin
d74d7397ef am 43f783fd: (-s ours) Import translations. DO NOT MERGE 
* commit '43f783fd7efd3b3d985a58bc3aa3e6136f976a14':
  Import translations. DO NOT MERGE
 2014-07-22 16:48:12 +00:00
Baligh Uddin
43f783fd7e Import translations. DO NOT MERGE 
Change-Id: Ief6127337c9c4fdbbf15a6214a463822dc39b92c
Auto-generated-cl: translation import
 2014-07-22 16:39:39 +00:00
Justin Koh
e959e4a017 am a63272b4: Merge "Revert "Wait for all windows to draw before turning screen on"" into klp-modular-dev 
* commit 'a63272b4b5eff16f4d6fae4730b8a7087563181c':
  Revert "Wait for all windows to draw before turning screen on"
 2014-07-22 16:31:06 +00:00
Sreeram Ramachandran
2b6b618530 Merge "Fix WiFi-Direct." into lmp-dev 2014-07-22 16:21:19 +00:00
Sreeram Ramachandran
a77760d74a Fix WiFi-Direct. 
Add a new command to let netd know about routes on a p2p interface.

Bug: 15413694

Change-Id: I36effc438d5ac193a77174493bf196cb68a5b97a
 2014-07-22 11:24:29 -07:00
Craig Mautner
dc00cbe2c1 Create API for launching from recents 
Relaunch apps from recents using the same uid and package as was used
in the original launch.

Fixes bug 16358208.

Change-Id: I340800bfee79926b197929360d69f1d570bbf1eb
 2014-07-22 18:13:34 +00:00
Craig Mautner
f14e5a2fad Add empty ArrayList check. 
Fixes bug 15768779.

Change-Id: I3e4c48aa0fff99025e9ba1725e3d1f3523749dbd
 2014-07-22 18:09:45 +00:00
Behdad Esfahbod
6ba30b85dd Add android.Paint that inherits SkPaint 
The idea is that extra paint parameters that only affect text layout
(not rendering) will go in android.Paint instead of going into
SkPaintOptionsAndroid.  We will eventually move those out of SkPaint
too.

This is currently implemented in PaintImpl.cpp.  Will be renamed when
current Paint.cpp that has JNI bits is moved to android_graphics_Paint.cpp.

Change-Id: Iba66c34dea5da503a13b9c864cb9f2211ac4ba7d
 2014-07-22 14:01:09 -04:00
George Mount
ad88e1b1b2 API Council: Change docs and constant names. 
Bug 16401545

Changed doc for ChangeImageTransform.
Changed IN/OUT to MODE_IN/MODE_OUT.
Changed mode to flag attribute.
Change-Id: Ia2ae9930f9725871c9b1d80b758a3a0808a8f0c6
 2014-07-22 17:29:14 +00:00
Robert Ly
cf068e7799 am 47495df6: am fb8e254a: am 1c723ea8: Merge "docs: update links and add new wear design materials" into klp-modular-docs 
* commit '47495df6a6797704919af3ea4a695cf7b2c53f00':
  docs: update links and add new wear design materials
 2014-07-22 17:27:08 +00:00
Robert Ly
451a640c10 am 817a31af: am c9cf4521: am 0b5f9c2f: docs: remove android translation plugin doc 
* commit '817a31afa3195b707526bb6d14339720d943549e':
  docs: remove android translation plugin doc
 2014-07-22 17:27:00 +00:00
Yin-Chia Yeh
f8f37002c0 camera2: minor doc update 
Doc update reflecting the minor spec change.

Change-Id: I7a1cf766fe6bee4dd08fd19f03778ce8a6ce2dde
 2014-07-22 17:26:30 +00:00
Robert Ly
1c723ea84e Merge "docs: update links and add new wear design materials" into klp-modular-docs 2014-07-22 16:21:19 +00:00
Robert Ly
faaf23b9ac docs: update links and add new wear design materials 
Change-Id: Idca24bcb64167b29c235380d0778d62cb1be6477
 2014-07-22 10:06:31 -07:00
Youngsang Cho
df461a1fb0 Merge "Minor comment change of TvContract.Programs.COLUMN_TITLE" into lmp-dev 2014-07-22 16:21:19 +00:00
Youngsang Cho
8433ad9ec1 Minor comment change of TvContract.Programs.COLUMN_TITLE 
Change-Id: I6592a0708feafc84cd76585428a9743e8fb2af48
 2014-07-22 11:31:00 -07:00
destradaa
c79dd82e55 Merge "Add uncertainty for GPS received TOW field. b/16463499" into lmp-dev 2014-07-22 16:13:36 +00:00
Baligh Uddin
9f184b28d2 am d74d7397: (-s ours) am 43f783fd: (-s ours) Import translations. DO NOT MERGE 
* commit 'd74d7397ef9fa085ae8a25a6c89eb9caccb43d40':
  Import translations. DO NOT MERGE
 2014-07-22 17:18:28 +00:00
Geoff Mendal
af13b025e9 Merge commit 'e959e4a0' into lmp-dev 
Conflicts:
	services/core/java/com/android/server/wm/WindowManagerService.java
 2014-07-22 10:14:35 -07:00
destradaa
81cabb8a7f Add uncertainty for GPS received TOW field. 
b/16463499

Change-Id: I5dde8a2737d9345eb7f77edc64ab7286254a65e4
 2014-07-22 10:03:28 -07:00
Robert Ly
c8551e678b am 4f67e66e: am f3be7864: Merge "docs: fix speech code for bug 16461337" into klp-modular-docs 
* commit '4f67e66e3e6efd5805c54ef6ca0979c9b1f64d96':
  docs: fix speech code for bug 16461337
 2014-07-22 14:34:06 +00:00
Robert Ly
4f67e66e3e am f3be7864: Merge "docs: fix speech code for bug 16461337" into klp-modular-docs 
* commit 'f3be7864a6cf1b98107de1eadf25587b53a90fca':
  docs: fix speech code for bug 16461337
 2014-07-22 14:30:13 +00:00
Deepanshu Gupta
aa474ff0f3 am 9a61270d: Merge "LayoutLib: Fix EditText rendering [DO NOT MERGE]" into klp-modular-dev 
* commit '9a61270d67f654f3558b29f6b3e78c0b2fbe0178':
  LayoutLib: Fix EditText rendering [DO NOT MERGE]
 2014-07-22 01:04:00 +00:00
Deepanshu Gupta
b51750fda6 am 0ca0853c: Merge "Update layoutlib create README [DO NOT MERGE]" into klp-modular-dev 
* commit '0ca0853c52a81b317996b2997373f5882b369c80':
  Update layoutlib create README [DO NOT MERGE]
 2014-07-22 01:03:55 +00:00
Dirk Dougherty
b810999637 am d1929c50: am f3659284: Doc change: add reminder for developers on using ad id. 
* commit 'd1929c505a66afc13d661beac9868f2886cbd1e8':
  Doc change: add reminder for developers on using ad id.
 2014-07-22 00:58:13 +00:00
Dirk Dougherty
d1929c505a am f3659284: Doc change: add reminder for developers on using ad id. 
* commit 'f365928406ef0a80d3aecc2d025642f9efb80a05':
  Doc change: add reminder for developers on using ad id.
 2014-07-22 00:54:01 +00:00
Dirk Dougherty
f365928406 Doc change: add reminder for developers on using ad id. 
Change-Id: I2a6109bd1b97e4432e36c6a5055aee6e2b1c3edd
 2014-07-21 22:15:04 +00:00
Andrew Solovay
30aa5924f0 am 643fa8d1: Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev 
* commit '643fa8d1ecf5d2a485b7b30d43a47d090b5e3dcc':
  docs: Noted how singleTop affects "up" navigation.
 2014-07-21 17:47:13 +00:00
Ricardo Cervera
fef0011144 am d73eb7f9: am 940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs 
* commit 'd73eb7f9c96c2211ab12a09c319978915cf593bf':
  docs: Added note suggesting use of Android Studio over ADT
 2014-07-21 17:11:42 +00:00
Ricardo Cervera
d73eb7f9c9 am 940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs 
* commit '940ae93043a7d36d89ab777cbc691893590d326c':
  docs: Added note suggesting use of Android Studio over ADT
 2014-07-21 17:07:00 +00:00
Robert Ly
205196f128 am efca30d0: am 62c81ab5: docs: change copy for edu video 
* commit 'efca30d0fafefb9f59668ee9d918cd7cc6098e6c':
  docs: change copy for edu video
 2014-07-21 16:17:39 +00:00
Robert Ly
efca30d0fa am 62c81ab5: docs: change copy for edu video 
* commit '62c81ab580ec39635fc8b52f552872675c87a816':
  docs: change copy for edu video
 2014-07-21 16:11:39 +00:00
Robert Ly
62c81ab580 docs: change copy for edu video 
Change-Id: I88e5ae8e9c0f899f0e4dfc5087de9ea18153894d
 2014-07-21 09:06:50 -07:00
Deepanshu Gupta
0ca0853c52 Merge "Update layoutlib create README [DO NOT MERGE]" into klp-modular-dev 2014-07-21 15:43:35 +00:00
Deepanshu Gupta
c54100d449 Update layoutlib create README [DO NOT MERGE] 
Update the doc to reflect the current state of the tool and use a
consistent 100 char column limit.

Change-Id: I64fb58cc46abbc2f3759cb1f99d42b5090c1409f
(cherry picked from commit 88585f404cb493129847e4487b628062674a4ede)
 2014-07-21 17:37:20 -07:00
Ricardo Cervera
940ae93043 Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs 2014-07-21 15:43:35 +00:00
Ricardo Cervera
448525e98e docs: Added note suggesting use of Android Studio over ADT 
Change-Id: Id921c06ea75c70e1ad4741c743f1d15958686b16
 2014-07-21 09:08:10 -07:00
Robert Ly
f3be7864a6 Merge "docs: fix speech code for bug 16461337" into klp-modular-docs 2014-07-21 15:42:19 +00:00
Robert Ly
61ecfc3428 docs: fix speech code for bug 16461337 
Change-Id: Id2ab7852a7dbe9b91697e1ffd0ca1ba62144f875
 2014-07-22 14:25:10 +00:00
Andrew Solovay
643fa8d1ec Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev 2014-07-21 15:42:19 +00:00
David Friedman
119716f404 am 0d5af3f6: am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs 
* commit '0d5af3f67bdd3734304a19dad45d995e93b6e957':
  Minor typos, consistency things, one grammatical error.
 2014-07-20 12:43:19 +00:00