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

13913 Commits

Author SHA1 Message Date
Adrian Roos
05576cc784 am cf047b5d: am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev automerge: 866bae5 
* commit 'cf047b5d554b35e504f33994f3a07624c2690633':
  Update KeyguardManager.isDeviceLocked API
 2014-11-21 02:58:00 +00:00
Adrian Roos
cf047b5d55 am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev 
automerge: 866bae5

* commit '866bae50b7e8f0389b67df54eaf829fa50bc8eaf':
  Update KeyguardManager.isDeviceLocked API
 2014-11-21 02:46:16 +00:00
Winson Chung
a0715af6b1 am de04d557: am 7c122b60: Merge "Use SystemClock time to keep track of last event times. (Bug 17995039)" into lmp-mr1-dev 
automerge: 4ddbed3

* commit '4ddbed3d1fd569c41d0a64b3c37447cde572b36a':
  Use SystemClock time to keep track of last event times. (Bug 17995039)
 2014-11-21 01:56:39 +00:00
Winson Chung
4ddbed3d1f am de04d557: am 7c122b60: Merge "Use SystemClock time to keep track of last event times. (Bug 17995039)" into lmp-mr1-dev 
* commit 'de04d5573af33aa4357ec2e97708f07c30265333':
  Use SystemClock time to keep track of last event times. (Bug 17995039)
 2014-11-21 00:44:15 +00:00
Dan Albert
47249598cb am 582bdf9a: am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t." 
* commit '582bdf9a5961a32de27556832e23e0611c4d1cbb':
  Add appropriate casts for char16_t.
 2014-11-20 23:19:06 +00:00
Dan Albert
582bdf9a59 am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t." 
* commit 'd8c169fedf883491e46b354484909694fd52cfaf':
  Add appropriate casts for char16_t.
 2014-11-20 23:00:56 +00:00
Adrian Roos
866bae50b7 am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev 
* commit 'af6e657ab873623ed0e94bc8bcf8ed03f6bbe167':
  Update KeyguardManager.isDeviceLocked API
 2014-11-20 21:41:41 +00:00
Adrian Roos
af6e657ab8 Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev 2014-11-20 21:38:14 +00:00
Jorim Jaggi
87f0819327 am c51fdd1b: am bf1960ce: Merge "Fade notifications when exiting dozing" into lmp-mr1-dev automerge: 6456513 
* commit 'c51fdd1bbf507862c10686458d2486f57a5b9585':
  Fade notifications when exiting dozing
 2014-11-20 21:34:40 +00:00
Selim Cinek
230dc9dfc8 am 8e781107: am b18cbb9a: Merge "Fixed a bug where the notifications were not animating" into lmp-mr1-dev automerge: c9a39c7 
* commit '8e7811079576040207377e9063ad68c757f61d9a':
  Fixed a bug where the notifications were not animating
 2014-11-20 21:34:35 +00:00
Adrian Roos
d1d88bc8c6 am 4533e197: am cbd48c72: Merge "Honey I shrunk the navigation bar" into lmp-mr1-dev automerge: 71cf9e5 
* commit '4533e197bf999c6b68bdb04cad7d4bdee80b6448':
  Honey I shrunk the navigation bar
 2014-11-20 21:34:15 +00:00
Jorim Jaggi
c51fdd1bbf am bf1960ce: Merge "Fade notifications when exiting dozing" into lmp-mr1-dev 
automerge: 6456513

* commit '6456513f6ff844fd15f3453a66fcc8fb439e1ef7':
  Fade notifications when exiting dozing
 2014-11-20 21:31:41 +00:00
Selim Cinek
8e78110795 am b18cbb9a: Merge "Fixed a bug where the notifications were not animating" into lmp-mr1-dev 
automerge: c9a39c7

* commit 'c9a39c7dd1e50bea6b6ba9abc20dafe3204aece7':
  Fixed a bug where the notifications were not animating
 2014-11-20 21:30:17 +00:00
John Spurlock
6775a97389 am 224a0640: am ef86a828: Merge "QS: Inversion tile: Don\'t consider initial 0 setting trackable." into lmp-mr1-dev automerge: ae08003 
* commit '224a0640c988a33aace9b2a81548613067fb7ca8':
  QS: Inversion tile: Don't consider initial 0 setting trackable.
 2014-11-20 21:29:32 +00:00
Adrian Roos
4533e197bf am cbd48c72: Merge "Honey I shrunk the navigation bar" into lmp-mr1-dev 
automerge: 71cf9e5

* commit '71cf9e58a14b942ad313d0c5c280e207933e9841':
  Honey I shrunk the navigation bar
 2014-11-20 21:26:00 +00:00
John Spurlock
224a0640c9 am ef86a828: Merge "QS: Inversion tile: Don\'t consider initial 0 setting trackable." into lmp-mr1-dev 
automerge: ae08003

* commit 'ae08003115488e08b69e0db2e75eca56405bd928':
  QS: Inversion tile: Don't consider initial 0 setting trackable.
 2014-11-20 21:24:31 +00:00
Jason Monk
9c6e3c67b6 am 16b03c9a: am 2e982258: Merge "SysUI: Refactor the NetworkControllerImpl" into lmp-mr1-dev automerge: bdf37b7 
* commit '16b03c9a73aebd71d66ae379348eca81be676ef5':
  SysUI: Refactor the NetworkControllerImpl
 2014-11-20 21:07:37 +00:00
Jason Monk
16b03c9a73 am 2e982258: Merge "SysUI: Refactor the NetworkControllerImpl" into lmp-mr1-dev 
automerge: bdf37b7

* commit 'bdf37b714d4c3e3fb0ac27c625fdcffbd616b4f9':
  SysUI: Refactor the NetworkControllerImpl
 2014-11-20 21:00:19 +00:00
Adrian Roos
50bfeec868 Update KeyguardManager.isDeviceLocked API 
Bug: 18414067
Change-Id: I0715714c2c9a122f578ec0c6f508faae12e6f752
 2014-11-20 21:45:04 +01:00
Dan Albert
6698749dd4 Add appropriate casts for char16_t. 
C++11 defines a real char16_t, which is not implicitly convertible to
uint16_t (and by extension jchar). Add casts as needed.

Bug: 18300613
Change-Id: I00752002ef2e938bdb57f70947e8fd53ec103293
 2014-11-20 11:47:40 -08:00
Winson Chung
de04d5573a am 7c122b60: Merge "Use SystemClock time to keep track of last event times. (Bug 17995039)" into lmp-mr1-dev 
* commit '7c122b60b93c9ef4fa428bc142ea61bf4252b70b':
  Use SystemClock time to keep track of last event times. (Bug 17995039)
 2014-11-20 18:54:47 +00:00
Winson Chung
7c122b60b9 Merge "Use SystemClock time to keep track of last event times. (Bug 17995039)" into lmp-mr1-dev 2014-11-20 18:50:50 +00:00
Jorim Jaggi
6456513f6f am bf1960ce: Merge "Fade notifications when exiting dozing" into lmp-mr1-dev 
* commit 'bf1960ce9c353267490d65cc1b8beacc7dd85347':
  Fade notifications when exiting dozing
 2014-11-20 17:31:55 +00:00
Jorim Jaggi
bf1960ce9c Merge "Fade notifications when exiting dozing" into lmp-mr1-dev 2014-11-20 17:25:49 +00:00
Selim Cinek
c9a39c7dd1 am b18cbb9a: Merge "Fixed a bug where the notifications were not animating" into lmp-mr1-dev 
* commit 'b18cbb9a19d2213c0a5b1feecee5e9d4e88125c4':
  Fixed a bug where the notifications were not animating
 2014-11-20 17:06:08 +00:00
Selim Cinek
b18cbb9a19 Merge "Fixed a bug where the notifications were not animating" into lmp-mr1-dev 2014-11-20 17:01:24 +00:00
Selim Cinek
7b8157ef23 Fixed a bug where the notifications were not animating 
Bug: 18463381
Change-Id: I1064535f120dbc334a10d70b7fef232adb08a45f
 2014-11-20 16:04:00 +01:00
Adrian Roos
71cf9e58a1 am cbd48c72: Merge "Honey I shrunk the navigation bar" into lmp-mr1-dev 
* commit 'cbd48c722a40aff8bc2855d735bd34159b5df8ba':
  Honey I shrunk the navigation bar
 2014-11-20 14:58:49 +00:00
Adrian Roos
cbd48c722a Merge "Honey I shrunk the navigation bar" into lmp-mr1-dev 2014-11-20 14:54:32 +00:00
Adrian Roos
306354f040 Honey I shrunk the navigation bar 
Bug: 18412658
Bug: 18463755
Change-Id: I3e379bf22f0d83a3c7c477908b0847fc18325f12
 2014-11-20 14:31:02 +00:00
John Spurlock
ae08003115 am ef86a828: Merge "QS: Inversion tile: Don\'t consider initial 0 setting trackable." into lmp-mr1-dev 
* commit 'ef86a828146d28755b7dc1e0f5a5a41d0a9fc56f':
  QS: Inversion tile: Don't consider initial 0 setting trackable.
 2014-11-20 13:24:03 +00:00
John Spurlock
18764bf551 QS: Inversion tile: Don't consider initial 0 setting trackable. 
For usage tracking purposes, seeing a setting value of 1 is always
considered trackable.

However, only consider a setting value of 0 as trackable if we've
observed a change (from 1).  Avoids tracking a db update from null
to 0 (via settings cmd or a restore).

Bug: 18062541
Change-Id: Ic8413b1770040f9ef28041bbadb4e5fb62d1c014
 2014-11-19 21:07:04 -05:00
Jason Monk
bdf37b714d am 2e982258: Merge "SysUI: Refactor the NetworkControllerImpl" into lmp-mr1-dev 
* commit '2e982258f10e9af21ec328faf41e77b38b109738':
  SysUI: Refactor the NetworkControllerImpl
 2014-11-19 21:22:29 +00:00
Jason Monk
2e982258f1 Merge "SysUI: Refactor the NetworkControllerImpl" into lmp-mr1-dev 2014-11-19 21:18:22 +00:00
Amit Mahajan
5ed01f6427 am bb35bbf1: am 6f10d1c3: am b22462c5: Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev 
* commit 'bb35bbf198201fc00858ea56cdf97eae8f2cfdbb':
  Adding new setting LTE_SERVICE_FORCED.
 2014-11-19 18:05:33 +00:00
John Spurlock
ee33301aae am 34a2ee69: am 9d48ec7a: am 2ee054b4: Merge "Volume: Ensure ring/notif slider is enabled when ringer=vibrate." into lmp-mr1-dev 
* commit '34a2ee695d7411c6b9abd7db3fd105851092bafb':
  Volume: Ensure ring/notif slider is enabled when ringer=vibrate.
 2014-11-19 18:05:28 +00:00
Amit Mahajan
bb35bbf198 am 6f10d1c3: am b22462c5: Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev 
* commit '6f10d1c34efba28856fea162f1d193319cad2576':
  Adding new setting LTE_SERVICE_FORCED.
 2014-11-19 17:57:39 +00:00
John Spurlock
34a2ee695d am 9d48ec7a: am 2ee054b4: Merge "Volume: Ensure ring/notif slider is enabled when ringer=vibrate." into lmp-mr1-dev 
* commit '9d48ec7a5c639226f69377d41c4fcb2d3e17c13e':
  Volume: Ensure ring/notif slider is enabled when ringer=vibrate.
 2014-11-19 17:57:25 +00:00
Amit Mahajan
6f10d1c34e am b22462c5: Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev 
* commit 'b22462c57f35404f5b39680a9fb76165968d8faf':
  Adding new setting LTE_SERVICE_FORCED.
 2014-11-19 17:44:33 +00:00
Amit Mahajan
b22462c57f Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev 2014-11-19 17:38:23 +00:00
John Spurlock
9d48ec7a5c am 2ee054b4: Merge "Volume: Ensure ring/notif slider is enabled when ringer=vibrate." into lmp-mr1-dev 
* commit '2ee054b4f099ce67dffc29329612170305053783':
  Volume: Ensure ring/notif slider is enabled when ringer=vibrate.
 2014-11-19 17:24:09 +00:00
John Spurlock
2ee054b4f0 Merge "Volume: Ensure ring/notif slider is enabled when ringer=vibrate." into lmp-mr1-dev 2014-11-19 17:19:15 +00:00
John Spurlock
5eb21f3466 Volume: Ensure ring/notif slider is enabled when ringer=vibrate. 
Although the audio policy makes a distinction between voice capable
and not when determining the default active stream, have the panel
recognize this condition and behave the same way (enable the slider)
on all devices.

Bug: 17405530
Change-Id: If3e1af3078f47bc1205545e919ccc6206020e7b2
 2014-11-19 11:54:53 -05:00
Jorim Jaggi
4e857f4ef0 Fade notifications when exiting dozing 
Bug: 18146441
Change-Id: Ifa0cbb8157c65768c3a0c584166ca88c3016b730
 2014-11-19 16:52:43 +01:00
Jason Monk
9da2791f69 am 4854657f: am 90bec300: am 56dd1f1e: Merge "Automatically enable BT when entering BT QS panel" into lmp-mr1-dev 
* commit '4854657f0eaeef4c51b51976561eafd403bc5353':
  Automatically enable BT when entering BT QS panel
 2014-11-19 15:13:27 +00:00
Jason Monk
4854657f0e am 90bec300: am 56dd1f1e: Merge "Automatically enable BT when entering BT QS panel" into lmp-mr1-dev 
* commit '90bec3001294601227c3578377325224b02180cc':
  Automatically enable BT when entering BT QS panel
 2014-11-19 15:07:54 +00:00
Jason Monk
90bec30012 am 56dd1f1e: Merge "Automatically enable BT when entering BT QS panel" into lmp-mr1-dev 
* commit '56dd1f1eb6fdca10ea2f33d8420e6051e14ed435':
  Automatically enable BT when entering BT QS panel
 2014-11-19 15:03:46 +00:00
Jason Monk
56dd1f1eb6 Merge "Automatically enable BT when entering BT QS panel" into lmp-mr1-dev 2014-11-19 14:58:40 +00:00
Geoff Mendal
3bd8304922 Merge "Import translations. DO NOT MERGE" 2014-11-19 14:40:26 +00:00
Geoff Mendal
3e1f102d48 Import translations. DO NOT MERGE 
Change-Id: Ib9109f2785d00192370803b6f1c577d480bc009b
Auto-generated-cl: translation import
 2014-11-19 06:31:47 -08:00