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

143567 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
312b792421 Shade: Don't clip header icons pre-expand. 
Bug:16496619
Change-Id: I1d3a391b2203b172bd525396719b671fe5cc3784
 2014-07-22 22:28:13 -04:00
Santos Cordon
541a06e777 Merge "Change display Strings to CharSequence (1/3)" into lmp-dev 2014-07-22 22:02:55 +00:00
Jeff Davidson
a55ccc02f5 Merge "Expose NETWORK_SCORE_SERVICE as @SystemApi." into lmp-dev 2014-07-22 16:29:55 +00:00
Jeff Davidson
5ad20790a1 Expose NETWORK_SCORE_SERVICE as @SystemApi. 
Bug: 15833200
Change-Id: Ide17bf0065ca7f5ab13e913dd6078b6c62741243
 2014-07-23 09:41:40 -07:00
Jeff Davidson
3824db6141 Delete most network scorer tests from coretests. 
Anything which tests public API functionality will be moved to a
compatibility test suite.

The only remaining test is NetworkScorerAppManagerTest, which contains
unit tests for an internal helper class that is not (and should not
be) exposed via @SystemApi or otherwise.

Bug: 16355542
Change-Id: I478da97d3a4d09407992af37e45466dc484fa8cf
 2014-07-23 09:40:24 -07:00
Jae Seo
9adf3dfe19 Merge "TIF: Use @SystemApi for APIs that we intend to open to OEMs" into lmp-dev 2014-07-22 16:21:19 +00:00
Jae Seo
15bbf3b220 TIF: Use @SystemApi for APIs that we intend to open to OEMs 
Bug: 16374058
Change-Id: Ifdf8188d3791e7e8ab6cc0a30696bde24b16ac5c
 2014-07-22 19:58:30 -07:00
Jungshik Jang
a87c384f2b Merge "Fix unknown tag @throw" into lmp-dev 2014-07-23 01:10:40 +00:00
Jungshik Jang
a00161675f Fix unknown tag @throw 
Change-Id: I8c017a83175c447d02d8eb28f571e31921ae77c6
 2014-07-23 23:30:00 +09:00
Chris Wren
1031c97485 Honor the sort and group keys for notification ranking. 
Sort notifications naturally, then move group childen to be next their proxy.
The group proxy is the summary, or if no summary exists, the lowest-ranked
member of the group is chosen as the proxy.

Notifications with a sortKey but no group and placed into a synthetic
group that consists of all notifications from that package and user in
the same priority bucket that also have sortKeys.

Expose a new API for listeners to get the group key for the notificaiton.

Bug: 15190903
Change-Id: I324ba0c394affdabb3588ca2ebafa7cf0acad2af
 2014-07-23 09:45:25 -04:00
Andrew Lee
8d7f8a253d Merge "Don't throw RemoteException in public RemoteCallVideoClient APIs." into lmp-dev 2014-07-22 16:13:36 +00:00
Dianne Hackborn
db0f364c05 Merge "Use foreground broadcast to get device admin msg." into lmp-dev 2014-07-22 16:13:36 +00:00
Dianne Hackborn
8ddeee98b8 Use foreground broadcast to get device admin msg. 
Using a background broadcast is bad, it can take a long
time to get the message back, either accidentally (backed up
behind other broadcasts) or from a deliberately malicious
admin.

Change-Id: Ib7491f8e27dacdc002562aef027ee4664e78e97b
 2014-07-22 18:27:52 -07:00
Adam Lesinski
59abf5305b Merge "Add test UsageStats App" into lmp-dev 2014-07-22 16:21:19 +00:00
Adam Lesinski
e159e2e0b8 Add test UsageStats App 
Also fixed UsageStatsService to do the right thing
when AppOps returns MODE_DEFAULT.

Change-Id: I0bdb28350fb2528daf2859cdcbbf9ca48d96dde9
 2014-07-22 18:21:58 -07:00
John Spurlock
79cac9d0f0 Merge "Wire up CATEGORY_ALARM and CATEGORY_EVENT." into lmp-dev 2014-07-22 22:02:49 +00:00
John Spurlock
333f8dd78f Wire up CATEGORY_ALARM and CATEGORY_EVENT. 
And remove the alarm package whitelist now that deskclock
uses a category.

Bug:16406214
Change-Id: I6ca400376a9df7646889e394e53e4d491c56a46c
 2014-07-22 21:06:34 -04: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