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

155790 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
33de8f28e9 am 6c1865dd: am 0973117b: Merge "Fixing issue with stack not being fully centered. (Bug 17015153)" into lmp-dev 
* commit '6c1865dd43c8c4475d77416a16f0da505a736409':
  Fixing issue with stack not being fully centered. (Bug 17015153)
 2014-09-14 10:24:54 +00:00
Qiwen Zhao
8871a037d5 am 55311cba: am 7ca4682e: Merge "GMSCore and Finsky are fixed. Revert "Revert "Set up final resource identifiers.""" into lmp-dev 
* commit '55311cba6f172de942b291996d56b65542e04c13':
  GMSCore and Finsky are fixed. Revert "Revert "Set up final resource identifiers.""
 2014-09-14 10:24:48 +00:00
Winson Chung
9d06d4da5d am 0973117b: Merge "Fixing issue with stack not being fully centered. (Bug 17015153)" into lmp-dev 
* commit '0973117bd59659ddd4151d332fd61e64ca5b1b2f':
  Fixing issue with stack not being fully centered. (Bug 17015153)
 2014-09-14 10:10:37 +00:00
Qiwen Zhao
5d224ddaa1 am 7ca4682e: Merge "GMSCore and Finsky are fixed. Revert "Revert "Set up final resource identifiers.""" into lmp-dev 
* commit '7ca4682e2d4b256b62edca558a6f3a2494d0dcd4':
  GMSCore and Finsky are fixed. Revert "Revert "Set up final resource identifiers.""
 2014-09-14 10:10:29 +00:00
Winson Chung
625f055958 Merge "Fixing issue with stack not being fully centered. (Bug 17015153)" into lmp-dev 2014-09-14 07:12:29 +00:00
Qiwen Zhao
a11757c187 Merge "GMSCore and Finsky are fixed. Revert "Revert "Set up final resource identifiers.""" into lmp-dev 2014-09-14 02:53:32 +00:00
Qiwen Zhao
63c7444bab GMSCore and Finsky are fixed. Revert "Revert "Set up final resource identifiers."" 
This reverts commit c4bc83b7b5f7911bf750544aa8a2211ae6d11fe2.

Change-Id: I484953c5c3b130b3359ef47aca890fa6903917a6
 2014-09-14 02:53:04 +00:00
Adam Lesinski
0176a39cca am 09c04b45: am 93f13b6a: Merge "Fix issue with lifecycle of Activities launched from Lockscreen" into lmp-dev 
* commit '09c04b454a8456395f68c7d0e5b5dde1187a80d3':
  Fix issue with lifecycle of Activities launched from Lockscreen
 2014-09-13 23:40:20 +00:00
Adam Lesinski
c8035614fb am 93f13b6a: Merge "Fix issue with lifecycle of Activities launched from Lockscreen" into lmp-dev 
* commit '93f13b6af86c55d4a489d26580be938ab1fe366d':
  Fix issue with lifecycle of Activities launched from Lockscreen
 2014-09-13 23:25:37 +00:00
Craig Mautner
6863feb54c am 41262f9c: am 1ba4bb3c: Merge "Give a tablet a chance." into lmp-dev 
* commit '41262f9c0150434a25843c38a1f0a17efca98e4a':
  Give a tablet a chance.
 2014-09-13 23:13:34 +00:00
Adam Lesinski
13f3c9344f Merge "Fix issue with lifecycle of Activities launched from Lockscreen" into lmp-dev 2014-09-13 23:11:57 +00:00
Craig Mautner
34c3748561 am 1ba4bb3c: Merge "Give a tablet a chance." into lmp-dev 
* commit '1ba4bb3cace6feadf7ededfa6c7b90e6ff851380':
  Give a tablet a chance.
 2014-09-13 22:54:03 +00:00
Craig Mautner
a3804a0aab Merge "Give a tablet a chance." into lmp-dev 2014-09-13 22:45:28 +00:00
Craig Mautner
c3daeddae4 Give a tablet a chance. 
500 msec is apparently not enough time to push the pixels around on
a Volantis (or Manta, or occasionally Deb). Increasing the timeout
eliminates turning the screen on before the surface is completely
drawn.

Optimizing the drawing path so that we can return the timeout to
500ms has been filed as b/17496306.

Fixes bug 16849724.

Change-Id: Ic0fca68bc41caa67dba973b5c40915756dc4730f
 2014-09-13 12:22:33 -07:00
Svetoslav
0f71d8c6eb am cc2f1ab3: am c2281007: Merge "Page content sometimes missing while scrolling." into lmp-dev 
* commit 'cc2f1ab36343a3873f85f86b3e245b7096253932':
  Page content sometimes missing while scrolling.
 2014-09-13 19:16:31 +00:00
Svetoslav
16c8e53b33 am c2281007: Merge "Page content sometimes missing while scrolling." into lmp-dev 
* commit 'c2281007f190ab197b23484fd087c30955ffdd6b':
  Page content sometimes missing while scrolling.
 2014-09-13 18:57:44 +00:00
Svetoslav
2047df6f5f Merge "Page content sometimes missing while scrolling." into lmp-dev 2014-09-13 18:45:52 +00:00
Tyler Gunn
8bc3996189 am 21282583: am 66c16547: Merge "Renaming Telecomm to Telecom." into lmp-dev 
* commit '2128258322aa2f90d65c1963ede79d1bffb3fce4':
  Renaming Telecomm to Telecom.
 2014-09-13 18:03:04 +00:00
Tyler Gunn
e171af61f5 am 66c16547: Merge "Renaming Telecomm to Telecom." into lmp-dev 
* commit '66c16547736fd21f859d25b21d072bf07d16c3df':
  Renaming Telecomm to Telecom.
 2014-09-13 17:47:22 +00:00
Svet Ganov
358fcdea82 am 1fb38aad: am 16238096: Merge changes Ife1c7cb0,I398ff797 into lmp-dev 
* commit '1fb38aad434206ed0ee3c2760908ba0839978ec7':
  Fixing controls allignment in print UI.
  Fix a crash in print spooler.
 2014-09-13 17:39:20 +00:00
Tyler Gunn
ead6ad8a38 Merge "Renaming Telecomm to Telecom." into lmp-dev 2014-09-13 17:32:49 +00:00
Svet Ganov
b5be0803dd am 16238096: Merge changes Ife1c7cb0,I398ff797 into lmp-dev 
* commit '16238096409899271f40e4404646412a384b1512':
  Fixing controls allignment in print UI.
  Fix a crash in print spooler.
 2014-09-13 17:23:58 +00:00
Svet Ganov
102f9398ee Merge changes Ife1c7cb0,I398ff797 into lmp-dev 
* changes:
  Fixing controls allignment in print UI.
  Fix a crash in print spooler.
 2014-09-13 17:13:32 +00:00
Yohei Yukawa
04cee902ba am 699f5db8: am acc0ce3e: Merge "Minimize the number of default enabled IMEs part 1" into lmp-dev 
* commit '699f5db8737a390590dc2a28f062cfddd4ee5bed':
  Minimize the number of default enabled IMEs part 1
 2014-09-13 11:04:08 +00:00
Yohei Yukawa
2fa31886bd am acc0ce3e: Merge "Minimize the number of default enabled IMEs part 1" into lmp-dev 
* commit 'acc0ce3e5adff3a6a14b58500567e8155d96cca8':
  Minimize the number of default enabled IMEs part 1
 2014-09-13 10:48:27 +00:00
Yohei Yukawa
c0b8cb8910 Merge "Minimize the number of default enabled IMEs part 1" into lmp-dev 2014-09-13 10:33:50 +00:00
Tyler Gunn
ef9f6f957d Renaming Telecomm to Telecom. 
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: I192cb5d189f55db012ea72ee82ccc5aedbc21638
 2014-09-12 22:16:17 -07:00
Yuncheol Heo
a1920c1bc9 am 016f95ee: am 11ea0e35: Change the property name to pass selinux. 
* commit '016f95ee964aacf3f61a31cb3cb7480a6be27f13':
  Change the property name to pass selinux.
 2014-09-13 03:24:47 +00:00
Tim Kilbourn
c70acad0b1 am 92191001: am ebca7a44: Merge "Update ambient shadow for TV." into lmp-dev 
* commit '92191001ccdf591474d6c86f5dbdf089a2bd0e2b':
  Update ambient shadow for TV.
 2014-09-13 03:13:44 +00:00
Dianne Hackborn
47bdb75132 am 61ffa7a2: am f9d92bab: Merge "Work on issue #17477510: Time change notifications sent too often" into lmp-dev 
* commit '61ffa7a2754ee6c3b3bb1f836212ddfcb818c56b':
  Work on issue #17477510: Time change notifications sent too often
 2014-09-13 03:13:13 +00:00
Jeff Brown
8c3b757948 am 18f9b97a: am ce0a756f: Merge "Add support for dozing after screen off." into lmp-dev 
* commit '18f9b97ac486e93ca62e2d30a5eb29b2b3763add':
  Add support for dozing after screen off.
 2014-09-13 03:13:07 +00:00
Chris Craik
2fea335b3e am b5f00ba9: am cceffe72: Merge "Correctly initialize animator asynchronousity" into lmp-dev 
* commit 'b5f00ba90ff201153de8386a3ebcd4eb5c06cb9e':
  Correctly initialize animator asynchronousity
 2014-09-13 03:13:01 +00:00
Svet Ganov
922507026a Fixing controls allignment in print UI. 
Making some allignment tweaks based on UX feedback.

bug:17489187

Change-Id: Ife1c7cb0f55eb0398bca4a5e015ace24437ff2a6
 2014-09-12 19:54:09 -07:00
Yuncheol Heo
38a0ca6868 am 11ea0e35: Change the property name to pass selinux. 
* commit '11ea0e350b0026a6a39ec300bd98cb1e414c743e':
  Change the property name to pass selinux.
 2014-09-13 02:50:00 +00:00
Adam Lesinski
54eab3b35d Fix issue with lifecycle of Activities launched from Lockscreen 
ActivityManager still thinks the device is going to sleep, so
any Activity started while the lockscreen is showing is immediately
stopped. When Keyguard calls ActivityManager.keyguardWaitingForActivityDraw(),
then we must make sure that the ActivityManager thinks we are not sleeping.

Bug:17459745
Change-Id: I5c45c88e3a72e1f08e1b32101d0d0b4675f7a5ff
 2014-09-12 19:42:24 -07:00
Adam Powell
f1be67f3ea am 8e8d8655: am dd9488c1: Merge "Provide a public API for View#computeFitSystemWindows" into lmp-dev 
* commit '8e8d86559e4938daed3bb018afb61336e643e2e3':
  Provide a public API for View#computeFitSystemWindows
 2014-09-13 02:37:35 +00:00
Eric Laurent
3eb236cca0 am 8d002c9e: am a7f44594: Merge "SoundTrigger: fix KeyphraseRecognitionEvent parceling" into lmp-dev 
* commit '8d002c9e1069577bd624889229d9047611aca0d2':
  SoundTrigger: fix KeyphraseRecognitionEvent parceling
 2014-09-13 02:37:30 +00:00
Joe Fernandez
efa4f1603d am b331a753: am 85c953ef: am 41b12f29: am 02480cbf: am 1b12b1dc: Merge "docs: remove bad link in the quick view box for TV Recommendations #2" into klp-modular-docs 
* commit 'b331a753235cc84390b0d574d2d586b5ced94872':
  docs: remove bad link in the quick view box for TV Recommendations #2
 2014-09-13 02:37:24 +00:00
Paul Jensen
ae0477be09 am 11ee98ad: am 28b89f98: Allow libcore to perform necessary actions upon net config changes. 
* commit '11ee98ade47dddefa60cf3f54a3a4c82a5d5f7ee':
  Allow libcore to perform necessary actions upon net config changes.
 2014-09-13 02:36:05 +00:00
Amith Yamasani
6248ea5852 am 67e56d47: am 13c4e5ad: Merge "Rename and repurpose feature MANAGED_PROFILES to MANAGED_USERS" into lmp-dev 
* commit '67e56d47d8416c73973c92557abefa7aa3975f7c':
  Rename and repurpose feature MANAGED_PROFILES to MANAGED_USERS
 2014-09-13 02:35:59 +00:00
Alan Viverette
8c9e8e3083 am 3512e8d6: am 1e8bb662: Merge "Apply VectorDrawable color filter at draw time" into lmp-dev 
* commit '3512e8d63d5ea422876661a38d01766d15cbf096':
  Apply VectorDrawable color filter at draw time
 2014-09-13 02:35:14 +00:00
Jean-Michel Trivi
365537b8c4 am 4305f912: am 3d88a9c6: Merge "more AudioAttributes javadoc" into lmp-dev 
* commit '4305f912b2636f387a6ddfee30ad97c5f8a58727':
  more AudioAttributes javadoc
 2014-09-13 02:35:09 +00:00
vandwalle
f28489b816 am 8c8f56ca: am e62a18e5: Merge "various fixes:" into lmp-dev 
* commit '8c8f56ca16fd9d28ea2c2bf1d4f2fe59dcb1a8a7':
  various fixes:
 2014-09-13 02:35:03 +00:00
Matthew Williams
0db6bea563 am 87092929: am 7e84b1a4: Merge "Fix NPE in JobServiceContext" into lmp-dev 
* commit '87092929a02a88730a60e7edf85539c3711c23f8':
  Fix NPE in JobServiceContext
 2014-09-13 02:34:08 +00:00
Jae Seo
4072c6ed59 am 2cc0f40f: am 5e74ef0e: Merge "TIF: Add a system API to retrieve HDMI device information" into lmp-dev 
* commit '2cc0f40f69f4b36f918d57d1f27a20dfdf4df2ce':
  TIF: Add a system API to retrieve HDMI device information
 2014-09-13 02:34:03 +00:00
George Mount
3f1c575c1f am a8e0fb44: am 87483e5e: Merge "Made Transitions act only the views that they target." into lmp-dev 
* commit 'a8e0fb449cd488bde6833871f978fde40bc83d5c':
  Made Transitions act only the views that they target.
 2014-09-13 02:33:58 +00:00
Alan Viverette
068a026187 am 2b4de8b4: am f559f89c: Merge "Report button opacity for current state, fix button shadows" into lmp-dev 
* commit '2b4de8b4ee417695cdc88e9aef0aded47036e8ef':
  Report button opacity for current state, fix button shadows
 2014-09-13 02:33:52 +00:00
Craig Mautner
449c6b9d50 am c6e2ab79: am 1260584f: Merge "Rework the task affiliate chain validation" into lmp-dev 
* commit 'c6e2ab7998b63040b9b1d2d236c1245460e7f6b9':
  Rework the task affiliate chain validation
 2014-09-13 02:32:38 +00:00
Robert Greenwalt
6cd2ce5673 am f4e12b81: am 5710ec48: Merge "Make status bar indicators reflect the network actually in use." into lmp-dev 
* commit 'f4e12b81884776f35a91ef572e25376891fd6848':
  Make status bar indicators reflect the network actually in use.
 2014-09-13 02:32:33 +00:00
Robert Greenwalt
f4e3d53619 am 603090b8: am 3234c20e: Merge "Update Inet state when NetworkMonitor re-evaluates a network." into lmp-dev 
* commit '603090b8c7a39255f2239f3bac23db6754b1f2a4':
  Update Inet state when NetworkMonitor re-evaluates a network.
 2014-09-13 02:32:27 +00:00