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

143406 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
0ff62e0911 BatterySaver: Make the bars orange. 
Bug:16203820
Change-Id: I85f700d30a90212202626fc10fb289aca7f2b688
 2014-07-22 18:53:08 -04:00
Andrew Lee
921ec8056a Merge "Revert "Don't throw RemoteException in public RemoteCallVideoClient APIs."" into lmp-dev 2014-07-22 16:29:55 +00:00
Andrew Lee
1995a6b58b Revert "Don't throw RemoteException in public RemoteCallVideoClient APIs." 
This reverts commit 080b1f58eb877e1ac375768c6f951cc61a3cdbae.

Change-Id: I0dc963b3f4efe1479a7a94b8d851b89d15480d17
 2014-07-22 22:42:10 +00:00
Andrew Lee
a93e06bd64 Don't throw RemoteException in public RemoteCallVideoClient APIs. 
- Hide constructor.
- No longer implements IBinder.DeathRecipient.
- Catch RemoteExceptions instead of throwing RemoteExceptions.

Change-Id: Id666818b868c61f17b0701e4590d4e36f12c7b01
 2014-07-22 12:09:38 -07:00
Christopher Tate
dcb7a9511c Merge "Always check restore against the latest backend metadata" into lmp-dev 2014-07-22 16:29:55 +00:00
Winson Chung
dcfa7976fa Intermediate refactoring to move towards in-app view transitions. 
- Fixing bug where we weren't toggling to the right task when using affiliations
- Refactoring task rect calculation to allow full screen task view to be laid out for transitions
- Refactoring the view bounds animations into a separate class
- Refactoring the footer view (for lock-to-task) out of TaskView
- Refactoring some transform code out of TaskView
- Removing fullscreen overlay view
- Fixing case where extra invalidations and layouts were still happening in FixedSizeImageView
- Adding debug overlay to replace specific debug drawing code

Change-Id: Ibf98b6a0782a68cd84582203c807cece1ff3379f
 2014-07-22 22:25:33 +00:00
Christopher Tate
f7cbb1fc25 Always check restore against the latest backend metadata 
Bug 16484934

Change-Id: I472a7db89a94b9804f6ea94c25da206dd111a497
 2014-07-22 15:12:02 -07:00
Alex Klyubin
fcd8b20e09 Align PSKKeyManager with framework API style. 
This CL adjusts android.net.PSKKeyManager as follows:
* Renamed to PskKeyManager to follow naming conventions.
* Changed from interface to abstract class with default
  implementations for all methods.

Bug: 16403305
Bug: 15073623
Change-Id: Iefce26b394d4a753412315dad554b5342f3f0b44
 2014-07-22 19:51:34 +00:00
Andrew Lee
8d7f8a253d Merge "Don't throw RemoteException in public RemoteCallVideoClient APIs." into lmp-dev 2014-07-22 16:13:36 +00:00
Jason Long
1f630e6719 Merge "Switched Holo to Material for account chooser activities." into lmp-dev 2014-07-22 16:13:36 +00:00
Adrian Roos
1e1d6ac541 Kill flashlight when launching the camera from lockscreen 
Bug: 16357300
Change-Id: I6838ac405bb30047b076c8acb98bd124e8d00fd6
 2014-07-22 22:01:29 +00:00
Adrian Roos
930aaa717e QS: Hide flashlight tile if camera is busy 
Currently behind a flag because the camera API for this not working
correctly yet.

Bug: 16357300
Change-Id: Ib10a2eafb1323fd611f38db03a2e0b4d7aa67db0
 2014-07-22 22:00:14 +00:00
Jason Long
193f049221 Switched Holo to Material for account chooser activities. 
Change-Id: I6a44fb174eb4e981c37fca0836b103d7ee3f5ffe
 2014-07-22 14:51:44 -07:00
Robin Lee
9c2be6c7ba Stop double-loading device admins 
loadSettingsLocked() was being called twice for USER_OWNER at
systemReady(), doubling the number of admin entries at every boot.

Also guards against double-adding admins which appear twice in the
same XML file, favouring more recently-refreshed entries for
backward compatibility.

Previously an application calling in with 'refreshing = true' would
double-insert whatever admin was being refreshed into its user's list
of device admins. This is fixed too.

@bug 16416936

Change-Id: Idd147aa130e6bce7bcc40532f0a7fb07117b3151
 2014-07-22 21:35:09 +00:00
Paul Soulos
2dcab18c6c Adds ScrollBounds to the Transition framework 
Change-Id: If22ab5162737f2d109e5eaf407a735523a146b7f
 2014-07-22 14:17:48 -07:00
Alan Viverette
b97326f067 Make toolbarStyle public 
BUG: 16486273
Change-Id: I2a9f3dbac536307cdd87ea0c50801c80ae96cd94
 2014-07-22 14:05:46 -07:00
Robert Ly
4df9575807 am c12d7e3a: am ff428e08: am c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs 
* commit 'c12d7e3a3dc7b3f8df06f59d7fbeb2da84a1a493':
  Doc change: add reminder for developers on using ad id.
 2014-07-22 21:00:07 +00:00
David Friedman
2fe7d87074 am 42dbe809: am af001f94: am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs 
* commit '42dbe80914b67841c2a8fe93fef8b80e58155684':
  Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
 2014-07-22 20:55:55 +00:00
Robert Ly
c12d7e3a3d am ff428e08: am c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs 
* commit 'ff428e08a5350153c5f9476551930b0eefdfcd06':
  Doc change: add reminder for developers on using ad id.
 2014-07-22 20:53:20 +00:00
David Friedman
42dbe80914 am af001f94: am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs 
* commit 'af001f9410bf0a45282b2f0ab7c4c3bf77645697':
  Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
 2014-07-22 20:49:09 +00:00
Robert Ly
ff428e08a5 am c57c0829: Merge "Doc change: add reminder for developers on using ad id." into klp-modular-docs 
* commit 'c57c08298364e93ca4399d184bdba2657f72b11c':
  Doc change: add reminder for developers on using ad id.
 2014-07-22 20:49:05 +00:00
David Friedman
af001f9410 am 170b0953: Merge "Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body." into klp-modular-docs 
* commit '170b09535d21c7c50051e391b8f7a61678872c2b':
  Added an "In This Document" nav list at top-right of page, and deleted corresponding text from body.
 2014-07-22 20:45:11 +00:00
Scott Rowe
6b2f3ee3b9 am 2a922cb4: am 40b5d8a0: Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs 
* commit '2a922cb45a0cb33ef575e39ac8ca4dc8500e03ba':
  cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
 2014-07-22 20:08:02 +00:00
Scott Rowe
2a922cb45a am 40b5d8a0: Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs 
* commit '40b5d8a0e5aad92c07420541fd186f9f96495845':
  cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
 2014-07-22 20:03:19 +00:00
Andrew Solovay
0ff1ecd1ec am 3968ae0f: am eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs 
* commit '3968ae0f70b01592c40c3e0cd31ca5ead953faa0':
  DO NOT MERGE
 2014-07-22 19:08:45 +00:00
Andrew Solovay
3968ae0f70 am eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs 
* commit 'eb69126c613dfd476fa516df6ae1c2d78e445f0b':
  DO NOT MERGE
 2014-07-22 19:02:58 +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
Chris Craik
f23f5de173 Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()" into lmp-dev 2014-07-22 16:21:19 +00:00
henry.uh_chen
53001ca3a6 [Bitmap] Add null pointer protection in Bitmap_sameAs() 
Symptom: SkBitmap::getAddr(int, int) may return NULL due to unrecognized config
(ex: kRLE_Index8_Config). This will cause memcmp method to crash. Since bm0 and
bm1 both have pixel data() (have passed NULL == getPixels() check), those 2
bitmaps should be valid (only unrecognized), we return JNI_FALSE to warn user
those 2 unrecognized config bitmaps may be different.

Cherry-pick of 3a1bffa835f279628e50385af3c85789bc737f64 from AOSP

Change-Id: I6970c27de412110a3035d0a783112c4cd3ebc35b
 2014-07-22 13:46:17 -07:00
Alexandra Gherghina
0e9ac20d7e Do Not Merge Per-user API for master sync 
Change-Id: I6a8088eb3bfddae4c8e38904dd26baf3c7c09c9e
(cherry picked from commit 222aea8bd997807784dc99ca53f63280d384fdf0)
 2014-07-22 20:15:45 +00:00
Scott Rowe
b192a1762a am 6b2f3ee3: am 2a922cb4: am 40b5d8a0: Merge "cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12" into klp-modular-docs 
* commit '6b2f3ee3b9954b4b834d6729265acd33ef232b9c':
  cherrypick from klp-docs docs: b/14524668 remove ANDROID_ID Change-Id: I83d4389bb8322c2dbca10042e666fc9b75ea8a12
 2014-07-22 20:12:08 +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
Igor Murashkin
0986121807 Merge "camera2: Add legacy available Request/Result/Characteristics keys" into lmp-dev 2014-07-22 16:21:19 +00:00
Igor Murashkin
6c76f58f31 camera2: Add legacy available Request/Result/Characteristics keys 
* Also changes the CameraMetadata#get*Keys to not return @hide keys

Change-Id: Ifc89153136a9be502b7b88addbd16a5de68a7bfc
 2014-07-22 13:10:29 -07:00
Alan Viverette
cd73d1adda Merge "Add popupTheme attr, propagate from ActionBar to ToolBar" into lmp-dev 2014-07-22 16:29:55 +00:00
Alan Viverette
22a117d1b6 Add popupTheme attr, propagate from ActionBar to ToolBar 
BUG: 16347549
Change-Id: I934ec2469f8c136f750e2e2cf9b333e229393ac3
 2014-07-22 19:34:30 +00:00
Andrew Solovay
2471498511 am 0ff1ecd1: (-s ours) am 3968ae0f: am eb69126c: (-s ours) Merge "DO NOT MERGE" into klp-modular-docs 
* commit '0ff1ecd1ece73db8d758f227db9d965ef9598f3b':
  DO NOT MERGE
 2014-07-22 19:15:58 +00:00
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
Sreeram Ramachandran
2b6b618530 Merge "Fix WiFi-Direct." into lmp-dev 2014-07-22 16:21:19 +00:00