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

112564 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
16666176c0 am 8f435bac: Merge "Fix Wifi Batch Scanning" into klp-dev 
* commit '8f435baca8b5285a6b4658fc9563f5fcbbdafc6e':
  Fix Wifi Batch Scanning
 2013-09-12 11:26:20 -07:00
Igor Murashkin
ddc74f5ed1 am 6c621639: Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-dev 
* commit '6c62163976844b28859fca322b28af907ec2856d':
  camera_metadata: add android.lens.state MOVING enum value
 2013-09-12 11:26:16 -07:00
Robert Greenwalt
8f435baca8 Merge "Fix Wifi Batch Scanning" into klp-dev 2013-09-12 18:22:28 +00:00
Igor Murashkin
6c62163976 Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-dev 2013-09-12 18:21:15 +00:00
Adam Powell
179ba0c04b am a2906cb4: Merge "Show alternate menu panel on devices with menu key" into klp-dev 
* commit 'a2906cb4d9355b7a08e7fdec1924c2dbc7fda622':
  Show alternate menu panel on devices with menu key
 2013-09-12 11:13:58 -07:00
Adam Powell
a2906cb4d9 Merge "Show alternate menu panel on devices with menu key" into klp-dev 2013-09-12 18:12:05 +00:00
Chet Haase
913c023387 am c0f65209: Merge "Add exclude() methods to Transition" into klp-dev 
* commit 'c0f652093ec9dffad23477402ab1cc0a5e415931':
  Add exclude() methods to Transition
 2013-09-12 11:09:26 -07:00
Chet Haase
c0f652093e Merge "Add exclude() methods to Transition" into klp-dev 2013-09-12 18:07:40 +00:00
Vinit Deshapnde
2f2184b755 am 074dc2eb: Merge "Don\'t restore EAP-TLS networks from backup" into klp-dev 
* commit '074dc2eb2da23976bc2916cfe7c61dfcd9977e8f':
  Don't restore EAP-TLS networks from backup
 2013-09-12 10:56:15 -07:00
Joe Malin
7d62664d88 am 204df6f0: am 7bf74bc0: am 1e3a0203: am 6f9e30e3: Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs 
* commit '204df6f06ad17f0e775fd32fd657cff7d4c4ab7d':
  Android Training: Add Location Testing Lesson
 2013-09-12 10:56:12 -07:00
Vinit Deshapnde
074dc2eb2d Merge "Don't restore EAP-TLS networks from backup" into klp-dev 2013-09-12 17:53:39 +00:00
Joe Malin
204df6f06a am 7bf74bc0: am 1e3a0203: am 6f9e30e3: Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs 
* commit '7bf74bc04c4e6fa022a84a4e586aca43816ec1f9':
  Android Training: Add Location Testing Lesson
 2013-09-12 10:53:26 -07:00
Joe Malin
7bf74bc04c am 1e3a0203: am 6f9e30e3: Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs 
* commit '1e3a02030949df8c1d1f37a37fc23f25357632f0':
  Android Training: Add Location Testing Lesson
 2013-09-12 10:51:12 -07:00
Joe Malin
1e3a020309 am 6f9e30e3: Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs 
* commit '6f9e30e3b76f564db3a56de24e4efdc5a64455f0':
  Android Training: Add Location Testing Lesson
 2013-09-12 10:48:38 -07:00
Joe Malin
6f9e30e3b7 Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs 2013-09-12 17:45:05 +00:00
Daniel Sandler
22dbb77b19 am f3da15bd: Merge "Remove spurious density-specific default wallpaper." into klp-dev 
* commit 'f3da15bde723e6f27ae6b64e8f0765e98b02e45d':
  Remove spurious density-specific default wallpaper.
 2013-09-12 10:38:37 -07:00
Daniel Sandler
f3da15bde7 Merge "Remove spurious density-specific default wallpaper." into klp-dev 2013-09-12 17:35:53 +00:00
Joe Malin
72fdbc88bb Android Training: Add Location Testing Lesson 
Change-Id: I855e1c3dd0db65be7dc970437af2d52ccf836cb7
 2013-09-12 10:07:30 -07:00
Amith Yamasani
390322a330 am 4d73951a: am c286ae17: Merge "GlobalAction dialog ref not set to null" 
* commit '4d73951a90d7b9b81146487df5a9d772351d29c1':
  GlobalAction dialog ref not set to null
 2013-09-12 09:49:56 -07:00
Dirk Dougherty
bf142e6b84 am 16dae599: am 834ba474: am 4c6cde54: am 89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs 
* commit '16dae5997bb0ff7f03d5a0ccfdc4be94aa35ba51':
  Pass whitelist of sample groups to doclava.
 2013-09-12 09:33:35 -07:00
Dirk Dougherty
16dae5997b am 834ba474: am 4c6cde54: am 89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs 
* commit '834ba47485a5fb55c89d8f22b826bdb26049f6d6':
  Pass whitelist of sample groups to doclava.
 2013-09-12 09:28:18 -07:00
Amith Yamasani
4d73951a90 am c286ae17: Merge "GlobalAction dialog ref not set to null" 
* commit 'c286ae17a02a5ad0b9cb392d5ea2739827919e4c':
  GlobalAction dialog ref not set to null
 2013-09-12 09:27:37 -07:00
Amith Yamasani
c286ae17a0 Merge "GlobalAction dialog ref not set to null" 2013-09-12 16:24:20 +00:00
Dirk Dougherty
834ba47485 am 4c6cde54: am 89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs 
* commit '4c6cde545c5d2e76d9ba8ef926399463369da7e7':
  Pass whitelist of sample groups to doclava.
 2013-09-12 09:22:20 -07:00
John Spurlock
932c1251e4 am 43c70b0c: Merge "Status bar interaction veto revoked on ups/cancels." into klp-dev 
* commit '43c70b0ccface3e7e0730d9bc0a46b90f16c4b17':
  Status bar interaction veto revoked on ups/cancels.
 2013-09-12 09:17:05 -07:00
Jeff Sharkey
c3414dc4ba am 357f9e34: Merge "Handle pipe thumbnails, acquire unstable refs." into klp-dev 
* commit '357f9e34ca4f0336e406044db35834530379db47':
  Handle pipe thumbnails, acquire unstable refs.
 2013-09-12 09:17:02 -07:00
Flavio Lerda
3f36b33dca am b25cfdf1: Merge "Document the order of values returned by keyAt()." into klp-dev 
* commit 'b25cfdf1ece9163292e2b4c86910fe07b14c0afa':
  Document the order of values returned by keyAt().
 2013-09-12 09:17:00 -07:00
Jeff Brown
a090866557 am 737d2c0b: Merge "Ignore ON_AFTER_RELEASE for partial wake locks." into klp-dev 
* commit '737d2c0b92b69d9069de6fe0e2785676b9a10d78':
  Ignore ON_AFTER_RELEASE for partial wake locks.
 2013-09-12 09:16:57 -07:00
Baligh Uddin
0b5fa44b24 am 4dff9868: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '4dff98689d4c5f98159206730074aaa6463ada23':
  Import translations. DO NOT MERGE
 2013-09-12 09:16:55 -07:00
Baligh Uddin
d55c00c93c am c57bd8b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c57bd8b9962a87282aef4bf367c33238f1d7c46e':
  Import translations. DO NOT MERGE
 2013-09-12 09:16:52 -07:00
Baligh Uddin
8432e5f05c am 0792054f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '0792054f6b94986ed72df4f7fb8e775d8b916946':
  Import translations. DO NOT MERGE
 2013-09-12 09:16:49 -07:00
Alex Ray
0417baa536 am c333a3f7: Merge "consumer_ir: add length to get carrier freqs" into klp-dev 
* commit 'c333a3f7c6bf838aad2a2419ea65167e344f0cab':
  consumer_ir: add length to get carrier freqs
 2013-09-12 09:16:46 -07:00
Dirk Dougherty
4c6cde545c am 89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs 
* commit '89579294ce0fbe728738fa09fb45cc53fd79bfb5':
  Pass whitelist of sample groups to doclava.
 2013-09-12 09:15:25 -07:00
John Spurlock
43c70b0ccf Merge "Status bar interaction veto revoked on ups/cancels." into klp-dev 2013-09-12 16:05:56 +00:00
Dirk Dougherty
89579294ce Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs 2013-09-12 16:01:52 +00:00
Jeff Sharkey
357f9e34ca Merge "Handle pipe thumbnails, acquire unstable refs." into klp-dev 2013-09-12 16:00:40 +00:00
John Spurlock
5fee8360f8 Status bar interaction veto revoked on ups/cancels. 
If we get an ACTION_UP or ACTION_CANCEL and the shade is not
expanded, treat this as a signal of !interacting, revoking
the interaction veto.

Bug:10711758
Change-Id: Ia69ff24880193fa8d99ece79053eeb95dfa9ba71
 2013-09-12 11:35:08 -04:00
Flavio Lerda
b25cfdf1ec Merge "Document the order of values returned by keyAt()." into klp-dev 2013-09-12 11:49:29 +00:00
Dirk Dougherty
a6c02679e1 Pass whitelist of sample groups to doclava. 
Change-Id: I36f3e3426115cc296531cf41d20ab07a4d429b19
 2013-09-12 00:37:50 -07:00
Daniel Sandler
0594b192cd Remove spurious density-specific default wallpaper. 
Bug: 10671611
Change-Id: I719bfb09cfd1cbc56f577cdcbf0a9945739355e2
 2013-09-12 01:18:55 -04:00
Igor Murashkin
9ea4ae67fb camera_metadata: add android.lens.state MOVING enum value 
Bug: 10621609
Change-Id: Ia4fa15db99350f920741f244ae7772520657fdd2
 2013-09-11 21:43:50 -07:00
Jeff Brown
737d2c0b92 Merge "Ignore ON_AFTER_RELEASE for partial wake locks." into klp-dev 2013-09-12 04:03:31 +00:00
Baligh Uddin
4dff98689d Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-12 02:46:12 +00:00
Baligh Uddin
c57bd8b996 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-12 02:45:52 +00:00
Baligh Uddin
0792054f6b Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-12 02:45:12 +00:00
Robert Greenwalt
126755cf41 Fix Wifi Batch Scanning 
Some parsing bugs, more debug logs, etc.

bug:9301872
Change-Id: I245ab00955e245be81a019750be0f8491aa505fd
 2013-09-11 19:31:20 -07:00
Adam Powell
5fcf5b9fd3 Show alternate menu panel on devices with menu key 
Provide a softer transition to the overflow-everywhere world for
devices with menu keys. The panel menu will still be used on these
devices in response to a menu key press even in the presence of an
action bar with overflow.

Fix a few lingering bugs around dispatching the open-overflow
transition that caused problems with this along the way.

Change-Id: I9d77c70f6d15c47160ac06292984101d619c44e6
 2013-09-11 19:17:38 -07:00
Alex Ray
c333a3f7c6 Merge "consumer_ir: add length to get carrier freqs" into klp-dev 2013-09-12 01:55:27 +00:00
Selim Gurun
1e763fd280 am e4fdc847: Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 
* commit 'e4fdc84794923f9408fc400ed9177178329a08cd':
  Revert "Add permissions for the InCallUI Split."
 2013-09-11 18:05:59 -07:00
Selim Gurun
e4fdc84794 Merge "Revert "Add permissions for the InCallUI Split."" into klp-dev 2013-09-12 01:02:45 +00:00