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

12105 Commits

Author SHA1 Message Date
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
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
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
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
Selim Cinek
cedb6dc7f2 Merge "Fixed a bug when double tapping a notification in the normal shade" into lmp-dev 2014-10-14 22:28:25 +00:00
Svetoslav
0c8e15c016 am 60cdb909: am 0a1ffdb3: Merge "Handle if the printing app is killed while saving to PDF." into lmp-dev 
* commit '60cdb909304f0d4b93a1a17228bdcc888f16cf41':
  Handle if the printing app is killed while saving to PDF.
 2014-10-14 22:21:45 +00:00
Svetoslav
60cdb90930 am 0a1ffdb3: Merge "Handle if the printing app is killed while saving to PDF." into lmp-dev 
* commit '0a1ffdb3f89705eeeb89349fcd31c82b2d15b0a5':
  Handle if the printing app is killed while saving to PDF.
 2014-10-14 22:15:26 +00:00
Tom Taylor
790ac852b3 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-14 21:45:22 +00:00
Svetoslav
05e041b013 Handle if the printing app is killed while saving to PDF. 
When saving to PDF we bring up the file picker UI which covers
the print UI. In this case the printing app may get killed as
it is not in the forground (the system is bound to the print
spooler so it cannot get killed). If that happens we are ending
up with an empty file. However, if the file chooser UI is up
we already have everything from the app we need and it dying
does not matter. This change takes care if ignoring printing
app death while saving to PDF.

bug:17922948

Change-Id: I10d808e3c3e93e850dbc2a948f2482381a887928
 2014-10-14 14:16:12 -07:00
Jason Monk
cdc459feb2 Update screen pinning and recents strings to say Overview 
Bug: 17969466
Bug: 17970142
Change-Id: I76cd934ea6d67f36609fdc53ca1d195fcb7dcfbe
 2014-10-14 15:10:10 -04:00
Winson Chung
606b3da71a Removing unused/dead code related to footer and screenshot transition. 
Change-Id: I205de9047413d1ff2da68cdd062eeba59267b10f
 2014-10-14 11:32:51 -07:00
Winson Chung
d213a1e53c Adding mouse wheel support. (Bug 17323718) 
Change-Id: I51bf159369983789933767813bbf8a785ff1bda3
 2014-10-14 11:31:05 -07:00
Jeff Sharkey
7d5e9455f4 am 86195bd9: am 1229d266: am c4d774d5: am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev 
* commit '86195bd9a39436a9dc39de782e20892f51cf7397':
  DocumentsUI: Add content description for nav.
 2014-10-14 17:22:40 +00:00
Selim Cinek
02af41efe5 Fixed a bug when double tapping a notification in the normal shade 
This fixes that sometimes holes where created when grabbing the panel while
closing the shade (eg. double tapping) or the notifications did not disappear.
It could also happen when using the clear all button.

Bug: 17969040
Bug: 17899136
Bug: 17961295
Bug: 17551216
Change-Id: Id7aa37bbcbae504039f90686e2bc364d18685205
 2014-10-14 15:46:43 +02:00
Jeff Sharkey
1229d266f6 am c4d774d5: am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev 
* commit 'c4d774d5d87439180eed0be45eb2242f8bf7cfaa':
  DocumentsUI: Add content description for nav.
 2014-10-13 22:08:35 +00:00
Jeff Sharkey
c4d774d5d8 am 461b3896: Merge "DocumentsUI: Add content description for nav." into lmp-dev 
* commit '461b3896babdbfb365282378df89cde2dddb5a3a':
  DocumentsUI: Add content description for nav.
 2014-10-13 22:04:06 +00:00
Jeff Sharkey
b7b30f691c DocumentsUI: Add content description for nav. 
Bug: 17922955
Change-Id: I44c0107d8dd03aab36da55deeb864e328b492124
 2014-10-13 12:55:18 -07:00
Geoff Mendal
aaefa5963e Import translations. DO NOT MERGE 
Change-Id: I089e715e2d5e9c3533ddfbcd9a8773e5d4badd86
Auto-generated-cl: translation import
 2014-10-13 10:15:50 -07:00
Geoff Mendal
b54c175e32 Import translations. DO NOT MERGE 
Change-Id: I6ee9fab7b3887858319cb14b34a19062d72cd6b3
Auto-generated-cl: translation import
 2014-10-13 10:08:58 -07:00
Geoff Mendal
84323907e4 Import translations. DO NOT MERGE 
Change-Id: I0248efd41328adc6acd19fb84131fc4d7606b774
Auto-generated-cl: translation import
 2014-10-13 10:05:28 -07:00
Selim Cinek
f8574f865b am 6e46a99f: am 3b0169ae: am a07421c6: am 2c461def: Merge "Fixed missing translation for wallpaper cropper" into lmp-dev 
* commit '6e46a99fa5bbe3214a7adc56a301aa65ba436417':
  Fixed missing translation for wallpaper cropper
 2014-10-10 23:21:10 +00:00
Selim Cinek
acb677ad9d am 0c5daf09: am b7981719: am 5c401a0e: am 3e683b6a: Merge "Fixed a bug where the panel got into a wrong state" into lmp-dev 
* commit '0c5daf097880dd44ff74bc7f0f1625518b43a3de':
  Fixed a bug where the panel got into a wrong state
 2014-10-10 23:20:57 +00:00
Selim Cinek
6e46a99fa5 am 3b0169ae: am a07421c6: am 2c461def: Merge "Fixed missing translation for wallpaper cropper" into lmp-dev 
* commit '3b0169aec357f265c90f9304ef0a979ff9da10c7':
  Fixed missing translation for wallpaper cropper
 2014-10-10 23:06:22 +00:00
Selim Cinek
0c5daf0978 am b7981719: am 5c401a0e: am 3e683b6a: Merge "Fixed a bug where the panel got into a wrong state" into lmp-dev 
* commit 'b7981719b0d49610002205e956688fd9de66318a':
  Fixed a bug where the panel got into a wrong state
 2014-10-10 23:06:09 +00:00
Selim Cinek
3b0169aec3 am a07421c6: am 2c461def: Merge "Fixed missing translation for wallpaper cropper" into lmp-dev 
* commit 'a07421c6dbcc1e34d9c91a416cf0dd2255c79701':
  Fixed missing translation for wallpaper cropper
 2014-10-10 22:53:58 +00:00
Selim Cinek
b7981719b0 am 5c401a0e: am 3e683b6a: Merge "Fixed a bug where the panel got into a wrong state" into lmp-dev 
* commit '5c401a0e0bf3b5f647f7f1791e10195f748bfe96':
  Fixed a bug where the panel got into a wrong state
 2014-10-10 22:53:07 +00:00
Selim Cinek
a07421c6db am 2c461def: Merge "Fixed missing translation for wallpaper cropper" into lmp-dev 
* commit '2c461def93f235d3a7853851ee125cb3caaf2955':
  Fixed missing translation for wallpaper cropper
 2014-10-10 21:18:32 +00:00
Selim Cinek
2c461def93 Merge "Fixed missing translation for wallpaper cropper" into lmp-dev 2014-10-10 21:14:34 +00:00
Selim Cinek
b7cde675a2 Fixed missing translation for wallpaper cropper 
Also a fixed a small visibility issue.

Bug: 17927204
Change-Id: Ia9566fe8fe0c70f83edc295b0bf8317e94eb85fe
 2014-10-10 13:55:36 -07:00
Selim Cinek
5c401a0e0b am 3e683b6a: Merge "Fixed a bug where the panel got into a wrong state" into lmp-dev 
* commit '3e683b6a0f40e176ba9ffce652939ecef23b9dc2':
  Fixed a bug where the panel got into a wrong state
 2014-10-10 18:53:10 +00:00
Selim Cinek
3e683b6a0f Merge "Fixed a bug where the panel got into a wrong state" into lmp-dev 2014-10-10 18:49:12 +00:00
Selim Cinek
9344ddf1a0 am bb3627bd: am bedae0db: am 3e056aa0: am f9df9dd8: Merge "Fixed an issue where the notification could become transparent" into lmp-dev 
* commit 'bb3627bd7d7dec2c09bd6650a61b371e735e1d02':
  Fixed an issue where the notification could become transparent
 2014-10-10 17:15:03 +00:00