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

153696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
c2babb4c3f am 4baf5efe: am 1e1c328f: am 4de668bc: Merge "Additional changes to improve performance when loading Recents. (Bug 16987565)" into lmp-dev 
* commit '4baf5efe9362ec8aae1845ec71987ac542d69ea0':
  Additional changes to improve performance when loading Recents. (Bug 16987565)
 2014-08-27 21:51:30 +00:00
Alan Viverette
e6dc3c6cf6 am 0d05c9d5: am f467b7c0: am 738aeaf4: Merge "Fix NPE in RippleDrawable" into lmp-dev 
* commit '0d05c9d598c08cfbd3ead4af96007a0815551427':
  Fix NPE in RippleDrawable
 2014-08-27 21:51:25 +00:00
Alan Viverette
659156b8d1 am 7fe5136e: am 7d5bbea6: am 11e73661: Merge "Rename Spinner.Form to Spinner.Underlined, make Alert theme public" into lmp-dev 
* commit '7fe5136e77835d00a5f1d345b9b608fec73a60fe':
  Rename Spinner.Form to Spinner.Underlined, make Alert theme public
 2014-08-27 21:51:20 +00:00
John Spurlock
851ab781d3 am d0aecfc0: am 8354e284: am 98a354d4: Merge "Doze: Null check in NotificationContentView.mContractedChild." into lmp-dev 
* commit 'd0aecfc08a7339b555094182e8425ec89ab5da82':
  Doze: Null check in NotificationContentView.mContractedChild.
 2014-08-27 21:51:15 +00:00
Eino-Ville Talvala
33bf20f3ef am 0d09fda1: am 4046697e: am 579442e8: Merge "Camera2: Correct error handling" into lmp-dev 
* commit '0d09fda101e557f2e8894746d14f8a190f2a1af0':
  Camera2: Correct error handling
 2014-08-27 21:51:05 +00:00
Winson Chung
275720fe43 am 1e1c328f: am 4de668bc: Merge "Additional changes to improve performance when loading Recents. (Bug 16987565)" into lmp-dev 
* commit '1e1c328f9e9605e8eed1e9729067dfd702fb4f81':
  Additional changes to improve performance when loading Recents. (Bug 16987565)
 2014-08-27 21:36:24 +00:00
Alan Viverette
6d2f4977e0 am f467b7c0: am 738aeaf4: Merge "Fix NPE in RippleDrawable" into lmp-dev 
* commit 'f467b7c0e434902a48d9c459c4d4de0279e8f160':
  Fix NPE in RippleDrawable
 2014-08-27 21:36:18 +00:00
Alan Viverette
66d9747da1 am 7d5bbea6: am 11e73661: Merge "Rename Spinner.Form to Spinner.Underlined, make Alert theme public" into lmp-dev 
* commit '7d5bbea6bf76a705cd9d6d3d0cdfad18169440bf':
  Rename Spinner.Form to Spinner.Underlined, make Alert theme public
 2014-08-27 21:36:12 +00:00
John Spurlock
2f47f7fc40 am 8354e284: am 98a354d4: Merge "Doze: Null check in NotificationContentView.mContractedChild." into lmp-dev 
* commit '8354e2846d962b054c85832b62b621bd8ae1ff48':
  Doze: Null check in NotificationContentView.mContractedChild.
 2014-08-27 21:35:55 +00:00
Eino-Ville Talvala
bf8a6d77b0 am 4046697e: am 579442e8: Merge "Camera2: Correct error handling" into lmp-dev 
* commit '4046697e3a6b409e8bcd76a06b3d457814c8f444':
  Camera2: Correct error handling
 2014-08-27 21:35:42 +00:00
Winson Chung
94424fe8fb am 4de668bc: Merge "Additional changes to improve performance when loading Recents. (Bug 16987565)" into lmp-dev 
* commit '4de668bcb1a03e505e585d43b080029aa2780e5d':
  Additional changes to improve performance when loading Recents. (Bug 16987565)
 2014-08-27 20:17:22 +00:00
Alan Viverette
39698e77a4 am 738aeaf4: Merge "Fix NPE in RippleDrawable" into lmp-dev 
* commit '738aeaf442e0d7928dc795b726a5fac034471d94':
  Fix NPE in RippleDrawable
 2014-08-27 20:11:46 +00:00
Winson Chung
3e97f9d48b Merge "Additional changes to improve performance when loading Recents. (Bug 16987565)" into lmp-dev 2014-08-27 20:09:57 +00:00
Alan Viverette
719da6ba9b Merge "Fix NPE in RippleDrawable" into lmp-dev 2014-08-27 20:04:28 +00:00
Alan Viverette
52315cf17f am 11e73661: Merge "Rename Spinner.Form to Spinner.Underlined, make Alert theme public" into lmp-dev 
* commit '11e73661d71e8616b502f800eca9a7985115e898':
  Rename Spinner.Form to Spinner.Underlined, make Alert theme public
 2014-08-27 19:57:54 +00:00
Alan Viverette
12c75ab730 Merge "Rename Spinner.Form to Spinner.Underlined, make Alert theme public" into lmp-dev 2014-08-27 19:44:37 +00:00
Alan Viverette
d890c13981 Rename Spinner.Form to Spinner.Underlined, make Alert theme public 
BUG: 17286794
BUG: 17295515
Change-Id: I010bb1591f7690dbc40020d3fdd413f8e1bd8547
 2014-08-27 12:28:18 -07:00
John Spurlock
2b0dcd43db am 98a354d4: Merge "Doze: Null check in NotificationContentView.mContractedChild." into lmp-dev 
* commit '98a354d4619cc90bd0ef3417fbe2bc9165d4496d':
  Doze: Null check in NotificationContentView.mContractedChild.
 2014-08-27 19:25:30 +00:00
John Spurlock
2cd88d7512 Merge "Doze: Null check in NotificationContentView.mContractedChild." into lmp-dev 2014-08-27 19:15:03 +00:00
Winson Chung
ebfc698182 Additional changes to improve performance when loading Recents. (Bug 16987565) 
- Ensuring that we consistently load activity icon, title and color for both full and shallow stacks
- Adding activity info caches when loading the stacks
- Should not be scaling pin icon when launching from pin
- Tweaking snap-back, over scroll, and shadows

Change-Id: I556b93562bb2c69e4c25ce787a7a34532ab706ca
 2014-08-27 19:07:36 +00:00
Eino-Ville Talvala
e7f72cca40 am 579442e8: Merge "Camera2: Correct error handling" into lmp-dev 
* commit '579442e87e9737f424663d01e163cbc23b1346d1':
  Camera2: Correct error handling
 2014-08-27 18:58:42 +00:00
John Spurlock
c3dfd32843 Doze: Null check in NotificationContentView.mContractedChild. 
Bug: 17247547
Change-Id: Iede5d0cd88db4e293e583f3a3c324354eb6d594e
 2014-08-27 14:55:54 -04:00
Jean-Michel Trivi
d0ce27a698 am 3fcc7935: am c313bbcb: am 24562d7e: Merge "SoundPool.Builder: document default values" into lmp-dev 
* commit '3fcc7935df26183ce38a64532e2e86a1ec41d47c':
  SoundPool.Builder: document default values
 2014-08-27 18:49:47 +00:00
Eino-Ville Talvala
2227cac5af Merge "Camera2: Correct error handling" into lmp-dev 2014-08-27 18:47:30 +00:00
Jean-Michel Trivi
c7676bb390 am c313bbcb: am 24562d7e: Merge "SoundPool.Builder: document default values" into lmp-dev 
* commit 'c313bbcbd313d682a23ea0cce99be3d1b3da6624':
  SoundPool.Builder: document default values
 2014-08-27 18:41:36 +00:00
Jeff Sharkey
045a7a9b89 am 22f9b2a9: am 542a7796: am 37589a33: Merge "Recreate lib symlink after deleting app data." into lmp-dev 
* commit '22f9b2a9d1256f0ea397f12b4e3095fddcf4da7d':
  Recreate lib symlink after deleting app data.
 2014-08-27 18:30:40 +00:00
Jeff Sharkey
71629cd9d0 am 3b7af7c4: am bfe28603: am 31d0207a: Merge "Clear pending operation flag when move failed." into lmp-dev 
* commit '3b7af7c4ec06d73c9a22c96cb8f78a71f7e67b73':
  Clear pending operation flag when move failed.
 2014-08-27 18:30:30 +00:00
Jean-Michel Trivi
acf19975d2 am 24562d7e: Merge "SoundPool.Builder: document default values" into lmp-dev 
* commit '24562d7e5c73c6be3225eff1f53ca4ffa94f09e0':
  SoundPool.Builder: document default values
 2014-08-27 18:29:36 +00:00
Jean-Michel Trivi
c0dce273a8 Merge "SoundPool.Builder: document default values" into lmp-dev 2014-08-27 18:23:00 +00:00
Jeff Sharkey
b80fa969e6 am 542a7796: am 37589a33: Merge "Recreate lib symlink after deleting app data." into lmp-dev 
* commit '542a77966963147f7b8d4705275628737fa176a0':
  Recreate lib symlink after deleting app data.
 2014-08-27 18:21:48 +00:00
Jeff Sharkey
5bb8bc4754 am bfe28603: am 31d0207a: Merge "Clear pending operation flag when move failed." into lmp-dev 
* commit 'bfe28603b7ac6a5faf071fe30bbd1c9272fc69e3':
  Clear pending operation flag when move failed.
 2014-08-27 18:21:43 +00:00
Amith Yamasani
61819d4552 am 22a11865: am 8f3e59d6: am e656975c: Merge "Fix incorrect reading of multichoice app restrictions" into lmp-dev 
* commit '22a11865cd6b6aa211217cec070343ad69ffc9a8':
  Fix incorrect reading of multichoice app restrictions
 2014-08-27 18:17:55 +00:00
Eino-Ville Talvala
acc0095bc8 Camera2: Correct error handling 
- Report capture failures from service to application
- Only go to error state for device-level errors
- Adjust binder interface method names to match the service side names
- Reduce failed session creation logging
- Don't fire CaptureSession.onActive for CameraDevice.onBusy
- Check with session to determine capture failure reason

Bug: 17160301
Bug: 15524101
Bug: 14448494
Bug: 11272459

Change-Id: I9dd606004fd7845910dc865738fbe17f1640f07d
 2014-08-27 11:08:18 -07:00
Craig Mautner
8c458e2f95 am 273355f2: am ece9e05d: am b46e78f9: Merge "Revert "Debug for 13924095."" into lmp-dev 
* commit '273355f25f7adb4b4302bdf2bccb04fc49ded9a3':
  Revert "Debug for 13924095."
 2014-08-27 18:08:09 +00:00
Amith Yamasani
1c9a6a965c am 8f3e59d6: am e656975c: Merge "Fix incorrect reading of multichoice app restrictions" into lmp-dev 
* commit '8f3e59d674c1766e1566f7b28ebbe175aacdc19e':
  Fix incorrect reading of multichoice app restrictions
 2014-08-27 18:07:42 +00:00
Jeff Sharkey
73306fda9d am 37589a33: Merge "Recreate lib symlink after deleting app data." into lmp-dev 
* commit '37589a33e8abb534b931b0246143c85f5b4fbb75':
  Recreate lib symlink after deleting app data.
 2014-08-27 18:05:33 +00:00
Jeff Sharkey
da84da1e2e am 31d0207a: Merge "Clear pending operation flag when move failed." into lmp-dev 
* commit '31d0207abfbfe15a63028010e0d5230268b94a52':
  Clear pending operation flag when move failed.
 2014-08-27 18:05:28 +00:00
Jeff Sharkey
a9bdc43ec2 Merge "Recreate lib symlink after deleting app data." into lmp-dev 2014-08-27 17:58:38 +00:00
Jeff Sharkey
d1caf731e4 Merge "Clear pending operation flag when move failed." into lmp-dev 2014-08-27 17:58:17 +00:00
Craig Mautner
5f713a86cb am 083f3569: am f9af796e: am a1ca6e00: Merge "When adding an apptoken skip over removed ones." into lmp-dev 
* commit '083f3569b15b519058e9a136b3680eff673184b4':
  When adding an apptoken skip over removed ones.
 2014-08-27 17:55:40 +00:00
Christopher Tate
bbf98383ff am 155b3a08: am ef89d312: am 96c09773: Merge "Remember having done full-data as well as key/value app backups" into lmp-dev 
* commit '155b3a08eb8eb2575a2cd06d5c8e3c31adb224dd':
  Remember having done full-data as well as key/value app backups
 2014-08-27 17:55:36 +00:00
Craig Mautner
093d4cf542 am ece9e05d: am b46e78f9: Merge "Revert "Debug for 13924095."" into lmp-dev 
* commit 'ece9e05dd4b36ca8eafbbea4c875de84c5c79695':
  Revert "Debug for 13924095."
 2014-08-27 17:55:35 +00:00
Amith Yamasani
0d140b5f4a am e656975c: Merge "Fix incorrect reading of multichoice app restrictions" into lmp-dev 
* commit 'e656975cb7be7e883badf3257a2d66b6e664f5e0':
  Fix incorrect reading of multichoice app restrictions
 2014-08-27 17:52:15 +00:00
Jeff Sharkey
c521221740 Recreate lib symlink after deleting app data. 
Bug: 16739202
Change-Id: Ie8dccf67feaf6dfa474d52a3cda0862b952e6762
 2014-08-27 10:47:19 -07:00
Craig Mautner
d28e611436 am b46e78f9: Merge "Revert "Debug for 13924095."" into lmp-dev 
* commit 'b46e78f9e04dc7a292be2a3f50d72dc453a2891b':
  Revert "Debug for 13924095."
 2014-08-27 17:40:57 +00:00
Amith Yamasani
032402cff1 Merge "Fix incorrect reading of multichoice app restrictions" into lmp-dev 2014-08-27 17:39:29 +00:00
Craig Mautner
fb3fdb9495 am f9af796e: am a1ca6e00: Merge "When adding an apptoken skip over removed ones." into lmp-dev 
* commit 'f9af796e5ae81a7eb7775d36d6f8278af0fa9920':
  When adding an apptoken skip over removed ones.
 2014-08-27 17:38:50 +00:00
Christopher Tate
5a27424d4e am ef89d312: am 96c09773: Merge "Remember having done full-data as well as key/value app backups" into lmp-dev 
* commit 'ef89d312499a8332e2d1e7f882a1740448f00f5f':
  Remember having done full-data as well as key/value app backups
 2014-08-27 17:38:44 +00:00
Amith Yamasani
e084039dd2 Fix incorrect reading of multichoice app restrictions 
Clear the list of choices values before putting new ones in.

Bug: 17299310
Change-Id: I01051d1703adcbdd7d0b5fb4ee423404f98489e8
 2014-08-27 10:33:17 -07:00
Craig Mautner
d4b325a82b Merge "Revert "Debug for 13924095."" into lmp-dev 2014-08-27 17:29:58 +00:00