LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,153 Commits 2 Branches 0 Tags
d45cc6b4e9b882b593f46af6cbb7bcd8b64af4a4
Commit Graph

14153 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Murray
78133f5323 Merge "Fix build" 2014-02-03 23:31:54 +00:00
George Mount
7e7300ba81 am 971f7a93: Merge "Revert "Add Trim Path API demo."" 
* commit '971f7a937246e8f84a6a217bf1aa15b5a5ef39c2':
  Revert "Add Trim Path API demo."
 2014-02-03 15:31:26 -08:00
Raphael Moll
7abef20d37 am 95410fd8: am 273f790b: am 56142356: Merge "Update revision of Android SDK USB driver for Windows." 
* commit '95410fd8b96f00268f732e4e46b1df7ba96a67d2':
 2014-02-03 15:31:25 -08:00
Nick Kralevich
720b4e94e5 Fix build 
This was broken due to 390ec00c6693fb20004f357901beae919a79329f
in frameworks/base

Change-Id: Ieaff5f34ef56efdd492af2f2e7c2294448223616
 2014-02-03 15:25:34 -08:00
George Mount
43c6d241a9 am 1b660cc9: am ca2b0f8c: Merge "Add PathAnimations ApiDemos." 
* commit '1b660cc9f2fa9c0ce47494f1c6429fe0b750242f':
  Add PathAnimations ApiDemos.
 2014-02-03 22:14:10 +00:00
Xavier Ducrohet
354634b8bb am 129c2dbb: am 7a8cfbfd: am b63c1328: am 55089c32: Merge "Android SDK Windows USB driver: Glass PID." 
* commit '129c2dbb8f8e8a0348c73091e425d413725d3d90':
 2014-02-03 22:14:09 +00:00
George Mount
1b660cc9f2 am ca2b0f8c: Merge "Add PathAnimations ApiDemos." 
* commit 'ca2b0f8c624379abfd841e85778449d71664a833':
  Add PathAnimations ApiDemos.
 2014-02-03 14:09:57 -08:00
Xavier Ducrohet
129c2dbb8f am 7a8cfbfd: am b63c1328: am 55089c32: Merge "Android SDK Windows USB driver: Glass PID." 
* commit '7a8cfbfd7fda79a0e16c0920d85a4644cf7f211d':
 2014-02-03 14:09:56 -08:00
Raphael Moll
4f68a32ec9 am f2534edf: am 56142356: Merge "Update revision of Android SDK USB driver for Windows." 
* commit 'f2534edf0eea09e5f5c09b02802bc69b79112f8f':
  Update revision of Android SDK USB driver for Windows.
 2014-01-31 23:17:47 +00:00
Raphael Moll
f2534edf0e am 56142356: Merge "Update revision of Android SDK USB driver for Windows." 
* commit '561423569c11698698450b87a91c7a94d5077e5f':
  Update revision of Android SDK USB driver for Windows.
 2014-01-31 15:12:35 -08:00
Xavier Ducrohet
e8e50cdc14 am 941fa37f: am 55089c32: Merge "Android SDK Windows USB driver: Glass PID." 
* commit '941fa37fece66981f0384394d2ffa48fea8c0c5f':
  Android SDK Windows USB driver: Glass PID.
 2014-01-31 16:52:01 +00:00
Xavier Ducrohet
941fa37fec am 55089c32: Merge "Android SDK Windows USB driver: Glass PID." 
* commit '55089c32d599d2a7108e10728c59ad1f1b24384d':
  Android SDK Windows USB driver: Glass PID.
 2014-01-31 08:46:10 -08:00
George Mount
971f7a9372 Merge "Revert "Add Trim Path API demo."" 2014-01-31 16:27:16 +00:00
Raphael Moll
95410fd8b9 am 273f790b: am 56142356: Merge "Update revision of Android SDK USB driver for Windows." 
* commit '273f790b6b2dd354c9df2751e2f96074c1bbfd55':
  Update revision of Android SDK USB driver for Windows.
 2014-01-31 16:26:42 +00:00
George Mount
bfe084a225 Revert "Add Trim Path API demo." 
Bug 12489442

This reverts commit fad0b21946.

Change-Id: I527d0927bf891fc9570e860c158a352e1767474c
 2014-01-31 07:23:11 -08:00
George Mount
ca2b0f8c62 Merge "Add PathAnimations ApiDemos." 2014-01-31 15:21:10 +00:00
Xavier Ducrohet
7a8cfbfd7f am b63c1328: am 55089c32: Merge "Android SDK Windows USB driver: Glass PID." 
* commit 'b63c13281078137e5ae2743af2b34f8f1295c69f':
  Android SDK Windows USB driver: Glass PID.
 2014-01-31 14:51:01 +00:00
Raphael Moll
273f790b6b am 56142356: Merge "Update revision of Android SDK USB driver for Windows." 
* commit '561423569c11698698450b87a91c7a94d5077e5f':
  Update revision of Android SDK USB driver for Windows.
 2014-01-31 12:17:13 +00:00
Xavier Ducrohet
b63c132810 am 55089c32: Merge "Android SDK Windows USB driver: Glass PID." 
* commit '55089c32d599d2a7108e10728c59ad1f1b24384d':
  Android SDK Windows USB driver: Glass PID.
 2014-01-31 10:26:49 +00:00
Yuhao Zheng
a37d71d9e5 am 0ef4b4b5: am d6968024: Merge "Add opt/net/wifi/service to eclipse .classpath" 
* commit '0ef4b4b54f19480be25228e37b7eb4eeac4280dc':
  Add opt/net/wifi/service to eclipse .classpath
 2014-01-31 06:07:36 +00:00
Yuhao Zheng
0ef4b4b54f am d6968024: Merge "Add opt/net/wifi/service to eclipse .classpath" 
* commit 'd6968024410ba3a3c9c1f2161800cd8130d8ec2c':
  Add opt/net/wifi/service to eclipse .classpath
 2014-01-30 22:04:09 -08:00
Yuhao Zheng
d696802441 Merge "Add opt/net/wifi/service to eclipse .classpath" 2014-01-31 06:01:09 +00:00
Raphael Moll
e0cda8e232 am fd60d825: am 56a36649: Update revision of Android SDK USB driver for Windows. DO NOT MERGE. 
* commit 'fd60d8251e2618758871b6614e2e5b8948333a9e':
  Update revision of Android SDK USB driver for Windows. DO NOT MERGE.
 2014-01-30 20:32:03 +00:00
Raphael Moll
575a6c1ebe am 246169c6: am 068a00f8: Android SDK Windows USB driver: Glass PID. DO NOT MERGE. 
* commit '246169c674b3c5084118410fe78f7c02ac8ace45':
  Android SDK Windows USB driver: Glass PID. DO NOT MERGE.
 2014-01-30 20:32:02 +00:00
Raphael Moll
fd60d8251e am 56a36649: Update revision of Android SDK USB driver for Windows. DO NOT MERGE. 
* commit '56a36649139e6a12285e689702301943502e0be9':
  Update revision of Android SDK USB driver for Windows. DO NOT MERGE.
 2014-01-30 12:29:59 -08:00
Raphael Moll
246169c674 am 068a00f8: Android SDK Windows USB driver: Glass PID. DO NOT MERGE. 
* commit '068a00f85054a5da4f8128eba97c72e1b52600da':
  Android SDK Windows USB driver: Glass PID. DO NOT MERGE.
 2014-01-30 12:29:58 -08:00
Raphael Moll
56a3664913 Update revision of Android SDK USB driver for Windows. DO NOT MERGE. 
Rev 9 adds the Glass PID.

(Merged from AOSP 8221674986)
Change-Id: I1ec7985b9715d813f6442dad41a27233d8dd4822
 2014-01-30 12:27:18 -08:00
Raphael Moll
068a00f850 Android SDK Windows USB driver: Glass PID. DO NOT MERGE. 
(Merged from AOSP 260db8ce43)
Change-Id: Id190e9e83c48bf6b3df08707efdbf154720c3a78
 2014-01-30 12:27:11 -08:00
Raphael Moll
561423569c Merge "Update revision of Android SDK USB driver for Windows." 2014-01-30 18:22:23 +00:00
Raphael Moll
8221674986 Update revision of Android SDK USB driver for Windows. 
Rev 9 adds the Glass PID.

Change-Id: I1ec7985b9715d813f6442dad41a27233d8dd4822
 2014-01-30 10:16:57 -08:00
Xavier Ducrohet
55089c32d5 Merge "Android SDK Windows USB driver: Glass PID." 2014-01-29 23:02:54 +00:00
Raphael Moll
260db8ce43 Android SDK Windows USB driver: Glass PID. 
Change-Id: Id190e9e83c48bf6b3df08707efdbf154720c3a78
 2014-01-29 14:57:49 -08:00
Adam Powell
867992edcd am d9dbe909: am 620877f3: am b9767caa: Updated Support7Demos to follow RecyclerView API changes 
* commit 'd9dbe909a20e772b4d612de438addaaf628e9989':
  Updated Support7Demos to follow RecyclerView API changes
 2014-01-29 18:01:28 +00:00
Adam Powell
d9dbe909a2 am 620877f3: am b9767caa: Updated Support7Demos to follow RecyclerView API changes 
* commit '620877f34c06ae3e085d390b6b8fc02040018fb7':
  Updated Support7Demos to follow RecyclerView API changes
 2014-01-29 09:58:10 -08:00
Adam Powell
620877f34c am b9767caa: Updated Support7Demos to follow RecyclerView API changes 
* commit 'b9767caa951c119945de50ec0a6f1f6113ba44bb':
  Updated Support7Demos to follow RecyclerView API changes
 2014-01-29 17:55:17 +00:00
Adam Powell
b9767caa95 Updated Support7Demos to follow RecyclerView API changes 
Move off of deprecated RecyclerView API to illustrate preferred
practices.

Change-Id: I6d2b6450bbb29c55090802b2ccafab6661036dcb
 2014-01-28 18:51:11 -08:00
Chet Haase
1c58f8cda2 am d1d008d3: am a6e59a9d: Add controls demo with default theme 
* commit 'd1d008d382e559049d08b743c06ae1eebab52699':
  Add controls demo with default theme
 2014-01-28 22:20:39 +00:00
Chet Haase
d1d008d382 am a6e59a9d: Add controls demo with default theme 
* commit 'a6e59a9d7fd33c5da2be622a83e283083d6a3d59':
  Add controls demo with default theme
 2014-01-28 14:17:38 -08:00
Chet Haase
a6e59a9d7f Add controls demo with default theme 
Change-Id: I95cd31cd93e77b17aa2bcacf6e6140aaba719217
 2014-01-28 14:13:31 -08:00
Igor Murashkin
9cfa50fe65 am a1b9e5b4: am b3584862: Merge changes Ia8070804,I3033b442,I5e9fcebe 
* commit 'a1b9e5b42f981d36af4158d0df3bf3d9360759fa':
  runtest: add an extra pattern for gtest file names (*Tests.[c|cpp])
  runtest: add --build-install-only/-i flag to skip test execution
  runtest: Update to work with emulator and to build dependencies
 2014-01-25 00:37:01 +00:00
Igor Murashkin
a1b9e5b42f am b3584862: Merge changes Ia8070804,I3033b442,I5e9fcebe 
* commit 'b35848625b62ee78d8360d753d1b30ad573c6a9a':
  runtest: add an extra pattern for gtest file names (*Tests.[c|cpp])
  runtest: add --build-install-only/-i flag to skip test execution
  runtest: Update to work with emulator and to build dependencies
 2014-01-24 16:35:05 -08:00
Igor Murashkin
b35848625b Merge changes Ia8070804,I3033b442,I5e9fcebe 
* changes:
  runtest: add an extra pattern for gtest file names (*Tests.[c|cpp])
  runtest: add --build-install-only/-i flag to skip test execution
  runtest: Update to work with emulator and to build dependencies
 2014-01-25 00:32:08 +00:00
Igor Murashkin
f9cfbd39ae runtest: add an extra pattern for gtest file names (*Tests.[c|cpp]) 
Change-Id: Ia8070804110e8064f79a8063ed6aefc92d71bf7a
 2014-01-24 16:03:11 -08:00
Igor Murashkin
8d703533ba runtest: add --build-install-only/-i flag to skip test execution 
Change-Id: I3033b442e33a69442b881f0a5a7b9e2299d35d54
 2014-01-24 16:03:11 -08:00
Igor Murashkin
a0afc8cfb2 runtest: Update to work with emulator and to build dependencies 
* Combine dalvik.vm.dexopt-flags with existing to disable verification
* Always do a runtime reset (stop;start) instead of rebooting device
* Build dependencies (mma) if regular build fails (mm)

Change-Id: I5e9fcebeea052c3314d1f4146b074637c329c0a0
 2014-01-24 16:03:06 -08:00
Adam Powell
1c2811d1bc am b9eebec9: am 09b5d826: am 35421b12: Follow RecyclerView API changes 
* commit 'b9eebec997b9263706bf444c5cd4505c961a0da6':
  Follow RecyclerView API changes
 2014-01-24 00:26:17 +00:00
Adam Powell
b9eebec997 am 09b5d826: am 35421b12: Follow RecyclerView API changes 
* commit '09b5d826ddc963d5f006963db5fb75be68154e40':
  Follow RecyclerView API changes
 2014-01-23 16:23:33 -08:00
Adam Powell
09b5d826dd am 35421b12: Follow RecyclerView API changes 
* commit '35421b12299f9569f82c228631c4156fbb3f0b94':
  Follow RecyclerView API changes
 2014-01-24 00:21:04 +00:00
Adam Powell
35421b1229 Follow RecyclerView API changes 
Change-Id: Ic273cc51cc9d7096a7a0d8b5f90accd5986e275a
 2014-01-23 16:11:09 -08:00
Adam Powell
81dc277250 am d5646448: am 0305f641: am e40272d7: Merge "Update sample for RecyclerView" into klp-modular-dev 
* commit 'd564644849c4b802e0848ea8b5e7cce2c05deaf2':
  Update sample for RecyclerView
 2014-01-22 21:43:24 +00:00