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

159313 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
86f96d07c7 am 0db2524c: am b2ebb968: Merge "Remove Time from CreateInfo" into lmp-dev 
* commit '0db2524caa01022629075a113d3370a1b7c3da30':
  Remove Time from CreateInfo
 2015-01-06 22:22:56 +00:00
Deepanshu Gupta
229ce66583 am 937db7a3: am 53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev 
* commit '937db7a39ef6f5e88a936f78a729f9578123e60b':
  Add DatePicker, CalendarView to LayoutLib tests
 2015-01-06 22:22:53 +00:00
Deepanshu Gupta
b187106c53 am e69e4f8b: am f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-dev 
* commit 'e69e4f8b4db142f024e170cf6faabb36095799b7':
  Fix DatePicker rendering.
 2015-01-06 22:22:49 +00:00
Deepanshu Gupta
48ab6becea am 8c686ddd: am d20a518c: Merge "Make Preference-cookie map non static." into lmp-dev 
* commit '8c686ddd540f3a15cdba4893f104c0e8e9af5716':
  Make Preference-cookie map non static.
 2015-01-06 22:22:44 +00:00
Deepanshu Gupta
b88a65df73 am cec8e5a1: am f861c0ce: Merge "Fix default initial value for preferences" into lmp-dev 
* commit 'cec8e5a10de413c733223b8b1cc11b70c6254647':
  Fix default initial value for preferences
 2015-01-06 22:22:40 +00:00
Deepanshu Gupta
2bd01ebfa9 am 7ed14549: am 7081a114: Merge "Add preferences rendering." into lmp-dev 
* commit '7ed145493d3f5bea32c567980f77cc42f613197e':
  Add preferences rendering.
 2015-01-06 22:22:36 +00:00
Ricardo Cervera
ebc2872929 am e7d1db56: am d69238ef: am 4bb503cf: docs: Minor fixes in Android Studio pages. 
* commit 'e7d1db56324e406a074bf0c44e778060b07d2322':
  docs: Minor fixes in Android Studio pages.
 2015-01-06 22:22:27 +00:00
Baligh Uddin
94c4b4b2a5 am 15552158: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '155521586c71b8fd2ed61e3cd860a3a75c55a4e9':
  Import translations. DO NOT MERGE
 2015-01-06 22:22:13 +00:00
Sarah Maddox
f22bca34a0 am 7d9309b6: am 029acc8e: am ab515931: Merge "docs: Fixes typo on Play services page for Maps." into lmp-docs 
* commit '7d9309b6e9e6974608b2d355c9eb1a66550801b2':
  docs: Fixes typo on Play services page for Maps.
 2015-01-06 22:22:08 +00:00
Joe Fernandez
64d74fbf87 am 69434df3: am 180bd6be: am 76db15a8: docs: fix problem with TOC after Japanese pages merge 
* commit '69434df395798a725072424782f79daaa23aae14':
  docs: fix problem with TOC after Japanese pages merge
 2015-01-06 22:21:58 +00:00
David Friedman
aed8152d86 am 2d179c89: am 919ecb22: am 58a5e3db: Merge "Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e" into lmp-docs 
* commit '2d179c899a59a2001a665ca6c3725832aced648c':
  Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
 2015-01-06 22:21:54 +00:00
Joe Fernandez
750c038560 am 214e6867: am c27d5fd6: am 7cec35ef: Merge "docs: b/18122848 [DAC] Android TV - Recommendation card" into lmp-docs 
* commit '214e6867c5339468a960e8b8a20c535c99eb9e57':
  docs: b/18122848 [DAC] Android TV - Recommendation card
 2015-01-06 22:21:47 +00:00
Joe Fernandez
c4429f1fac am 001f6f54: am 66fefd0c: am a9a36ab2: Merge "docs: plugin link name update" into lmp-docs 
* commit '001f6f5451a71da328c3e05b4da1ad3bf24ad613':
  docs: plugin link name update
 2015-01-06 22:21:43 +00:00
Scott Rowe
aa7c1f6845 am 13d31b0a: am d7d1411a: am e2b44f86: docs: Making TV Apps Searchable - new training 
* commit '13d31b0a40dd58d61e8a6ad82c1de165792b95e4':
  docs: Making TV Apps Searchable - new training
 2015-01-06 22:21:38 +00:00
Christopher Tate
1c6014e77d Merge "Remove the "backup_data_changed" event log" into lmp-mr1-dev 2015-01-06 18:09:41 +00:00
Dianne Hackborn
5fe8197fde Merge "Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit" into lmp-mr1-dev 2015-01-06 18:00:00 +00:00
Paul Jensen
9ffb53cb11 Clear process DNS NetID binding when expiring or releaseing legacy requests. 
When requests made by ConnectivityManager.startUsingNetworkFeature() are
expired or are canceled via ConnectivityManager.stopUsingNetworkFeature(),
we must remember to clear the binding of DNS requests from the calling
process to the Network satisfying the request.

bug:18778725
Change-Id: I800c808ac6486000241b5d263aa79a1192a9fe9e
 2015-01-06 09:43:04 -05:00
Jinsuk Kim
b0b4921bcb Merge "CEC: Make deviceSelect work for MHL device" into lmp-mr1-dev 2015-01-06 04:03:21 +00:00
Jinsuk Kim
6ad7cbde22 CEC: Make deviceSelect work for MHL device 
MHL device works on hotplug but not when API deviceSelect is invoked
to select it due to a bug not finding the right MHL device instance.
This CL rectifies it by searching for not only CEC but MHL devices
attached to TV.

Bug: 18909552
Change-Id: I4df1ead836090eb3a7476b7738be47a6970edb7d
 2015-01-06 11:52:14 +09:00
Andrew Solovay
ff62a5eea7 am 4c7390d3: am b663f2fc: am 713cd74e: docs: New "app compatibility with managed profiles" doc 
* commit '4c7390d392dfe4a5df626ce28d415e01cab7d132':
  docs: New "app compatibility with managed profiles" doc
 2015-01-06 02:02:02 +00:00
Joe Fernandez
2719533819 am 546a0e8c: am 60925265: am afc3b9e7: Merge "docs: studio build output dir name update" into lmp-docs 
* commit '546a0e8c695808c987be3fbac1b3e632b6c6aa8d':
  docs: studio build output dir name update
 2015-01-06 02:01:14 +00:00
Joe Fernandez
851931f062 am 21b92f34: am 43f4e8fa: am 27cb0a56: Merge "docs: gradle version update in plugin file" into lmp-docs 
* commit '21b92f34525e12ede8f842f6c426d33093df3b24':
  docs: gradle version update in plugin file
 2015-01-06 02:01:09 +00:00
Joe Fernandez
3dcc12892f am 447ea509: am f110d357: am 8eaf4042: Merge "docs: gradle wrapper security note" into lmp-docs 
* commit '447ea5097ba99ca25ddd613e72e10b57f3405291':
  docs: gradle wrapper security note
 2015-01-06 02:01:05 +00:00
Joe Fernandez
765ae116e2 am eed87a57: am 09b41c02: am e6395cd3: Merge "docs: project file and toc updates" into lmp-docs 
* commit 'eed87a573a2e67c85f5a8e79ad538cce278932d2':
  docs: project file and toc updates
 2015-01-06 02:01:01 +00:00
Joe Fernandez
596868b648 am c811b88a: am d3d09d87: am 66e851fa: Merge "docs: studio workflow links" into lmp-docs 
* commit 'c811b88ab1bc891fffdef461ead0f6dc7331d04e':
  docs: studio workflow links
 2015-01-06 02:00:57 +00:00
Joe Fernandez
a78664e030 am 411c779b: am c919f7cf: am 1092bafa: Merge "docs: studio tips and ticks grammmar typo" into lmp-docs 
* commit '411c779bb746d81278b7646ffd96fa6e4f8336b9':
  docs: studio tips and ticks grammmar typo
 2015-01-06 02:00:53 +00:00
Ricardo Cervera
ac4444a26f am c5fae959: am 48a066db: am 60cfb01a: Merge "docs: Update wearable lists docs" into lmp-docs 
* commit 'c5fae9593553a89db2ad49306b46b8f9a3631489':
  docs: Update wearable lists docs
 2015-01-06 02:00:48 +00:00
Joe Fernandez
b1062ad68e am c3fb32ab: am 4603c122: am 18a75595: Merge "docs: studio device emulator updates" into lmp-docs 
* commit 'c3fb32ab3989806f49cdd21ca58a044daf74f060':
  docs: studio device emulator updates
 2015-01-06 02:00:42 +00:00
Sarah Maddox
15e94fdf34 am 4811f9b8: am ecf0ac29: am ca23a587: Merge "docs: Updates the request-location-updates lesson in the location APIs training course." into lmp-docs 
* commit '4811f9b84766adc17efb730160e15785d74875a3':
  docs: Updates the request-location-updates lesson in the location APIs training course.
 2015-01-06 02:00:32 +00:00
Ricardo Cervera
fcba64722b am 9719336b: am 4ef7873d: am 8e631d2d: Merge "docs: Adding vector drawables video" into lmp-docs 
* commit '9719336b3a9a059c31200137a93f74445d3c7185':
  docs: Adding vector drawables video
 2015-01-06 02:00:24 +00:00
Joe Fernandez
f3d9f03053 am adaef486: am e78489b4: am e22b42b3: Merge "docs: plugin reference update" into lmp-docs 
* commit 'adaef486464af836cd3408657634c972419e4c80':
  docs: plugin reference update
 2015-01-06 02:00:14 +00:00
Christopher Tate
603ad6f7d0 Remove the "backup_data_changed" event log 
Nowadays it's just spammy and uninformative, so away it goes.

Bug 18833115

Change-Id: Ic373c596d7a892c4fedc0343e2c03dc1c295225e
 2015-01-05 17:07:57 -08:00
Alan Viverette
ccfd34f6b5 Merge "Scroll handle was half as opaque as it was supposed to be" into lmp-mr1-dev 2015-01-06 00:49:09 +00:00
Shishir Agrawal
8955c54e0e Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev 2015-01-06 00:37:07 +00:00
Sungsoo Lim
2bdf89b167 Merge "DO NOT MERGE Fix typo" into lmp-mr1-dev 2015-01-06 00:13:14 +00:00
Alan Viverette
c01678ea2d Scroll handle was half as opaque as it was supposed to be 
BUG: 18903443
Change-Id: Ie6a220899685f654a40d57ae0408e9c91afe868a
 2015-01-05 16:06:26 -08:00
Dianne Hackborn
c478cf5185 Fix issue #18907544: Activity manager miscomputed high RAM for 64 bit 
No longer modify the base constants when computing oom adj values.

Change-Id: I1fa1e0013d544ad026de6dffecc7598ef7399911
 2015-01-05 16:05:05 -08:00
Deepanshu Gupta
0db2524caa am b2ebb968: Merge "Remove Time from CreateInfo" into lmp-dev 
* commit 'b2ebb9683fb5b21543b50772a0d4c646ced7764b':
  Remove Time from CreateInfo
 2015-01-05 23:33:14 +00:00
Deepanshu Gupta
937db7a39e am 53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev 
* commit '53f73a97542c277a519b973060dfa217849b66de':
  Add DatePicker, CalendarView to LayoutLib tests
 2015-01-05 23:33:10 +00:00
Deepanshu Gupta
e69e4f8b4d am f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-dev 
* commit 'f9bb0b5e133b0c364c3f87623f0fdff0fedc5226':
  Fix DatePicker rendering.
 2015-01-05 23:33:06 +00:00
Deepanshu Gupta
8c686ddd54 am d20a518c: Merge "Make Preference-cookie map non static." into lmp-dev 
* commit 'd20a518c82e5e33d33e3dc5d74bf3c17d807f7d7':
  Make Preference-cookie map non static.
 2015-01-05 23:33:02 +00:00
Deepanshu Gupta
cec8e5a10d am f861c0ce: Merge "Fix default initial value for preferences" into lmp-dev 
* commit 'f861c0ce3ff42550f3d5ede837e7bfb3855f5964':
  Fix default initial value for preferences
 2015-01-05 23:32:58 +00:00
Deepanshu Gupta
7ed145493d am 7081a114: Merge "Add preferences rendering." into lmp-dev 
* commit '7081a114d4ee190c746f337057b0f84928c162dd':
  Add preferences rendering.
 2015-01-05 23:32:53 +00:00
Deepanshu Gupta
4a5baeaec9 Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev 2015-01-05 23:26:04 +00:00
Deepanshu Gupta
b2ebb9683f Merge "Remove Time from CreateInfo" into lmp-dev 2015-01-05 23:24:31 +00:00
Deepanshu Gupta
53f73a9754 Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev 2015-01-05 23:23:42 +00:00
Deepanshu Gupta
f9bb0b5e13 Merge "Fix DatePicker rendering." into lmp-dev 2015-01-05 23:23:33 +00:00
Deepanshu Gupta
d20a518c82 Merge "Make Preference-cookie map non static." into lmp-dev 2015-01-05 23:22:58 +00:00
Deepanshu Gupta
f861c0ce3f Merge "Fix default initial value for preferences" into lmp-dev 2015-01-05 23:22:45 +00:00
Deepanshu Gupta
7081a114d4 Merge "Add preferences rendering." into lmp-dev 2015-01-05 23:22:29 +00:00