Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
158,793 Commits 3 Branches 0 Tags
20083734d92eb893c36278d2486404eedc0cc1f9
Commit Graph

158793 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
20083734d9 am 8f02ec4f: (-s ours) am d53436a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '8f02ec4fce4a77c78eff04b709831e0f4ec7cb43':
  Import translations. DO NOT MERGE
 2014-11-10 17:31:24 +00:00
Paul Jensen
78a853d17a am cb32559a: Merge "Fix NetworkMonitor logging to include NetID." into lmp-mr1-dev 
* commit 'cb32559a1ecc476a4502928b0c4e37cd0f7b836c':
  Fix NetworkMonitor logging to include NetID.
 2014-11-10 17:31:19 +00:00
Geoff Mendal
8f02ec4fce am d53436a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'd53436a9d96100883e55e09ca3e0d5b6eae4fc35':
  Import translations. DO NOT MERGE
 2014-11-10 17:27:42 +00:00
Paul Jensen
cb32559a1e Merge "Fix NetworkMonitor logging to include NetID." into lmp-mr1-dev 2014-11-10 17:27:12 +00:00
Alan Viverette
7213a52c42 am 82aaf332: Merge "Update above/below backgrounds in PopupWindow.setBackground()" into lmp-mr1-dev 
* commit '82aaf332b62c5a276c4046d1339441d68d817371':
  Update above/below backgrounds in PopupWindow.setBackground()
 2014-11-10 17:24:38 +00:00
Geoff Mendal
d53436a9d9 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-10 17:23:38 +00:00
Alan Viverette
82aaf332b6 Merge "Update above/below backgrounds in PopupWindow.setBackground()" into lmp-mr1-dev 2014-11-10 17:18:49 +00:00
Geoff Mendal
30a7f56cfb am 7d447f73: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '7d447f734d334dfdd953fdcd45b38fabbeec58dc':
  Import translations. DO NOT MERGE
 2014-11-10 17:16:01 +00:00
Geoff Mendal
c0c9b12944 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-10 17:14:59 +00:00
Geoff Mendal
fa62b15266 Import translations. DO NOT MERGE 
Change-Id: I9f1f78c7b1589471c3a4f315d53923db92378b37
Auto-generated-cl: translation import
 2014-11-10 09:13:39 -08:00
Geoff Mendal
7d447f734d Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-10 17:12:22 +00:00
Geoff Mendal
0b3daeb059 Import translations. DO NOT MERGE 
Change-Id: I174285e3b8e29495ea7128c91297450d9232b674
Auto-generated-cl: translation import
 2014-11-10 09:10:56 -08:00
Geoff Mendal
1532657866 Import translations. DO NOT MERGE 
Change-Id: I25189cd7ce81d2f1039f0121c6deaa0947bf6ec8
Auto-generated-cl: translation import
 2014-11-10 09:07:55 -08:00
Ricardo Cervera
15da5f959d am 1e01a9f7: am abf58f98: am 43f46ab9: am e627b94c: Merge "docs: Material design shadow fixes." into lmp-docs 
* commit '1e01a9f787738685c86342ced6c0e49fa2569699':
  docs: Material design shadow fixes.
 2014-11-10 16:57:43 +00:00
Andres Morales
9467926bd1 am cc8d56f6: Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-dev 
* commit 'cc8d56f66c64a66002b90ed014bbd2fb46125f63':
  Unhide DISALLOW_OUTGOING_BEAM
 2014-11-10 16:53:18 +00:00
Ricardo Cervera
1e01a9f787 am abf58f98: am 43f46ab9: am e627b94c: Merge "docs: Material design shadow fixes." into lmp-docs 
* commit 'abf58f9865e21f95356f2c32c4e2029d38a3a6a4':
  docs: Material design shadow fixes.
 2014-11-10 16:51:51 +00:00
Andres Morales
cc8d56f66c Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-dev 2014-11-10 16:48:45 +00:00
Ricardo Cervera
abf58f9865 am 43f46ab9: am e627b94c: Merge "docs: Material design shadow fixes." into lmp-docs 
* commit '43f46ab99de710f9b39106e1ac4733f06188e74c':
  docs: Material design shadow fixes.
 2014-11-10 16:46:47 +00:00
Ricardo Cervera
43f46ab99d am e627b94c: Merge "docs: Material design shadow fixes." into lmp-docs 
* commit 'e627b94c76ad144abb0207efcdc6b1cb3855bc14':
  docs: Material design shadow fixes.
 2014-11-10 16:42:20 +00:00
Pete Gast
642b4d93b9 am 705c9c13: Merge "Expand WearableExtender to customize labels." into lmp-mr1-dev 
* commit '705c9c131a6df977a2e9430cacb84788ef0cecbf':
  Expand WearableExtender to customize labels.
 2014-11-10 16:40:33 +00:00
Ricardo Cervera
e627b94c76 Merge "docs: Material design shadow fixes." into lmp-docs 2014-11-10 16:36:21 +00:00
Pete Gast
705c9c131a Merge "Expand WearableExtender to customize labels." into lmp-mr1-dev 2014-11-10 16:35:57 +00:00
Jorim Jaggi
5a8f191c12 am 3e54ce27: Merge "Adjust owner info to spec" into lmp-mr1-dev 
* commit '3e54ce273abafec3a0eca9e7064d5151ec096f0b':
  Adjust owner info to spec
 2014-11-10 15:44:25 +00:00
Jorim Jaggi
3e54ce273a Merge "Adjust owner info to spec" into lmp-mr1-dev 2014-11-10 15:39:22 +00:00
George Mount
98b4cbf21b am 8f7d3715: Merge "Allow PathMotion to affect translations in ChangeTransform." into lmp-mr1-dev 
* commit '8f7d3715c5b26069a55464b1d3e517c6ecc600c7':
  Allow PathMotion to affect translations in ChangeTransform.
 2014-11-10 15:29:30 +00:00
George Mount
8f7d3715c5 Merge "Allow PathMotion to affect translations in ChangeTransform." into lmp-mr1-dev 2014-11-10 15:25:10 +00:00
Geoff Mendal
2088ff5ba9 am 9cb3c000: (-s ours) am 547b9ba1: (-s ours) Import translations. DO NOT MERGE 
* commit '9cb3c0004da91da527657c829c957bf536f45d29':
  Import translations. DO NOT MERGE
 2014-11-10 15:13:28 +00:00
Geoff Mendal
9cb3c0004d am 547b9ba1: (-s ours) Import translations. DO NOT MERGE 
* commit '547b9ba1ec11d364d92e4dfea0f29aa24488ef7c':
  Import translations. DO NOT MERGE
 2014-11-10 15:10:05 +00:00
Geoff Mendal
d4c590f4c0 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-10 15:04:50 +00:00
Geoff Mendal
547b9ba1ec Import translations. DO NOT MERGE 
Change-Id: I5f5fab81cb5dc43388dba446d704c6f50e0415d9
Auto-generated-cl: translation import
 2014-11-10 07:03:14 -08:00
Geoff Mendal
9133cc0cac Import translations. DO NOT MERGE 
Change-Id: I412d51aa749f1a8a5264f9f9ee04c3e1f14c3849
Auto-generated-cl: translation import
 2014-11-10 06:56:28 -08:00
John Spurlock
a2416f7fc9 am 982e3be2: Merge "Doze: Fix trigger sensor re-registration." into lmp-mr1-dev 
* commit '982e3be2801bcb6b7bed1513cd757048795ddcc7':
  Doze: Fix trigger sensor re-registration.
 2014-11-10 14:54:09 +00:00
Geoff Mendal
06b0fb547f am 70eb9f64: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '70eb9f64a695f88433d5e0b294cffc76a8e981cb':
  Import translations. DO NOT MERGE
 2014-11-10 14:54:04 +00:00
John Spurlock
982e3be280 Merge "Doze: Fix trigger sensor re-registration." into lmp-mr1-dev 2014-11-10 14:52:37 +00:00
Paul Jensen
532b6143f6 Fix NetworkMonitor logging to include NetID. 
This was broken when NetID selection was moved to after
NetworkAgentInfo construction time.  NetworkMonitor inherits
from StateMachine whose log tag is immutable after construction
making it impossible to include the NetID.  Instead define a
simple log function in NetworkMonitor that includes correct
NetID.  This makes debugging via logs much easier and avoids
ambiguities that can make logs useless.

Change-Id: Ie72fc210b92bd425184d288b35ed476669e2e073
 2014-11-10 09:50:02 -05:00
Geoff Mendal
70eb9f64a6 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-10 14:49:42 +00:00
Geoff Mendal
d453184829 Import translations. DO NOT MERGE 
Change-Id: Ic5d0f862954931ce2134834256fcddda9d033ebc
Auto-generated-cl: translation import
 2014-11-10 06:48:15 -08:00
John Spurlock
7850373483 Doze: Fix trigger sensor re-registration. 
Bug: 17541271
Change-Id: I3f19f86165dd4e3677af5ed354e4fc120f9bb407
 2014-11-10 09:46:14 -05:00
Alexandra Gherghina
e533297211 am 72e32fd5: Merge "Clarify documentation for DevicePolicyManager" into lmp-mr1-dev 
* commit '72e32fd55538715f72299a08e14834257847d8dc':
  Clarify documentation for DevicePolicyManager
 2014-11-10 14:24:58 +00:00
Alexandra Gherghina
72e32fd555 Merge "Clarify documentation for DevicePolicyManager" into lmp-mr1-dev 2014-11-10 14:19:33 +00:00
John Spurlock
4a150c8b02 am bc836514: Merge "QS: Icon animation update for existing animations." into lmp-mr1-dev 
* commit 'bc8365148f9493ba7e90a8369add31fb712fd9ab':
  QS: Icon animation update for existing animations.
 2014-11-10 14:14:34 +00:00
John Spurlock
de3255cb21 am b836befe: Merge "QS: Animated hotspot tile icon." into lmp-mr1-dev 
* commit 'b836befec1d18c07f8bf08273ad3d49c26701ef7':
  QS: Animated hotspot tile icon.
 2014-11-10 14:14:29 +00:00
John Spurlock
3bdbdbefe4 am bc1e39af: Merge "Volume dialog: Add zen mode icons and notification access." into lmp-mr1-dev 
* commit 'bc1e39af5024f38492d941f9beb9544adeb50ddf':
  Volume dialog: Add zen mode icons and notification access.
 2014-11-10 14:14:24 +00:00
John Spurlock
bc8365148f Merge "QS: Icon animation update for existing animations." into lmp-mr1-dev 2014-11-10 14:09:24 +00:00
John Spurlock
b836befec1 Merge "QS: Animated hotspot tile icon." into lmp-mr1-dev 2014-11-10 14:09:03 +00:00
John Spurlock
bc1e39af50 Merge "Volume dialog: Add zen mode icons and notification access." into lmp-mr1-dev 2014-11-10 14:08:53 +00:00
John Spurlock
bb4a702e6f Volume dialog: Add zen mode icons and notification access. 
- Add icon above text to all three zen mode states, update text style.
- Remove zentoast.
- Update shared borderless rect background, masks now support shapes.
- Update size of volume stream icons.
- Ensure all volume icons are expressions of white.
- Make volume icons testable via new demo mode command.
- Add a divider + secondary icon to access the notification slider.
- Animate the transition when accessing notification slider.

Bug: 18206097
Bug: 16303068
Bug: 18102850
Change-Id: I5eb6f820dc317e89be272cc78f6c80ed969ad5e9
 2014-11-10 08:32:23 -05:00
Alexandra Gherghina
541afcd0b7 Clarify documentation for DevicePolicyManager 
Bug: 17634106
Change-Id: I93e4c10cb942bc8452043f81f460a5db6c3bd0a4
 2014-11-10 10:22:47 +00:00
Jungshik Jang
7403d65647 am 324b1f8a: Merge "CEC: Send <Give System Audio Mode> regardless of TV\'s setting." into lmp-mr1-dev 
* commit '324b1f8a4729b226c9f282eb870359dd02847441':
  CEC: Send <Give System Audio Mode> regardless of TV's setting.
 2014-11-10 00:58:55 +00:00
Jungshik Jang
324b1f8a47 Merge "CEC: Send <Give System Audio Mode> regardless of TV's setting." into lmp-mr1-dev 2014-11-10 00:54:33 +00:00