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

113509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chet Haase
ebcb9ecf2b am 9501a452: am e850c973: Merge "Hide translucent activity conversion API" into klp-dev 
* commit '9501a452af30dd15559804193c8183bbaa42a669':
  Hide translucent activity conversion API
 2013-09-12 16:44:24 -07:00
Chet Haase
f1690b1fe8 am 79f245e4: am 90b10f89: Merge "Fix TechChange\'s assumption about TextView targets" into klp-dev 
* commit '79f245e472b9df546a3f7bb95f66ea9b055ad707':
  Fix TechChange's assumption about TextView targets
 2013-09-12 16:44:20 -07:00
Tor Norbye
311913d09e Removing trailing comma in initializer; fails on some javac versions 
Change-Id: Ie651ca8ee625a881f739dc3ede5190adb9eb9860
 2013-09-12 16:03:45 -07:00
Tor Norbye
b6a3ef1834 Merge "Add typedefs and nullness annotations." 2013-09-12 22:22:06 +00:00
Chet Haase
9501a452af am e850c973: Merge "Hide translucent activity conversion API" into klp-dev 
* commit 'e850c973b0662975137cee8a05f8ee2cb82d9b2a':
  Hide translucent activity conversion API
 2013-09-12 12:44:25 -07:00
Chet Haase
79f245e472 am 90b10f89: Merge "Fix TechChange\'s assumption about TextView targets" into klp-dev 
* commit '90b10f89d7c1dd217f07f4b51ed8e5c93deccc52':
  Fix TechChange's assumption about TextView targets
 2013-09-12 12:44:22 -07:00
Chet Haase
e850c973b0 Merge "Hide translucent activity conversion API" into klp-dev 2013-09-12 19:41:33 +00:00
Chet Haase
90b10f89d7 Merge "Fix TechChange's assumption about TextView targets" into klp-dev 2013-09-12 19:41:16 +00:00
Eino-Ville Talvala
0f05de62e7 am db0e1cf1: am 2d861e87: Merge "Camera2: Fix build: Add new key to API" into klp-dev 
* commit 'db0e1cf14a53b4f4885123966984ef80d32331ed':
  Camera2: Fix build: Add new key to API
 2013-09-12 12:12:44 -07:00
Eino-Ville Talvala
db0e1cf14a am 2d861e87: Merge "Camera2: Fix build: Add new key to API" into klp-dev 
* commit '2d861e87ae556b73d8bab5a6db20207a5653560f':
  Camera2: Fix build: Add new key to API
 2013-09-12 12:10:00 -07:00
Eino-Ville Talvala
2d861e87ae Merge "Camera2: Fix build: Add new key to API" into klp-dev 2013-09-12 19:06:55 +00:00
Eino-Ville Talvala
986b1bd73f Camera2: Fix build: Add new key to API 
Change-Id: Ie44a9e3b1c8d04dd266d39f59a5916ddaf5fca67
 2013-09-12 11:52:45 -07:00
Eino-Ville Talvala
b91133c73a am a937b013: am 184b17dd: Merge "Camera2: Add a missing key for controlling shading map mode" into klp-dev 
* commit 'a937b013f5ebe81562a0d298f9c990c975ba1dcf':
  Camera2: Add a missing key for controlling shading map mode
 2013-09-12 11:39:42 -07:00
Eino-Ville Talvala
a937b013f5 am 184b17dd: Merge "Camera2: Add a missing key for controlling shading map mode" into klp-dev 
* commit '184b17ddef985ba99f1b1ad8f660a742a9f31a19':
  Camera2: Add a missing key for controlling shading map mode
 2013-09-12 11:36:51 -07:00
Robert Greenwalt
8265343545 am 16666176: am 8f435bac: Merge "Fix Wifi Batch Scanning" into klp-dev 
* commit '16666176c0de5abc1f5390b9b2e07c32e51a97f9':
  Fix Wifi Batch Scanning
 2013-09-12 11:32:32 -07:00
Eino-Ville Talvala
184b17ddef Merge "Camera2: Add a missing key for controlling shading map mode" into klp-dev 2013-09-12 18:32:29 +00:00
Igor Murashkin
d6b8a4ab4c am ddc74f5e: am 6c621639: Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-dev 
* commit 'ddc74f5ed1d541ea89964228417eff3d5d6ad071':
  camera_metadata: add android.lens.state MOVING enum value
 2013-09-12 11:32:28 -07:00
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
Chet Haase
8529b30b91 Fix TechChange's assumption about TextView targets 
Some of the code in the TextChange transition assumed that the
start values for a transition were for a TextView object. This may
not be the case, and we should return early (without creating an
animator) when it is not.

Issue #10725388 Frequent Framework crashes across apps

Change-Id: I6999eb2288f107f4b93ddb5b77cd068069d831ed
 2013-09-12 11:19:32 -07:00
Adam Powell
d488b785df am 179ba0c0: am a2906cb4: Merge "Show alternate menu panel on devices with menu key" into klp-dev 
* commit '179ba0c04b446406d226cdfe866317d0d2bcecce':
  Show alternate menu panel on devices with menu key
 2013-09-12 11:15:43 -07: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
Eino-Ville Talvala
d96748b02a Camera2: Add a missing key for controlling shading map mode 
Bug: 10726421
Change-Id: If41e00c921ab493c7427575258fed63cbbc22dc1
 2013-09-12 11:11:27 -07:00
Chet Haase
a9265c1083 am 913c0233: am c0f65209: Merge "Add exclude() methods to Transition" into klp-dev 
* commit '913c023387c319f6c7b1e4878a4d0d07f8624f78':
  Add exclude() methods to Transition
 2013-09-12 11:11:07 -07: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
b20642b999 am 2f2184b7: am 074dc2eb: Merge "Don\'t restore EAP-TLS networks from backup" into klp-dev 
* commit '2f2184b755f995dcf661c383b520e4a36f8a432d':
  Don't restore EAP-TLS networks from backup
 2013-09-12 10:59:42 -07:00
Joe Malin
0329a0ea4a am 7d62664d: am 204df6f0: am 7bf74bc0: am 1e3a0203: am 6f9e30e3: Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs 
* commit '7d62664d889547468aad7ea3359476a45cc8cab9':
  Android Training: Add Location Testing Lesson
 2013-09-12 10:59:39 -07: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
c77a18beca am 22dbb77b: am f3da15bd: Merge "Remove spurious density-specific default wallpaper." into klp-dev 
* commit '22dbb77b194536191770a64b4fd7d8df7feb9167':
  Remove spurious density-specific default wallpaper.
 2013-09-12 10:41:54 -07: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
63a92df82a am 390322a3: am 4d73951a: am c286ae17: Merge "GlobalAction dialog ref not set to null" 
* commit '390322a330e473850c3aa04db21b83de32ba616a':
  GlobalAction dialog ref not set to null
 2013-09-12 10:01:05 -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
3333259945 am bf142e6b: am 16dae599: am 834ba474: am 4c6cde54: am 89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs 
* commit 'bf142e6b846d86d4dcf75a51cfb84c2495291bae':
  Pass whitelist of sample groups to doclava.
 2013-09-12 09:37:47 -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
John Spurlock
0159c6194f am 932c1251: am 43c70b0c: Merge "Status bar interaction veto revoked on ups/cancels." into klp-dev 
* commit '932c1251e412abd8a7555fdf8346bb71defd17d7':
  Status bar interaction veto revoked on ups/cancels.
 2013-09-12 09:22:25 -07:00