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

120513 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
3c3377a229 am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev 
* commit '6a5b7c6ffbef87c6591dbc8f5813f61b3086bfad':
  DO NOT MERGE Ensure transient state views are temporarily detached
 2014-03-11 02:15:21 +00:00
Alan Viverette
6e6dc23c69 Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev 2014-03-11 02:12:13 +00:00
Alan Viverette
e910a7ce8b Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev 2014-03-11 02:12:05 +00:00
Alan Viverette
6a5b7c6ffb Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev 2014-03-11 02:11:58 +00:00
Adam Powell
75958c2984 am 3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev 
* commit '3a153c0de271a004710e5ac545c48778f7e51b12':
  Fix a bug in submenu presenter priority handling
 2014-03-11 01:24:47 +00:00
Adam Powell
3a153c0de2 Merge "Fix a bug in submenu presenter priority handling" into klp-dev 2014-03-11 01:22:10 +00:00
Jason Sams
780d57b81a am cf8573c1: Fix destruction issues relating to AllocationAdapter. 
* commit 'cf8573c15456c4581b691c7380722ea6dccf11c5':
  Fix destruction issues relating to AllocationAdapter.
 2014-03-11 01:12:32 +00:00
Jason Sams
e14d5e9011 am 5757bf89: Add hidden minor version ID for support lib workarounds. 
* commit '5757bf89c44e7a4805340b5634bec13a1caf39f8':
  Add hidden minor version ID for support lib workarounds.
 2014-03-11 01:12:29 +00:00
Jason Sams
0165db3802 am ff7256e7: Fix destruction issues relating to AllocationAdapter. 
* commit 'ff7256e757502279b1777127a12eba235be679ae':
  Fix destruction issues relating to AllocationAdapter.
 2014-03-11 01:12:23 +00:00
Christopher Tate
4bda43777c DO NOT MERGE - Don't hang installs if the transport disappears 
Bug 12991308

Cherry-pick from master.

Change-Id: Id1abedd77be7207e67d7ca11591973d33125459c
 2014-03-10 18:07:12 -07:00
Jeff Brown
1c4d86c7b4 am f54d62dc: am fc7315c6: am 6d71e165: Merge "Round off when calculate next step in Seekbar" 
* commit 'f54d62dc80b43a72adaa273836f00153ce7edc72':
  Round off when calculate next step in Seekbar
 2014-03-11 00:19:07 +00:00
Jeff Brown
f54d62dc80 am fc7315c6: am 6d71e165: Merge "Round off when calculate next step in Seekbar" 
* commit 'fc7315c6c17e6ebc559d2ea0afb8be64c5d7b86c':
  Round off when calculate next step in Seekbar
 2014-03-11 00:15:38 +00:00
Jeff Brown
1491aaf503 am 14006523: am 33282d66: am a41ddccd: Merge "Fixed typo errors in documentation" 
* commit '140065230900b465f85f64c5da5181d124076e1d':
  Fixed typo errors in documentation
 2014-03-11 00:15:14 +00:00
Jeff Brown
70c274361e am daa1c969: am aaf23a9a: am c3f5d694: Merge "Hang off call by power button while screen is on" 
* commit 'daa1c96954f666b9f661501e11014a57533eefad':
  Hang off call by power button while screen is on
 2014-03-11 00:15:11 +00:00
Jeff Brown
3c6bb4d4ec am f2e837e5: am e7f7af96: am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter" 
* commit 'f2e837e57900514a554f174a29730157160c1fa1':
  take account of RotationVector's new extra parameter
 2014-03-11 00:15:03 +00:00
Jeff Brown
fc7315c6c1 am 6d71e165: Merge "Round off when calculate next step in Seekbar" 
* commit '6d71e165ba961251f0705b75aafed74eba1bc570':
  Round off when calculate next step in Seekbar
 2014-03-10 17:11:57 -07:00
Jeff Brown
1400652309 am 33282d66: am a41ddccd: Merge "Fixed typo errors in documentation" 
* commit '33282d66155e8d68acea512989ec61cb15fae1ce':
  Fixed typo errors in documentation
 2014-03-11 00:11:14 +00:00
Jeff Brown
daa1c96954 am aaf23a9a: am c3f5d694: Merge "Hang off call by power button while screen is on" 
* commit 'aaf23a9a653457cccf54293b2ff76196718c7a1a':
  Hang off call by power button while screen is on
 2014-03-11 00:11:10 +00:00
Jeff Brown
f2e837e579 am e7f7af96: am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter" 
* commit 'e7f7af964baa3c5d36abd163e33ad139310049d2':
  take account of RotationVector's new extra parameter
 2014-03-11 00:11:05 +00:00
Jeff Brown
33282d6615 am a41ddccd: Merge "Fixed typo errors in documentation" 
* commit 'a41ddccdc67ace7c9363efebbf6e51710928ce12':
  Fixed typo errors in documentation
 2014-03-10 17:08:27 -07:00
Jeff Brown
aaf23a9a65 am c3f5d694: Merge "Hang off call by power button while screen is on" 
* commit 'c3f5d694324fbe2831405ce60bc43bd0d0183d07':
  Hang off call by power button while screen is on
 2014-03-10 17:08:24 -07:00
Jeff Brown
e7f7af964b am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter" 
* commit '35c8ebab0ac66bf2c12b6986f90a07be402e0076':
  take account of RotationVector's new extra parameter
 2014-03-10 17:08:21 -07:00
Jeff Brown
6d71e165ba Merge "Round off when calculate next step in Seekbar" 2014-03-11 00:06:40 +00:00
Jeff Brown
a41ddccdc6 Merge "Fixed typo errors in documentation" 2014-03-11 00:06:25 +00:00
Jeff Brown
c3f5d69432 Merge "Hang off call by power button while screen is on" 2014-03-11 00:06:01 +00:00
Jeff Brown
35c8ebab0a Merge "take account of RotationVector's new extra parameter" 2014-03-11 00:04:49 +00:00
Adam Powell
8566f1561b am c8b43bc0: am fd6b9975: Prevent overflow from MeasureSpec.adjust; measure cache fix 
* commit 'c8b43bc0021aea63858044551f13cae86f4e5699':
  Prevent overflow from MeasureSpec.adjust; measure cache fix
 2014-03-10 23:35:16 +00:00
Adam Powell
c8b43bc002 am fd6b9975: Prevent overflow from MeasureSpec.adjust; measure cache fix 
* commit 'fd6b99750bfab7f930ee375a79009874a3196165':
  Prevent overflow from MeasureSpec.adjust; measure cache fix
 2014-03-10 23:31:04 +00:00
John Spurlock
f6228d95ea Merge "Fix doc typos in AppOpsManager.java" into klp-docs 2014-03-10 21:42:37 +00:00
Adam Powell
fd6b99750b Prevent overflow from MeasureSpec.adjust; measure cache fix 
Extract the size from the MeasureSpec value before adding the
delta. The opposite order could result in a negative delta causing
overflow into size from the EXACTLY mode, creating a very large size
value in the resulting MeasureSpec.

Don't reapply optical bounds insets after pulling a value from the
measurement cache. (The insets will have already been applied before
insertion into the cache.)

Change-Id: Ib0154f4d6c3a7c31e7fee24fd7d5d10cc5dc71a1
 2014-03-10 14:09:18 -07:00
John Spurlock
925b85eae8 Fix doc typos in AppOpsManager.java 
Change-Id: I3c930a2afce48c57570681a95595149df5158053
 2014-03-10 16:52:11 -04:00
Jason Sams
cf8573c154 Fix destruction issues relating to AllocationAdapter. 
bug 13170046

Change-Id: I2a2ba3cbd7d08c659ed8958fbcc01919e36e86b0
 2014-03-10 13:32:42 -07:00
Jason Sams
5757bf89c4 Add hidden minor version ID for support lib workarounds. 
bug 13170046

Change-Id: I0c77901752e9a0b10bd5be62311c79a0ab7128e5
 2014-03-10 13:32:21 -07:00
Jason Sams
ff7256e757 Fix destruction issues relating to AllocationAdapter. 
bug 13170046

Change-Id: I922b19c086b675949c6fae66c6dcb4c8af3b715f
 2014-03-10 13:31:51 -07:00
Robert Greenwalt
e8af5e10e0 am 6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev 
* commit '6d9ed0c35327adfba50004fe9270ee6471459fb0':
  DO NOT MERGE Debounce wifi country code Info
 2014-03-10 20:06:23 +00:00
Robert Greenwalt
6d9ed0c353 Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev 2014-03-10 20:04:10 +00:00
Baligh Uddin
fafc1ce9f8 Import translations. DO NOT MERGE 
Change-Id: Iee9ef4f534076df84a28d70663293dc42b26cb99
Auto-generated-cl: translation import
 2014-03-10 12:36:47 -07:00
Benoit Goby
7d50596a9c am 6835033a: am c6f0b54d: Merge "Add CAP_BLOCK_SUSPEND to system server" into klp-modular-dev 
* commit '6835033af4f42132337a65eeeb1e4362a36b0465':
  Add CAP_BLOCK_SUSPEND to system server
 2014-03-10 19:05:13 +00:00
Benoit Goby
6835033af4 am c6f0b54d: Merge "Add CAP_BLOCK_SUSPEND to system server" into klp-modular-dev 
* commit 'c6f0b54d695b49966a13bb196800a985ac6ce212':
  Add CAP_BLOCK_SUSPEND to system server
 2014-03-10 19:02:54 +00:00
Benoit Goby
c6f0b54d69 Merge "Add CAP_BLOCK_SUSPEND to system server" into klp-modular-dev 2014-03-10 18:59:05 +00:00
Zhihai Xu
c48c9626bd am 82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev 
* commit '82ec1442487d66935cb0c30f6da3545d8c33af6e':
  DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
 2014-03-10 18:49:47 +00:00
Zhihai Xu
82ec144248 Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev 2014-03-10 18:46:56 +00:00
Zhihai Xu
7434fa31d8 DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode."" 
This reverts commit 371427b53c70d1a71012de404c29187fe303a22a.

bug:12099469
Change-Id: I497832b54856a9909fc8651ee67555e02e0e763e
 2014-03-10 10:58:14 -07:00
Brian Carlstrom
7b7d111ba2 am 9e736723: am ec4c7752: am ab97d617: Merge "Only pass -Xprofile-* options to ART" 
* commit '9e73672362e2ed98ccfcc15695645daa42a61524':
  Only pass -Xprofile-* options to ART
 2014-03-10 17:54:14 +00:00
Vinit Deshapnde
5f683ca806 am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev 
* commit '5243a760452dc06ec2fd0c50e1c23c0d8c3d16e7':
  DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
 2014-03-10 17:54:01 +00:00
Vinit Deshapnde
5243a76045 Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev 2014-03-10 17:51:19 +00:00
Brian Carlstrom
9e73672362 am ec4c7752: am ab97d617: Merge "Only pass -Xprofile-* options to ART" 
* commit 'ec4c7752c22ae26924378d953a6f4a0e8e8b036d':
  Only pass -Xprofile-* options to ART
 2014-03-10 17:51:05 +00:00
Brian Carlstrom
ec4c7752c2 am ab97d617: Merge "Only pass -Xprofile-* options to ART" 
* commit 'ab97d617e8043f7396dc6031c4ddeb2ae632230f':
  Only pass -Xprofile-* options to ART
 2014-03-10 10:47:26 -07:00
Brian Carlstrom
ab97d617e8 Merge "Only pass -Xprofile-* options to ART" 2014-03-10 17:44:31 +00:00
Adam Powell
190909f2c1 Fix a bug in submenu presenter priority handling 
Now that overflow menus and the PhoneWindow-level ListMenuPresenter
can coexist, make sure that ListMenuPresenter handles submenus spawned
by itself. Introduce an internal API for menus to prefer a specific
presenter when performing item actions.

Bug 11979407

Change-Id: Id0b8fcbb8b310cbb3a63a1e5ea7a89de5d53f86f
 2014-03-10 10:30:59 -07:00