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

12143 Commits

Author SHA1 Message Date
Adrian Roos
7850cb330f am 0c458aa5: am 7356a713: Merge "Keyguard: Show IME automatically on tablets" into lmp-mr1-dev 
* commit '0c458aa5158245fef31c78b84be28e574cf8515e':
  Keyguard: Show IME automatically on tablets
 2014-10-20 15:25:27 +00:00
Adrian Roos
0c458aa515 am 7356a713: Merge "Keyguard: Show IME automatically on tablets" into lmp-mr1-dev 
* commit '7356a7137306a32e690376a46ecf9a5f5443dba0':
  Keyguard: Show IME automatically on tablets
 2014-10-20 15:20:59 +00:00
Adrian Roos
7356a71373 Merge "Keyguard: Show IME automatically on tablets" into lmp-mr1-dev 2014-10-20 15:17:00 +00:00
Adrian Roos
25cfac62b9 am cfc32485: am f4f36166: am 45f64af8: am 9c5896b8: Merge "Always execute resumeAppSwitches when launching something" into lmp-dev 
* commit 'cfc32485ce2c511a1b2eb5ca54850ac3017e5a5a':
  Always execute resumeAppSwitches when launching something
 2014-10-20 13:21:11 +00:00
Adrian Roos
cfc32485ce am f4f36166: am 45f64af8: am 9c5896b8: Merge "Always execute resumeAppSwitches when launching something" into lmp-dev 
* commit 'f4f36166b0664cf9887c550b15976bf074dcd042':
  Always execute resumeAppSwitches when launching something
 2014-10-20 13:16:09 +00:00
Adrian Roos
f4f36166b0 am 45f64af8: am 9c5896b8: Merge "Always execute resumeAppSwitches when launching something" into lmp-dev 
* commit '45f64af8f238bc502f6278bef1a57b3d684b227e':
  Always execute resumeAppSwitches when launching something
 2014-10-20 13:11:42 +00:00
Adrian Roos
45f64af8f2 am 9c5896b8: Merge "Always execute resumeAppSwitches when launching something" into lmp-dev 
* commit '9c5896b808f77295aa5cd09cb37ad01bccd7994c':
  Always execute resumeAppSwitches when launching something
 2014-10-20 13:04:00 +00:00
Adrian Roos
9c5896b808 Merge "Always execute resumeAppSwitches when launching something" into lmp-dev 2014-10-20 12:59:00 +00:00
Baligh Uddin
a4cbfb822e Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-19 22:11:39 +00:00
Baligh Uddin
3b7e7817c5 Import translations. DO NOT MERGE 
Change-Id: Ie58f06a42538d4d68cd07c8bf92a4a7104d01a1a
Auto-generated-cl: translation import
 2014-10-19 13:18:18 -07:00
Baligh Uddin
4199680a9d Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-19 19:46:09 +00:00
Baligh Uddin
7fda5c91e5 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-19 19:46:09 +00:00
Baligh Uddin
cfccba99a2 Import translations. DO NOT MERGE 
Change-Id: I53740eab00c3d795b9e7514e079bc2a74b557d95
Auto-generated-cl: translation import
 2014-10-19 10:56:51 -07:00
Baligh Uddin
b18d26738d Import translations. DO NOT MERGE 
Change-Id: Ia00d92d408a620fb80268de3413c2299c9f9ed18
Auto-generated-cl: translation import
 2014-10-19 10:52:12 -07:00
Baligh Uddin
7d369a6d5b Import translations. DO NOT MERGE 
Change-Id: I4ab5446cb270035eae9fce5bad1652ca57c9c5d8
Auto-generated-cl: translation import
 2014-10-19 10:50:27 -07:00
Jorim Jaggi
89f7f281e3 Always execute resumeAppSwitches when launching something 
Bug: 18024449
Change-Id: Ib5ea92d141d74676d00fd3118930bdb0ef5b2935
 2014-10-17 19:57:38 +02:00
John Spurlock
c64630d013 am cd9ec79b: am 6daac003: Merge "PowerUI: Uncategorize battery notifications as _SYSTEM." into lmp-mr1-dev 
* commit 'cd9ec79b10d335e964ce4a43be4ea962bbe171bf':
  PowerUI: Uncategorize battery notifications as _SYSTEM.
 2014-10-17 16:49:27 +00:00
John Spurlock
cd9ec79b10 am 6daac003: Merge "PowerUI: Uncategorize battery notifications as _SYSTEM." into lmp-mr1-dev 
* commit '6daac00331fa79d8ab249ef148a8116e58ca9a56':
  PowerUI: Uncategorize battery notifications as _SYSTEM.
 2014-10-17 16:43:42 +00:00
John Spurlock
6daac00331 Merge "PowerUI: Uncategorize battery notifications as _SYSTEM." into lmp-mr1-dev 2014-10-17 16:39:21 +00:00
John Spurlock
3cf316f71d am 0f0ee577: am 289d797a: QS: 7 day timeout for color-inversion tile. 
* commit '0f0ee577f64d7fed31ba2688fb58f607abc22a39':
  QS: 7 day timeout for color-inversion tile.
 2014-10-17 16:25:48 +00:00
John Spurlock
0f0ee577f6 am 289d797a: QS: 7 day timeout for color-inversion tile. 
* commit '289d797a6a748cfc7dcca8c815fab6c37061bf05':
  QS: 7 day timeout for color-inversion tile.
 2014-10-17 16:20:48 +00:00
John Spurlock
5b038b4b2b PowerUI: Uncategorize battery notifications as _SYSTEM. 
So they don't interrupt in priority mode.

Bug: 17691121
Change-Id: I51757c0275ec461a786d1e254b0e71f7b27b5029
 2014-10-17 12:16:57 -04:00
John Spurlock
289d797a6a QS: 7 day timeout for color-inversion tile. 
Bug: 17631628
Change-Id: I4f8a6ce3ea1f79d696686760732c3e8216bfb6c4
 2014-10-17 12:06:38 -04:00
Neil Fuller
3b96bfb103 am 9b0109eb: am c7aa8fe6: Merge "Removing some more FloatMath references" 
* commit '9b0109eb051fcf0a7ad801d03e73aa4e0bf2d7a7':
  Removing some more FloatMath references
 2014-10-17 14:59:48 +00:00
Adrian Roos
195e631960 Keyguard: Show IME automatically on tablets 
Also removes the legacy bool from the core resources.

Bug: 17757057
Change-Id: I5f19e43f413599430b648c3b8763d19a9fc07a91
 2014-10-16 17:28:04 +02:00
Geoff Mendal
fb0356852d Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-16 01:48:42 +00:00
Geoff Mendal
a2ac1ade83 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-16 01:48:29 +00:00
Geoff Mendal
ed8fee2e6f Import translations. DO NOT MERGE 
Change-Id: I3cf464b7c94c35965e627353765c4ef649c2a209
Auto-generated-cl: translation import
 2014-10-15 18:47:17 -07:00
Geoff Mendal
062ddcd116 Import translations. DO NOT MERGE 
Change-Id: I245fdc0e9d1b88231970e945521aaf2813a97b44
Auto-generated-cl: translation import
 2014-10-15 18:44:21 -07:00
Geoff Mendal
79469425a1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-16 01:43:51 +00:00
Geoff Mendal
750305b534 Import translations. DO NOT MERGE 
Change-Id: I298dbca14148e723e574c299e6ee1d3aebd9b56c
Auto-generated-cl: translation import
 2014-10-15 18:40:57 -07:00
Geoff Mendal
c71a7b3cb8 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-16 01:35:18 +00:00
Geoff Mendal
874633e378 Import translations. DO NOT MERGE 
Change-Id: Ifa43307e6081aa5fae63beb7756b583edf936c72
Auto-generated-cl: translation import
 2014-10-15 18:34:07 -07:00
Geoff Mendal
cc29c5ef82 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-16 00:21:26 +00:00
Geoff Mendal
5e14dc8426 Import translations. DO NOT MERGE 
Change-Id: I1232fd67bffa5401e778116a418bbc20902f2723
Auto-generated-cl: translation import
 2014-10-15 17:16:40 -07:00
Libin.Tang@motorola.com
c28147490a am 4798bca2: am 0499bb5d: IMS:change enhanced 4g setting to store in setting db. 
* commit '4798bca2742a3e2ec7e13aa20a61fc447eadf29b':
  IMS:change enhanced 4g setting to store in setting db.
 2014-10-15 23:56:23 +00:00
Tom Taylor
522fe28e3d am 6d4f4575: Merge "Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager" into lmp-dev 
* commit '6d4f4575463ef5fdcdfbf3118a893ecbdb14a02b':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-10-15 23:15:26 +00:00
Libin.Tang@motorola.com
0499bb5de4 IMS:change enhanced 4g setting to store in setting db. 
Change-Id: I2ec37478e2bef5b15b157e490f75d5dda5f97117
 2014-10-15 16:12:39 -07:00
Tom Taylor
48ed835468 Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager 
Bug 17969135

Use query (instead of rawQuery) and pass in arguments instead of building
the query with a giant string. Add a unit test that fails with the old
code but passes with the new code.

Change-Id: Id04a1db6fb95fcd923e1f36f5ab3b94402590918
 2014-10-15 10:20:17 -07:00
Neil Fuller
6de42dac43 Removing some more FloatMath references 
See frameworks/base commit 33253a4baa6279f81a73425b49dfb6abe5f5416e
for details.

Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: I46d4ee4c4be7972e3bcc6782fb50f024b6fff1ee
 2014-10-15 11:45:45 +01:00
Tom Taylor
a51fa5dd9c am ec10c016: am e1b2fc5c: Merge "Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager" into lmp-mr1-dev 
* commit 'ec10c016cc082eb79c6ebc61505f4c0c6d1f179d':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
 2014-10-15 02:09:03 +00:00
Winson Chung
cbd99dd853 am a4ef863c: am f4d065e5: Merge "Fixing regression with screen pinning button not animating for the first task. (Bug 17985087)" into lmp-mr1-dev 
* commit 'a4ef863c753e6756027c44a539ac02144ce614f9':
  Fixing regression with screen pinning button not animating for the first task. (Bug 17985087)
 2014-10-15 02:08:01 +00:00
Winson Chung
c0faa99307 am c6fe2b51: am db8d39f8: Merge "Fixing issue with excluded tasks sometimes showing in Recents. (Bug 17875770)" into lmp-mr1-dev 
* commit 'c6fe2b519316e7d234b303d0511fbaffc7f0be3b':
  Fixing issue with excluded tasks sometimes showing in Recents. (Bug 17875770)
 2014-10-15 02:07:54 +00:00
Jason Monk
048a2d3c71 am 417bc6cc: am 68cb9fcc: am a1a0131a: am f97e71a6: Merge "Update screen pinning and recents strings to say Overview" into lmp-dev 
* commit '417bc6cc5fdfc6f5c80016cf1b848268605acf11':
  Update screen pinning and recents strings to say Overview
 2014-10-15 02:07:48 +00:00
Winson Chung
c76ad871ba am 29d82bbf: am 799819af: Merge "Removing unused/dead code related to footer and screenshot transition." into lmp-mr1-dev 
* commit '29d82bbfc9f91ff87f7d71220f831e351bd2c0da':
  Removing unused/dead code related to footer and screenshot transition.
 2014-10-15 02:07:41 +00:00
Winson Chung
1a97602f14 am 744d25e0: am 669eef66: Merge "Adding mouse wheel support. (Bug 17323718)" into lmp-mr1-dev 
* commit '744d25e0e3b75c8beba6f9a8e94d949b8f21d922':
  Adding mouse wheel support. (Bug 17323718)
 2014-10-15 02:07:28 +00:00
Selim Cinek
9f6c886717 am 4c8ce9f2: am 8da1ef2f: am 351ec77b: am cedb6dc7: Merge "Fixed a bug when double tapping a notification in the normal shade" into lmp-dev 
* commit '4c8ce9f22db9900594844e4e1206865c601f77d1':
  Fixed a bug when double tapping a notification in the normal shade
 2014-10-15 02:07:21 +00:00
Svetoslav
4e3b2426ac am a23ad0b7: am 0c8e15c0: am 60cdb909: am 0a1ffdb3: Merge "Handle if the printing app is killed while saving to PDF." into lmp-dev 
* commit 'a23ad0b7dd159e7fb0e8c2ff6b86683c7da6225e':
  Handle if the printing app is killed while saving to PDF.
 2014-10-15 02:07:02 +00:00
Tom Taylor
e1b2fc5c2a Merge "Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager" into lmp-mr1-dev 2014-10-14 23:15:10 +00:00
Winson Chung
f4d065e586 Merge "Fixing regression with screen pinning button not animating for the first task. (Bug 17985087)" into lmp-mr1-dev 2014-10-14 22:54:14 +00:00