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

181629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
1a5da04902 Record memory data in event log as we collect it for procstats. 
Change-Id: I37d6d87aac0c400ea402ae20e6174fd851d3c1f9
 2015-01-29 17:45:26 -08:00
Scott Rowe
8f5714d3e1 am a3031211: am b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs 
* commit 'a303121168f1e3cfe62f6836a38ba1a33f3e336d':
  docs: Card View for Android TV training
 2015-01-30 01:44:43 +00:00
Scott Rowe
2d1c5dc8ef am e4249f29: am 87a1bf09: docs: b/19193358 Android TV overscan instructions: settings reversed in text 
* commit 'e4249f29ea56f35aab1337323a0e55992ee9247f':
  docs: b/19193358 Android TV overscan instructions: settings reversed in text
 2015-01-30 01:44:39 +00:00
Rich Slogar
6ccb72e685 am e0063faa: Merge "docs: linux requirements update" into lmp-docs 
* commit 'e0063faa8707e2424a33625aaf2228540fa67e85':
  docs: linux requirements update
 2015-01-30 01:41:58 +00:00
Scott Rowe
a303121168 am b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs 
* commit 'b86c3b80db09da85b50c1809520bbf893cb83d93':
  docs: Card View for Android TV training
 2015-01-30 01:37:23 +00:00
Scott Rowe
e4249f29ea am 87a1bf09: docs: b/19193358 Android TV overscan instructions: settings reversed in text 
* commit '87a1bf097078e43dc9e7c060daf8d835afd7bf6d':
  docs: b/19193358 Android TV overscan instructions: settings reversed in text
 2015-01-30 01:37:21 +00:00
Rich Slogar
e0063faa87 Merge "docs: linux requirements update" into lmp-docs 2015-01-30 01:32:18 +00:00
Scott Rowe
b86c3b80db Merge "docs: Card View for Android TV training" into lmp-docs 2015-01-30 01:30:44 +00:00
Alan Viverette
3e2ec1cc9c Avoid bug in LinearLayout measurement 
Reverts to Holo-style layout where the View divider masks the bug.
Uses a 0-height divider to avoid visual changes.

Bug: 19201079
Change-Id: Ib9e701815c57b23d5ba7173f8de553e90e27ed11
 2015-01-30 01:30:23 +00:00
Dianne Hackborn
e322d1253c Merge "Improve messaging of pre boot apps." 2015-01-30 01:27:21 +00:00
Dianne Hackborn
a92cbad2a9 Improve messaging of pre boot apps. 
Have the system take care of showing the boot message
as it runs pre boot apps, rather than relying on them
doing this on their own.

Change-Id: Ife6db0691907cf413311dafb4b023e63e8795a79
 2015-01-29 17:22:25 -08:00
Amit Mahajan
f58ab0ae43 am d492aa08: am 45446c63: Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen by user." into lmp-mr1-dev 
automerge: ed1a463

* commit 'ed1a46393e50cb2954876ef19ca539829fdf4a19':
  Adding new API to ISms to check if default SMS SIM needs to be chosen by user.
 2015-01-30 01:05:24 +00:00
Amit Mahajan
ed1a46393e am d492aa08: am 45446c63: Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen by user." into lmp-mr1-dev 
* commit 'd492aa08206d21ba2e5ba533532630e5abe0bffe':
  Adding new API to ISms to check if default SMS SIM needs to be chosen by user.
 2015-01-30 01:03:30 +00:00
Amit Mahajan
d492aa0820 am 45446c63: Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen by user." into lmp-mr1-dev 
* commit '45446c632162eb61a213815363149175732de78d':
  Adding new API to ISms to check if default SMS SIM needs to be chosen by user.
 2015-01-30 00:56:35 +00:00
Amit Mahajan
45446c6321 Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen by user." into lmp-mr1-dev 2015-01-30 00:52:50 +00:00
Sailesh Nepal
7c2583aea4 am 0d30c930: am 38710f03: Merge "Fix crash when making emergency calls" into lmp-mr1-dev 
automerge: 3f8a5ed

* commit '3f8a5ed5b4907cdaf0813e849e49131c82a3f634':
  Fix crash when making emergency calls
 2015-01-30 00:45:41 +00:00
Sailesh Nepal
3f8a5ed5b4 am 0d30c930: am 38710f03: Merge "Fix crash when making emergency calls" into lmp-mr1-dev 
* commit '0d30c930c39fb48bbec68158dc9a39d4fbfdff9f':
  Fix crash when making emergency calls
 2015-01-30 00:41:23 +00:00
Zhen Yu Song
f1a0a3f842 Merge "+ Update api file." 2015-01-30 00:37:11 +00:00
Sailesh Nepal
0d30c930c3 am 38710f03: Merge "Fix crash when making emergency calls" into lmp-mr1-dev 
* commit '38710f03c92a57ec00830e146a0714254c635405':
  Fix crash when making emergency calls
 2015-01-30 00:36:07 +00:00
Sailesh Nepal
38710f03c9 Merge "Fix crash when making emergency calls" into lmp-mr1-dev 2015-01-30 00:31:12 +00:00
Zhen Yu Song
619ef3fe93 + Update api file. 
Change-Id: I1a2abb974c6a789c3533a44d3ceb70cf6701b9f9
 2015-01-29 16:28:18 -08:00
Christopher Tate
7af25c0515 am 7041420d: am 9b36d111: am b71ac193: Merge "Don\'t run full-data backups when backup is disabled" into lmp-mr1-dev 
* commit '7041420d9b0ca1e0f79157ccace48ac4e29adc29':
  Don't run full-data backups when backup is disabled
 2015-01-30 00:21:25 +00:00
Christopher Ferris
58f1bf4c98 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-01-30 00:21:24 +00:00
Christopher Ferris
3c1fd311ff am 0654196f: am e7a69cbf: am dbd03924: Merge "Fix wrap property creation when truncating." 
* commit '0654196fb08fb8c0dfed65ece00f0a4596ed70c2':
  Fix wrap property creation when truncating.
 2015-01-30 00:21:12 +00:00
Christopher Ferris
3f8d6c92ce am e7a69cbf: am dbd03924: Merge "Fix wrap property creation when truncating." 
automerge: 0654196

* commit '0654196fb08fb8c0dfed65ece00f0a4596ed70c2':
  Fix wrap property creation when truncating.
 2015-01-30 00:19:47 +00:00
Christopher Tate
7041420d9b am 9b36d111: am b71ac193: Merge "Don\'t run full-data backups when backup is disabled" into lmp-mr1-dev 
* commit '9b36d1117a2f0eb0402b0f9dda8bc5d94b110061':
  Don't run full-data backups when backup is disabled
 2015-01-30 00:17:19 +00:00
RoboErik
001c59c637 Route volume keys directly to the audio system on TVs 
This routes volume and mute keys directly to the audio system when
on a television instead of letting apps or sessions intercept them.

Change-Id: I2af47e30c7842aca96d045a6cc9ca025b94e546a
 2015-01-29 16:14:31 -08:00
RoboErik
4197cb60bc Move mute/unmute handling to adjust volume paths 
This deprecates the setStreamMute and setStreamSolo APIs. Soloing is no
longer supported and muting is redirected through the adjust volume APIs.

Also updates the hidden master versions of these APIs.

Change-Id: I65d2a5d5fc15b386bd497abf8ca6869fec75a26a
 2015-01-29 16:14:30 -08:00
Christopher Ferris
0654196fb0 am e7a69cbf: am dbd03924: Merge "Fix wrap property creation when truncating." 
* commit 'e7a69cbf920565b4b428459198fd53f193080796':
  Fix wrap property creation when truncating.
 2015-01-30 00:14:17 +00:00
Christopher Tate
9b36d1117a am b71ac193: Merge "Don\'t run full-data backups when backup is disabled" into lmp-mr1-dev 
* commit 'b71ac193087dc768a25cebb0f06f0ccbb66e8ba9':
  Don't run full-data backups when backup is disabled
 2015-01-30 00:11:59 +00:00
Christopher Tate
b71ac19308 Merge "Don't run full-data backups when backup is disabled" into lmp-mr1-dev 2015-01-30 00:06:18 +00:00
Winson Chung
d16c565a60 Adding some debug controls to test multi-window. 
Adding some preliminary controls to mirror the currently exposed api
to create new activity stacks, resize stacks, and to move tasks
between stacks.

Change-Id: I3fb51c248f53a1d4c4eb23ca9fb3a76888def1de
 2015-01-29 15:56:58 -08:00
Christopher Ferris
95b1048d39 Fix wrap property creation when truncating. 
If a property name gets truncated, make sure it doesn't end in a '.'
since that makes the name illegal.

Bug: 19196358
Bug: https://code.google.com/p/android/issues/detail?id=82947

(cherry picked from commit e32df45fe1a8cb7286bfdad392a0d36e0ddcf8e7)

Change-Id: I126a40ffae76ee6a06926e770ca015fb063a334b
 2015-01-29 15:54:40 -08:00
Christopher Ferris
e7a69cbf92 am dbd03924: Merge "Fix wrap property creation when truncating." 
* commit 'dbd03924d83ab03e6e8e45d1d041dc8d162180cf':
  Fix wrap property creation when truncating.
 2015-01-29 23:51:16 +00:00
Zhijun He
043adafffd Merge "Camera2: metadata spec update for reprocessing" 2015-01-29 23:48:02 +00:00
Christopher Tate
e77c12ba37 Don't run full-data backups when backup is disabled 
If the scheduled job fires but backup is disabled or the device is
not yet provisioned (i.e. has not yet finished going through setup),
bow out gracefully without running any backup operations.  Also, even
if a backup is directly invoked (e.g. via adb), verify again right
before we start collecting app data, and abandon the operation in
that path as well.

(This is redundant; having only the latter test would suffice, but
this lets us distinguish in the logging more easily.)

Finally, make sure that if we were waiting on setup before permitting
backup operations to begin, that we startup the full-data scheduling
as well as the [separate] key/value scheduling.

Bug 19197062

Change-Id: I3d8fb650c50f946d8ed7ac7170df361c707f2528
 2015-01-29 15:47:43 -08:00
Christopher Ferris
dbd03924d8 Merge "Fix wrap property creation when truncating." 2015-01-29 23:41:06 +00:00
Raph Levien
4319827fd4 am 61ff4d1d: am d24047dc: Merge "Use constants instead of resources for ellipsis." into lmp-mr1-dev 
automerge: c36d373

* commit 'c36d373733b8fb9683d40e404151110ed9c44ecf':
  Use constants instead of resources for ellipsis.
 2015-01-29 23:29:04 +00:00
Zhijun He
0e99c2260d Camera2: metadata spec update for reprocessing 
Change-Id: I37eda90970eace23c42ba9106d4db1587df8d1b4
 2015-01-29 15:26:05 -08:00
Raph Levien
c36d373733 am 61ff4d1d: am d24047dc: Merge "Use constants instead of resources for ellipsis." into lmp-mr1-dev 
* commit '61ff4d1debe013e9f81bb05f59356b133b6e4922':
  Use constants instead of resources for ellipsis.
 2015-01-29 23:25:14 +00:00
Raph Levien
61ff4d1deb am d24047dc: Merge "Use constants instead of resources for ellipsis." into lmp-mr1-dev 
* commit 'd24047dcfed3fb7c913a0a5950c9f48ce3d49b9e':
  Use constants instead of resources for ellipsis.
 2015-01-29 23:17:01 +00:00
Raph Levien
d24047dcfe Merge "Use constants instead of resources for ellipsis." into lmp-mr1-dev 2015-01-29 23:04:15 +00:00
Igor Viarheichyk
6f9f1d4b3b Use constants instead of resources for ellipsis. 
All supported locales use only U+2025 and U+2026 to represent
ellipses, and it will unlikely change in future. Given translated
resources are inconsistent and often use three dots it is safer
to use constants instead of resources.

(cherry-pick of ed0daa93e48d38e54a7ad1c99c461510a4c07599.)

Bug: 18542179
Change-Id: I51a6cb903f62f739fbadd6b78e5765c0028d641a
 2015-01-29 15:00:13 -08:00
Zhen Yu Song
72c85bbdf8 Merge "+ Add CarExtender to Notification Bug: 18316420" 2015-01-29 22:54:29 +00:00
Jinsuk Kim
1b68ce327a am 7bf039b6: am 9c5ccc36: Merge "CEC: Discard key event to itself" into lmp-mr1-dev 
automerge: a6fc42a

* commit 'a6fc42aec58ab0d2dbb96f37d40e597bc39631fa':
  CEC: Discard key event to itself
 2015-01-29 22:46:33 +00:00
Jinsuk Kim
a6fc42aec5 am 7bf039b6: am 9c5ccc36: Merge "CEC: Discard key event to itself" into lmp-mr1-dev 
* commit '7bf039b67c89ac07a1b90d048bf1e4ff0e121ab8':
  CEC: Discard key event to itself
 2015-01-29 22:44:51 +00:00
Jinsuk Kim
b744db8715 am eb2c4a07: am dbdaea0c: Merge "CEC: Do null/empty check against the parameter for checkRecordSource()" into lmp-mr1-dev 
automerge: 7e79bdb

* commit '7e79bdb494b51175d9873f82f4ca8488ac6fccfa':
  CEC: Do null/empty check against the parameter for checkRecordSource()
 2015-01-29 22:41:23 +00:00
Jinsuk Kim
7bf039b67c am 9c5ccc36: Merge "CEC: Discard key event to itself" into lmp-mr1-dev 
* commit '9c5ccc3684e55e0ce7f2940bd13dfd7acdf85895':
  CEC: Discard key event to itself
 2015-01-29 22:39:57 +00:00
Jinsuk Kim
f0569c1651 am 1ebbe916: am 3f923474: Merge "CEC: Add CEC device upon receiving <Report Physical Address>" into lmp-mr1-dev 
automerge: e7ff01e

* commit 'e7ff01ecc5c0ceda498dd476cb29ee663f1968dc':
  CEC: Add CEC device upon receiving <Report Physical Address>
 2015-01-29 22:39:52 +00:00
Raph Levien
98cb80d659 am 2ed9a7e5: am af461e12: Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev 
automerge: 35b5780

* commit '35b5780ec52f3492ae41c36ae30e289bcf78cb11':
  Refine resolution order for typeface and fontFamily
 2015-01-29 22:38:41 +00:00