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

11242 Commits

Author SHA1 Message Date
Geoff Mendal
9109f8e95d Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-20 16:58:58 +00:00
Geoff Mendal
f0c7b8dc7a Import translations. DO NOT MERGE 
Change-Id: I53e488509722672fcc9635d67189e5126b49ca1f
Auto-generated-cl: translation import
 2014-10-20 09:40:04 -07:00
Adrian Roos
0f36afb83b am 0b3036a5: Merge "Fix issues with TrustDrawable" into lmp-mr1-dev 
* commit '0b3036a5a06e0c42e9d099be3a7108ccc5a69031':
  Fix issues with TrustDrawable
 2014-10-20 15:25:13 +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
0b3036a5a0 Merge "Fix issues with TrustDrawable" into lmp-mr1-dev 2014-10-20 15:19:14 +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
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
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
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
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
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
Adrian Roos
1540da4624 Fix issues with TrustDrawable 
Ensures that the drawable is invalidated whenever the state changes.
Also moves the mAnimating check such that we never update state when
the animation is stopped.

Bug: 17915865
Change-Id: I299597e08d4bac9a5551686cd5d987138e4b3c47
 2014-10-15 15:37:59 +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
Winson Chung
ca8686af74 Fixing regression with screen pinning button not animating for the first task. (Bug 17985087) 
Change-Id: I81b8b5d6521c99023bbaf903d1bfb95015fbe756
 2014-10-14 15:53:45 -07:00
Winson Chung
db8d39f8e3 Merge "Fixing issue with excluded tasks sometimes showing in Recents. (Bug 17875770)" into lmp-mr1-dev 2014-10-14 22:53:05 +00:00
Winson Chung
38e957153c Fixing issue with excluded tasks sometimes showing in Recents. (Bug 17875770) 
Change-Id: Ie94d485580db271256581e2a9f277fe38387d45c
 2014-10-14 15:52:16 -07:00
Jason Monk
68cb9fccc0 am a1a0131a: am f97e71a6: Merge "Update screen pinning and recents strings to say Overview" into lmp-dev 
* commit 'a1a0131a4adf8fa701a6a25488e1eb13f82dc2c2':
  Update screen pinning and recents strings to say Overview
 2014-10-14 22:51:48 +00:00
Winson Chung
799819af74 Merge "Removing unused/dead code related to footer and screenshot transition." into lmp-mr1-dev 2014-10-14 22:50:31 +00:00
Jason Monk
a1a0131a4a am f97e71a6: Merge "Update screen pinning and recents strings to say Overview" into lmp-dev 
* commit 'f97e71a6ddbaea2ffcba9f528e8cb43ee2ada40a':
  Update screen pinning and recents strings to say Overview
 2014-10-14 22:47:21 +00:00
Winson Chung
669eef661d Merge "Adding mouse wheel support. (Bug 17323718)" into lmp-mr1-dev 2014-10-14 22:47:13 +00:00
Jason Monk
f97e71a6dd Merge "Update screen pinning and recents strings to say Overview" into lmp-dev 2014-10-14 22:42:55 +00:00
Selim Cinek
8da1ef2f5f am 351ec77b: am cedb6dc7: Merge "Fixed a bug when double tapping a notification in the normal shade" into lmp-dev 
* commit '351ec77ba5685e8bad16df87284d9d3aaac159a1':
  Fixed a bug when double tapping a notification in the normal shade
 2014-10-14 22:37:21 +00:00
Selim Cinek
351ec77ba5 am cedb6dc7: Merge "Fixed a bug when double tapping a notification in the normal shade" into lmp-dev 
* commit 'cedb6dc7f2e19120d6889bc681d143bfb2891b80':
  Fixed a bug when double tapping a notification in the normal shade
 2014-10-14 22:31:27 +00:00