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

211114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Koulomzin
1a73ab760b am 4bf3dfea: am ffa2d691: Merge "Adds config flag for USB notification." into cw-e-dev 
* commit '4bf3dfeacf9fc7faf7126c32b161a7dae2bb2c4f':
  Adds config flag for USB notification.
 2015-09-10 22:00:25 +00:00
Daniel Koulomzin
4bf3dfeacf am ffa2d691: Merge "Adds config flag for USB notification." into cw-e-dev 
* commit 'ffa2d69193c70a4e8455aeb5f41487e43c4d48aa':
  Adds config flag for USB notification.
 2015-09-10 21:52:29 +00:00
Daniel Koulomzin
ffa2d69193 Merge "Adds config flag for USB notification." into cw-e-dev 2015-09-10 21:46:01 +00:00
Martijn Coenen
51e4b28c48 am 48093547: am 5c732ee5: am e1d2d422: Merge "Fix missing copyright headers." into mnc-dr-dev 
* commit '4809354715aca3bd766250ce708a006a64753c62':
  Fix missing copyright headers.
 2015-09-10 21:41:23 +00:00
Martijn Coenen
4809354715 am 5c732ee5: am e1d2d422: Merge "Fix missing copyright headers." into mnc-dr-dev 
* commit '5c732ee53e5bb5e0c8de920816bca729b6330e5d':
  Fix missing copyright headers.
 2015-09-10 21:33:03 +00:00
Martijn Coenen
5c732ee53e am e1d2d422: Merge "Fix missing copyright headers." into mnc-dr-dev 
* commit 'e1d2d42289afe6e6a65d2ef420b8bf8ed2b33d3b':
  Fix missing copyright headers.
 2015-09-10 21:24:22 +00:00
Martijn Coenen
e1d2d42289 Merge "Fix missing copyright headers." into mnc-dr-dev 2015-09-10 21:17:56 +00:00
Gus Prevas
94a4764649 am 27cb5670: am 3d1115db: Merge "Fixes cloned notification actions missing icon." into cw-e-dev 
* commit '27cb56703d350b441a2e9efc55bd16dd5b1528e7':
  Fixes cloned notification actions missing icon.
 2015-09-10 19:54:13 +00:00
Gus Prevas
27cb56703d am 3d1115db: Merge "Fixes cloned notification actions missing icon." into cw-e-dev 
* commit '3d1115dba5ca4715a81502352ad3e2a7a1a6a7af':
  Fixes cloned notification actions missing icon.
 2015-09-10 19:48:03 +00:00
Gus Prevas
3d1115dba5 Merge "Fixes cloned notification actions missing icon." into cw-e-dev 2015-09-10 19:40:19 +00:00
Gus Prevas
e753361508 Adds config flag for USB notification. 
This change modifies UsbDeviceManager such that the ongoing
system notification for USB charging state is controlled by a
config flag.

Bug: 23409719
Change-Id: I2ef24fe74923170a6e8dd02375b973b4025281e4
 2015-09-10 13:37:59 -04:00
Gus Prevas
f5bff46f6a Fixes cloned notification actions missing icon. 
This change modifies the Notification.Action constructor
to populate the deprecated "icon" field based on the provided icon.
This field is still used by NotificationCompatApi20
to create a NotificationCompatBase.Action from a Notification.Action.

Bug: 23348968
Bug: 22591778
Change-Id: I3576038384d2baa12c4c75bc4124e3859aacbd13
 2015-09-10 13:13:45 -04:00
Alan Viverette
081b1cffc4 am 1ebac03c: am a5ec056b: Merge "CalendarView: use theme attribute instead of style on MonthName TextView" 
* commit '1ebac03cbe74c2c04aabfd485dab5d366632946b':
  CalendarView: use theme attribute instead of style on MonthName TextView
 2015-09-10 12:26:58 +00:00
Alan Viverette
1ebac03cbe am a5ec056b: Merge "CalendarView: use theme attribute instead of style on MonthName TextView" 
* commit 'a5ec056b8331b2560f5c6f9543471884894914f1':
  CalendarView: use theme attribute instead of style on MonthName TextView
 2015-09-10 12:19:40 +00:00
Alan Viverette
a5ec056b83 Merge "CalendarView: use theme attribute instead of style on MonthName TextView" 2015-09-10 12:13:28 +00:00
Young-Ho Cha
a3843cfb96 CalendarView: use theme attribute instead of style on MonthName TextView 
Change-Id: I0d891ab08e61df7422fb0aea50a4c31196792189
Signed-off-by: Young-Ho Cha <ganadist@gmail.com>
 2015-09-10 15:11:42 +09:00
Amit Mahajan
b4c8e9191f am f327fd34: am 5a45dc96: am 0018323c: Merge "Add carrier config variable to hide preferred network type" into mnc-dr-dev 
* commit 'f327fd34c94781469e0219e27b91f25039cfb2cb':
  Add carrier config variable to hide preferred network type
 2015-09-10 01:21:17 +00:00
Daniel Sandler
1d49a967ef am c6fa5914: am 847bdf00: am 5b40e225: Merge "Make the vertical navbar 48dp like the horizontal one." into mnc-dr-dev 
* commit 'c6fa59145e690f8140fda9d79934f1b66ea354d3':
  Make the vertical navbar 48dp like the horizontal one.
 2015-09-10 01:21:09 +00:00
Amit Mahajan
f327fd34c9 am 5a45dc96: am 0018323c: Merge "Add carrier config variable to hide preferred network type" into mnc-dr-dev 
* commit '5a45dc960b42eae66661665ff9a6bcb7e4a02c16':
  Add carrier config variable to hide preferred network type
 2015-09-10 01:13:53 +00:00
Daniel Sandler
c6fa59145e am 847bdf00: am 5b40e225: Merge "Make the vertical navbar 48dp like the horizontal one." into mnc-dr-dev 
* commit '847bdf0093f649a169940fb93249e2beb67f6b45':
  Make the vertical navbar 48dp like the horizontal one.
 2015-09-10 01:13:47 +00:00
Jorim Jaggi
0fb3f695cc am 17076cc2: am 5a9bb951: resolved conflicts for 5d0e02b6 to cw-e-dev 
* commit '17076cc262ff7e6b384bcb7354983c21ac33a8e9':
  Add double-tap power button to open camera 1/2
 2015-09-10 01:06:47 +00:00
Amit Mahajan
5a45dc960b am 0018323c: Merge "Add carrier config variable to hide preferred network type" into mnc-dr-dev 
* commit '0018323c07d119fde7260d66f60dd9987c7b74ea':
  Add carrier config variable to hide preferred network type
 2015-09-10 01:04:43 +00:00
Daniel Sandler
847bdf0093 am 5b40e225: Merge "Make the vertical navbar 48dp like the horizontal one." into mnc-dr-dev 
* commit '5b40e2253e82d46838c88e6c52dee276a781d593':
  Make the vertical navbar 48dp like the horizontal one.
 2015-09-10 01:04:39 +00:00
Jorim Jaggi
17076cc262 am 5a9bb951: resolved conflicts for 5d0e02b6 to cw-e-dev 
* commit '5a9bb9516d016549730d49cddcc2b2ee0e7a4e93':
  Add double-tap power button to open camera 1/2
 2015-09-10 00:57:12 +00:00
Amit Mahajan
0018323c07 Merge "Add carrier config variable to hide preferred network type" into mnc-dr-dev 2015-09-10 00:55:15 +00:00
Daniel Sandler
5b40e2253e Merge "Make the vertical navbar 48dp like the horizontal one." into mnc-dr-dev 2015-09-10 00:53:14 +00:00
Jorim Jaggi
5a9bb9516d resolved conflicts for 5d0e02b6 to cw-e-dev 
Change-Id: Id974d29581304dc644659d1c470b5413d847944b
 2015-09-09 17:49:57 -07:00
Jeff Sharkey
2f12ee7183 am a8831ba8: am 5b9f8dd7: am 2ebbf4c8: Merge "Special interval value to always run benchmarks." into mnc-dr-dev 
* commit 'a8831ba898480354876d7486475885a267c35194':
  Special interval value to always run benchmarks.
 2015-09-10 00:44:20 +00:00
Sungmin Choi
c03a1da5a5 Add carrier config variable to hide preferred network type 
Bug: 23862319
Change-Id: I99403f358f0b53f366083edafc3762f5679b0b45
 2015-09-09 17:42:32 -07:00
Jeff Sharkey
a8831ba898 am 5b9f8dd7: am 2ebbf4c8: Merge "Special interval value to always run benchmarks." into mnc-dr-dev 
* commit '5b9f8dd73fc08ac738002b5259bbfdbae8839b49':
  Special interval value to always run benchmarks.
 2015-09-10 00:36:28 +00:00
Jeff Sharkey
5b9f8dd73f am 2ebbf4c8: Merge "Special interval value to always run benchmarks." into mnc-dr-dev 
* commit '2ebbf4c899b39e080be1ec9cd5d1178f30c0cd89':
  Special interval value to always run benchmarks.
 2015-09-10 00:26:33 +00:00
Jorim Jaggi
5d0e02b64e Merge "Add double-tap power button to open camera 1/2" into mnc-dr-dev 2015-09-10 00:25:59 +00:00
Jorim Jaggi
35a88c065e am f27035d9: am 131d541a: am 16093fe3: Revert "Disable fingerprint after force lock" 
* commit 'f27035d9ee506e4f817ccd49ab60df541c25bbe7':
  Revert "Disable fingerprint after force lock"
 2015-09-10 00:21:30 +00:00
Jeff Sharkey
2ebbf4c899 Merge "Special interval value to always run benchmarks." into mnc-dr-dev 2015-09-10 00:18:43 +00:00
Jorim Jaggi
f27035d9ee am 131d541a: am 16093fe3: Revert "Disable fingerprint after force lock" 
* commit '131d541ae1ca41aacf751f6a6562f4f031a4ab35':
  Revert "Disable fingerprint after force lock"
 2015-09-10 00:12:21 +00:00
Jorim Jaggi
131d541ae1 am 16093fe3: Revert "Disable fingerprint after force lock" 
* commit '16093fe3f0d824731a53a264a132504deb08421a':
  Revert "Disable fingerprint after force lock"
 2015-09-10 00:05:38 +00:00
Jorim Jaggi
16093fe3f0 Revert "Disable fingerprint after force lock" 
Bug: 23827042
This reverts commit 0cb50efdc2d3ecaa9f1b2163109e8fff1b23f0e7.

Change-Id: I40251500b2dcf95e63ce39a768e11a50b26fb923
 2015-09-10 00:00:29 +00:00
Adrian Roos
5941c98c64 Add double-tap power button to open camera 1/2 
Bug: 23787555
Change-Id: I052b64748f155c59fbb649b32265f559423a8845
 2015-09-09 16:57:14 -07:00
Hans Boehm
1d8152726b am 58c27e3e: am c0ce6c42: Merge "Reduce risk of memory corruption due to finalization." 
* commit '58c27e3e53ef64072412515792433e570a176f15':
  Reduce risk of memory corruption due to finalization.
 2015-09-09 23:44:37 +00:00
Jeff Sharkey
e83d8a993d Special interval value to always run benchmarks. 
When interval is set of 0, always run benchmarks after every fstrim
pass, which is roughly daily.  We don't actually track the last
benchmark time for internal storage, so this is the best way we have
to enable this.

Also disable benchmarking completely when interval is set to -1.

Bug: 23942769
Change-Id: I11edfda063aac6e927c6cce56567169ebe83cb71
 2015-09-09 15:53:29 -07:00
Hans Boehm
58c27e3e53 am c0ce6c42: Merge "Reduce risk of memory corruption due to finalization." 
* commit 'c0ce6c422cfe089e7a8e209ac924e37bed3ca770':
  Reduce risk of memory corruption due to finalization.
 2015-09-09 22:41:42 +00:00
Selim Cinek
26a11c2856 am d428dc4a: am 12fdaf85: am a4fca2c7: Merge "Fixed a racecondition where the camera would not launch" into mnc-dr-dev 
* commit 'd428dc4a326f1a928875ecda1c12eef445473dc5':
  Fixed a racecondition where the camera would not launch
 2015-09-09 22:30:25 +00:00
Hans Boehm
c0ce6c422c Merge "Reduce risk of memory corruption due to finalization." 2015-09-09 22:28:42 +00:00
Selim Cinek
d428dc4a32 am 12fdaf85: am a4fca2c7: Merge "Fixed a racecondition where the camera would not launch" into mnc-dr-dev 
* commit '12fdaf8589813065d2e8b9873196471ed38c7b80':
  Fixed a racecondition where the camera would not launch
 2015-09-09 22:23:20 +00:00
Selim Cinek
12fdaf8589 am a4fca2c7: Merge "Fixed a racecondition where the camera would not launch" into mnc-dr-dev 
* commit 'a4fca2c7255367b96fc8012b0fcb62a71343e1ff':
  Fixed a racecondition where the camera would not launch
 2015-09-09 22:15:55 +00:00
Selim Cinek
a4fca2c725 Merge "Fixed a racecondition where the camera would not launch" into mnc-dr-dev 2015-09-09 22:07:02 +00:00
Jorim Jaggi
463bf7cc36 am 46154b8f: am b5304547: am 5e354223: Use AlarmManager for lockout reset 
* commit '46154b8fa50c4e8176225981500ad95a5b667cea':
  Use AlarmManager for lockout reset
 2015-09-09 21:48:23 +00:00
Jorim Jaggi
46154b8fa5 am b5304547: am 5e354223: Use AlarmManager for lockout reset 
* commit 'b53045476ce228d510b045276f84f004d3b9eeb8':
  Use AlarmManager for lockout reset
 2015-09-09 21:00:49 +00:00
Jorim Jaggi
b53045476c am 5e354223: Use AlarmManager for lockout reset 
* commit '5e354223d817477efac9a6a2e3ce3d9161e046a4':
  Use AlarmManager for lockout reset
 2015-09-09 20:54:42 +00:00
Jorim Jaggi
5e354223d8 Use AlarmManager for lockout reset 
So the lockout reset exactly fires after 30 seconds, independent
of whether the device was in deep sleep.

Bug: 23668918
Change-Id: Idea1a877c395897c1fd075cf98edf41c8b1f4082
 2015-09-09 20:41:11 +00:00