LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,747 Commits 2 Branches 0 Tags
21c4a88a26c79c7a970ca0fd01e635ce82dd82a6
Commit Graph

16747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Stout
aaa3fa06b1 Default to using wrap content for row height. 
Change-Id: I902b292726bdf8fa1d2134b00fde1385cbccc4ae
(cherry picked from commit 24ad89cd2b)
 2015-03-03 00:04:15 +00:00
Craig Stout
21efbcc41e am d7eb2ab1: am 12f481fb: am 5f6a8c4c: Merge "Updated to clarify division of functionality." into lmp-mr1-ub-dev 
* commit 'd7eb2ab1953a653c985b85dce487a16dd5e738ae':
  Updated to clarify division of functionality.
 2015-02-27 16:47:42 +00:00
Geoff Mendal
b27a27c2a4 am 222dead3: (-s ours) am dd4dc51a: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '222dead36e3ca93b3e4d79fcd6c10cc7d5115184':
  Import translations. DO NOT MERGE
 2015-02-27 16:47:41 +00:00
Craig Stout
d7eb2ab195 am 12f481fb: am 5f6a8c4c: Merge "Updated to clarify division of functionality." into lmp-mr1-ub-dev 
* commit '12f481fb8958846766ecbb420d5b429c72cd83eb':
  Updated to clarify division of functionality.
 2015-02-27 16:41:54 +00:00
Geoff Mendal
222dead36e am dd4dc51a: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'dd4dc51a25d97d45e661dcb8d245a816413ec9e5':
  Import translations. DO NOT MERGE
 2015-02-27 16:39:46 +00:00
Craig Stout
12f481fb89 am 5f6a8c4c: Merge "Updated to clarify division of functionality." into lmp-mr1-ub-dev 
* commit '5f6a8c4cbc6a0029663eb9e4fe517766b79e5c7f':
  Updated to clarify division of functionality.
 2015-02-27 16:34:55 +00:00
Craig Stout
5f6a8c4cbc Merge "Updated to clarify division of functionality." into lmp-mr1-ub-dev 2015-02-27 16:25:23 +00:00
Chris Banes
2068c6a59a Remove the old ActionBarCompat sample 
Change-Id: I04dfe8dd38e153ae8f28c3044a7e6d37f1a7d562
 2015-02-27 10:01:47 +00:00
Geoff Mendal
dd4dc51a25 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 07:26:04 +00:00
Geoff Mendal
e3e13c36a3 Import translations. DO NOT MERGE 
Change-Id: I44190f89c510bb0307eedda601ceaedcbe0b8baa
Auto-generated-cl: translation import
 2015-02-26 17:24:12 -08:00
Geoff Mendal
8f0ee3ca1f am bb43771d: (-s ours) am ee5bd86e: (-s ours) Import translations. DO NOT MERGE 
* commit 'bb43771d7891465cc58392e2e5bc90f133e7bca8':
  Import translations. DO NOT MERGE
 2015-02-26 23:21:31 +00:00
Geoff Mendal
bb43771d78 am ee5bd86e: (-s ours) Import translations. DO NOT MERGE 
* commit 'ee5bd86e43c9beba24bc6c254c6e131fc23b473b':
  Import translations. DO NOT MERGE
 2015-02-26 23:14:28 +00:00
Geoff Mendal
ee5bd86e43 Import translations. DO NOT MERGE 
Change-Id: I3a40482175025bb0c4d4882e13020f7647f93376
Auto-generated-cl: translation import
 2015-02-26 12:26:58 -08:00
Dake Gu
a827e50225 am 602c6910: am 6efdf6b7: am 69cabd12: ItemClickedListener -> ItemViewClickedListener 
* commit '602c69109002485984e8f10a0b473fe6f33ca98a':
  ItemClickedListener -> ItemViewClickedListener
 2015-02-26 02:16:01 +00:00
Dake Gu
602c691090 am 6efdf6b7: am 69cabd12: ItemClickedListener -> ItemViewClickedListener 
* commit '6efdf6b750429d6367ea161c537a64735cb8754e':
  ItemClickedListener -> ItemViewClickedListener
 2015-02-26 00:57:05 +00:00
Dake Gu
6efdf6b750 am 69cabd12: ItemClickedListener -> ItemViewClickedListener 
* commit '69cabd12e65bcebd2e1970bee03fa5b0535a4405':
  ItemClickedListener -> ItemViewClickedListener
 2015-02-26 00:50:58 +00:00
Dake Gu
69cabd12e6 ItemClickedListener -> ItemViewClickedListener 
Bug 19514090

Change-Id: Icf14e483b95d1bf5d57af9f27d977b0fdb686e67
 2015-02-25 15:39:17 -08:00
Jim Miller
94b490117c am 71abf355: am 34bdc613: am fe07a079: am 18c5fb7c: Fix the build 
* commit '71abf355011906353a571b471c04027bf2112804':
  Fix the build
 2015-02-25 19:11:20 +00:00
Jim Miller
71abf35501 am 34bdc613: am fe07a079: am 18c5fb7c: Fix the build 
* commit '34bdc6136f13d01af339fd0c8f1f569bb28d6971':
  Fix the build
 2015-02-25 19:04:55 +00:00
Jim Miller
34bdc6136f am fe07a079: am 18c5fb7c: Fix the build 
* commit 'fe07a079cad85aedba137dc6fca6b9c976844046':
  Fix the build
 2015-02-25 18:58:43 +00:00
Jim Miller
fe07a079ca am 18c5fb7c: Fix the build 
* commit '18c5fb7c2cb649b355eff5fc33022516e5af150c':
  Fix the build
 2015-02-25 18:52:03 +00:00
Jim Miller
18c5fb7c2c Fix the build 
This API was hidden for MR1.

Bug 19461292

Change-Id: Ib0a5ca536e843c91a142faeeccf684294aa3e274
 2015-02-25 10:37:37 -08:00
Dan Albert
418e964ef7 am 5e6df5ab: am f1c280b4: am 7ce263a8: Merge "Make adb_api.h safe to include first." 
* commit '5e6df5ab2a40d2562bf06b152b5c11bd3be0d341':
  Make adb_api.h safe to include first.
 2015-02-25 17:05:03 +00:00
Dan Albert
5e6df5ab2a am f1c280b4: am 7ce263a8: Merge "Make adb_api.h safe to include first." 
* commit 'f1c280b4c15b60308141093eff0c6b96a347e186':
  Make adb_api.h safe to include first.
 2015-02-25 16:52:57 +00:00
Dan Albert
f1c280b4c1 am 7ce263a8: Merge "Make adb_api.h safe to include first." 
* commit '7ce263a8512d2abe92957061c55fae383af88d44':
  Make adb_api.h safe to include first.
 2015-02-25 05:38:55 +00:00
Dan Albert
7ce263a851 Merge "Make adb_api.h safe to include first." 2015-02-25 05:32:47 +00:00
Dan Albert
28f76a9b1b Make adb_api.h safe to include first. 
Change-Id: I0fd2e3c52c69f67d7cd2b24ffcfa764613817b6f
 2015-02-24 16:40:45 -08:00
Chris Banes
2d44f66649 am abdd0b39: am c841e38f: am 9ad1e854: Update sdk.atree for new Palette dir structure 
* commit 'abdd0b39b75e440e70f144b3d2f4405cccefd372':
  Update sdk.atree for new Palette dir structure
 2015-02-24 14:51:54 +00:00
Chris Banes
abdd0b39b7 am c841e38f: am 9ad1e854: Update sdk.atree for new Palette dir structure 
* commit 'c841e38f88db355c93c8e7372b15de3ae3d05715':
  Update sdk.atree for new Palette dir structure
 2015-02-24 14:46:34 +00:00
Chris Banes
c841e38f88 am 9ad1e854: Update sdk.atree for new Palette dir structure 
* commit '9ad1e8546680a70e05e5cff315da2428bf5e1548':
  Update sdk.atree for new Palette dir structure
 2015-02-24 14:38:54 +00:00
Chris Banes
9ad1e85466 Update sdk.atree for new Palette dir structure 
Change-Id: I7776f4d843aac8496240a54d0982525039b91469
 2015-02-22 14:36:20 +00:00
Elliott Hughes
2a1130e881 am a863a264: am 6b50c254: am e7c31ba1: Merge "Add missing <stdlib.h> include to the native app glue." 
* commit 'a863a264adca7c40e53d539061059cc40670bcc0':
  Add missing <stdlib.h> include to the native app glue.
 2015-02-20 17:15:18 +00:00
Elliott Hughes
a863a264ad am 6b50c254: am e7c31ba1: Merge "Add missing <stdlib.h> include to the native app glue." 
* commit '6b50c254ba475e137000bd4116b2efad394993bd':
  Add missing <stdlib.h> include to the native app glue.
 2015-02-20 17:08:48 +00:00
Elliott Hughes
6b50c254ba am e7c31ba1: Merge "Add missing <stdlib.h> include to the native app glue." 
* commit 'e7c31ba1429c16bce8b990a06f9667680a4fe052':
  Add missing <stdlib.h> include to the native app glue.
 2015-02-20 17:02:27 +00:00
Elliott Hughes
e7c31ba142 Merge "Add missing <stdlib.h> include to the native app glue." 2015-02-20 16:58:15 +00:00
Chris Banes
2ff5cc9671 am 7114b925: am 531ebcdc: am 2797e1a4: Merge "AlertDialog Demo" into lmp-mr1-ub-dev 
* commit '7114b925b6e0f8fb5f07b75d0a9c00da0aeb2acc':
  AlertDialog Demo
 2015-02-20 12:18:53 +00:00
Chris Banes
822d9f209f am 8f95e8d7: am 97919fdf: am ee2eb13f: Merge "Add ActionMode demos to Support7Demos" into lmp-mr1-ub-dev 
* commit '8f95e8d7ab037e723942350999745c230f978d6f':
  Add ActionMode demos to Support7Demos
 2015-02-20 12:12:47 +00:00
Chris Banes
7114b925b6 am 531ebcdc: am 2797e1a4: Merge "AlertDialog Demo" into lmp-mr1-ub-dev 
* commit '531ebcdc40909b21c64d5b7f740f2201a9a8cbd5':
  AlertDialog Demo
 2015-02-20 12:12:42 +00:00
Chris Banes
531ebcdc40 am 2797e1a4: Merge "AlertDialog Demo" into lmp-mr1-ub-dev 
* commit '2797e1a4019ba3f6c0663930ac28c3fd65d84692':
  AlertDialog Demo
 2015-02-20 12:06:44 +00:00
Chris Banes
8f95e8d7ab am 97919fdf: am ee2eb13f: Merge "Add ActionMode demos to Support7Demos" into lmp-mr1-ub-dev 
* commit '97919fdfb9c8bf1e23b1e0e22939ef330eddeca8':
  Add ActionMode demos to Support7Demos
 2015-02-20 12:06:30 +00:00
Chris Banes
2797e1a401 Merge "AlertDialog Demo" into lmp-mr1-ub-dev 2015-02-20 12:00:52 +00:00
Chris Banes
97919fdfb9 am ee2eb13f: Merge "Add ActionMode demos to Support7Demos" into lmp-mr1-ub-dev 
* commit 'ee2eb13f4543dae24252bac8d3273c6acfb33329':
  Add ActionMode demos to Support7Demos
 2015-02-20 11:59:37 +00:00
Chris Banes
ee2eb13f45 Merge "Add ActionMode demos to Support7Demos" into lmp-mr1-ub-dev 2015-02-20 11:56:12 +00:00
Elliott Hughes
cdf349cf11 Add missing <stdlib.h> include to the native app glue. 
On LP64, this could have caused the top bits of the pointer returned by
malloc to be lost because sizeof(int) != sizeof(void*).

Change-Id: I866a5071c1d359478d020d7fa4d466b53d52edab
 2015-02-19 22:41:50 -08:00
Bill Yi
7798f331bc am bd436549: am 35eb9ae3: Merge commit \'418d8cac94a1e5f5dad0ee232197f2453a595c14\' into HEAD 
* commit 'bd4365494578e2f888df8789f458f66463b52781':
 2015-02-20 00:36:50 +00:00
Bill Yi
bd43654945 am 35eb9ae3: Merge commit \'418d8cac94a1e5f5dad0ee232197f2453a595c14\' into HEAD 
* commit '35eb9ae37e8b9e2c6ff5ce4a14d17998cf3c2ad7':
 2015-02-20 00:22:59 +00:00
Bill Yi
35eb9ae37e Merge commit '418d8cac94a1e5f5dad0ee232197f2453a595c14' into HEAD 2015-02-19 14:30:37 -08:00
Craig Stout
8f295cdef4 Updated to clarify division of functionality. 
PlaybackControlHelper can be used in BrowseFragment.

Change-Id: Iac37e0a4f51ed1fab5edcff20d4a7037d4cc9ef9
 2015-02-19 11:10:23 -08:00
bohu
1ff7d2032d am df7fdad9: am 0dd684b2: am 505d46bc: am 6d2c2385: am b45bd0a4: am fbfb5794: am c7a591c2: am 6a59f8ca: am 4a470965: am 2b67d0bf: am 32912fff: am 89a4eab8: am df57d459: am 6e780525: am f0f43b70: am 7bf71cfb: Merge "Bump revision number for all system images" into jb-m 
* commit 'df7fdad94fdfac68d0bc81d966961784da7832dc':
  Bump revision number for all system images
 2015-02-18 11:38:11 +00:00
bohu
a058339f22 am 7f985a3b: am fdabca67: am 986ba2fb: am 08898593: am b71024a6: am 30111408: am 56957bdb: am 7838df56: am 423bbda8: am 65325595: am 05ecbe5f: am 9bdb1793: am 7ef22839: (-s ours) am 8ec8f605: am e591d22b: am f8ac5e31: back port gles fix to api 17 
* commit '7f985a3b5a6f0d1d55b77b4545c947ac9ec6167c':
  back port gles fix to api 17
 2015-02-18 11:38:09 +00:00