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

162227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Quddus Chong
0178c0d782 am 7628b728: am decac431: am 14694d6e: am 3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs 
* commit '7628b7282608e3995a800085746f9432b2e00623':
  docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181
 2015-01-07 10:10:13 +00:00
Quddus Chong
1f03d4ba75 am fbb27960: am 4d39cfa4: am a63d2b83: am b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs 
* commit 'fbb2796079ad17ecb5894766e518d14f7e37a0db':
  docs: Updated the description of the enhanced camera APIs in L. bug: 18142680
 2015-01-07 10:10:08 +00:00
Joe Fernandez
912b25743d am 52aec00c: am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs 
* commit '52aec00cb4109ae56633e02dd698de0f0f0c9191':
  docs: studio index typo
 2015-01-07 10:10:03 +00:00
Joe Fernandez
ea765e7d80 am 76094382: am c6fe54ed: am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs 
* commit '76094382cf8a8860f2fb3d837246deb1b8baed96':
  docs: studio bundle checksum update
 2015-01-07 10:09:58 +00:00
Joe Fernandez
909f840cda am 4c5b5cff: Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev 
* commit '4c5b5cffa7412a66cb56fe7b78daa7c0ee3d689a':
  docs: Checklist for TV Apps
 2015-01-07 10:09:52 +00:00
Quddus Chong
7628b72826 am decac431: am 14694d6e: am 3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181" into lmp-docs 
* commit 'decac4319172c5f1c618de93dcb2a15678c3e214':
  docs: Updated GMS version numbering to be consistent with blog post. bug: 18718181
 2015-01-07 09:23:07 +00:00
Quddus Chong
fbb2796079 am 4d39cfa4: am a63d2b83: am b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug: 18142680" into lmp-docs 
* commit '4d39cfa415f1c391a94b001319b8d1c7b02b61c2':
  docs: Updated the description of the enhanced camera APIs in L. bug: 18142680
 2015-01-07 09:23:02 +00:00
Joe Fernandez
52aec00cb4 am ca14e6c8: am f50be1fc: am 91c35ce1: Merge "docs: studio index typo" into lmp-docs 
* commit 'ca14e6c8326136686d3de796f1fcd7eb2b5aebe3':
  docs: studio index typo
 2015-01-07 09:22:58 +00:00
Joe Fernandez
76094382cf am c6fe54ed: am 62c3abe7: am acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs 
* commit 'c6fe54ed869d270533f6a3cf6ddea1e10d83afcc':
  docs: studio bundle checksum update
 2015-01-07 09:22:53 +00:00
Joe Fernandez
4c5b5cffa7 Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev 2015-01-07 09:14:17 +00:00
Sungsoo Lim
8b2b71f511 am 71d8b8ce: Merge "DO NOT MERGE Implement cloneTvInputEvent" into lmp-mr1-dev 
* commit '71d8b8ce99296fdc9e4420e4d43daa6e65c65c61':
  DO NOT MERGE Implement cloneTvInputEvent
 2015-01-07 08:04:07 +00:00
Sungsoo Lim
71d8b8ce99 Merge "DO NOT MERGE Implement cloneTvInputEvent" into lmp-mr1-dev 2015-01-07 07:58:18 +00:00
Wonsik Kim
ee4da17344 am cee5c8ed: Merge "DO NOT MERGE TIF: change TvInputHal events to run on its own thread" into lmp-mr1-dev 
* commit 'cee5c8edeedb2723476d185027107faaa5fa1cec':
  DO NOT MERGE TIF: change TvInputHal events to run on its own thread
 2015-01-07 07:35:33 +00:00
Wonsik Kim
cee5c8edee Merge "DO NOT MERGE TIF: change TvInputHal events to run on its own thread" into lmp-mr1-dev 2015-01-07 07:30:53 +00:00
Scott Rowe
188a8774c9 resolved conflicts for merge of ea0137ef to lmp-mr1-dev 
Change-Id: If0a38ebe4e72ec6c1a3683fab1302ee0fdfe4214
 2015-01-06 19:30:11 -08:00
Paul Miller
c2a17fff85 am a517e81e: Merge "Fix crash on pasting text in a WebView" into lmp-mr1-dev 
* commit 'a517e81e2b1594da3e12c0547aabac5f357ce97b':
  Fix crash on pasting text in a WebView
 2015-01-07 01:17:32 +00:00
Paul Miller
a517e81e2b Merge "Fix crash on pasting text in a WebView" into lmp-mr1-dev 2015-01-07 01:08:35 +00:00
Shishir Agrawal
d0173277b2 am 5a21b0c2: Merge "GpsLocationProvider: Read data enabled status from TelephonyManager." into lmp-mr1-dev 
* commit '5a21b0c2d0fca36fbbfb32641002ad4122c6b128':
  GpsLocationProvider: Read data enabled status from TelephonyManager.
 2015-01-07 00:16:56 +00:00
Shishir Agrawal
5a21b0c2d0 Merge "GpsLocationProvider: Read data enabled status from TelephonyManager." into lmp-mr1-dev 2015-01-07 00:12:17 +00:00
Yin-Chia Yeh
c2112a7598 am 8d46f934: Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev 
* commit '8d46f934ca56e057182882034d796cc03e960c4d':
  Camera: doc update for color aberration modes
 2015-01-07 00:04:13 +00:00
Yin-Chia Yeh
8d46f934ca Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev 2015-01-06 23:59:03 +00:00
Ye Wen
ded6ccdc76 am 55fb7576: Merge "Add new mms error for no data network (airplane mode or no mobile data)" into lmp-mr1-dev 
* commit '55fb7576c34e859a9dbd6f3825ca8cf6f3d3f88e':
  Add new mms error for no data network (airplane mode or no mobile data)
 2015-01-06 23:54:50 +00:00
Ye Wen
55fb7576c3 Merge "Add new mms error for no data network (airplane mode or no mobile data)" into lmp-mr1-dev 2015-01-06 23:49:23 +00:00
Ricardo Cervera
85e0e70dfa am 58872406: am a9a51433: am f211b625: am fa6fb0da: docs: Minor fixes to Watch Faces design guidelines. 
* commit '58872406a7f51f572fc272c12ab26024a358df07':
  docs: Minor fixes to Watch Faces design guidelines.
 2015-01-06 22:48:36 +00:00
Ricardo Cervera
58872406a7 am a9a51433: am f211b625: am fa6fb0da: docs: Minor fixes to Watch Faces design guidelines. 
* commit 'a9a514331ce33dde91fbcc791fdc523b74a4ffb4':
  docs: Minor fixes to Watch Faces design guidelines.
 2015-01-06 22:41:03 +00:00
Shishir Agrawal
fabbdf7204 GpsLocationProvider: Read data enabled status from TelephonyManager. 
Bug: 18814559
Change-Id: I1488bd763d95d5ad087bc4ceb5f4c3767c05b62f
 2015-01-06 14:35:31 -08:00
Deepanshu Gupta
aebd7fdb66 am 565f2245: am a6671b70: am 6461e054: Merge "Add image comparison to LayoutLib tests." into lmp-dev 
* commit '565f2245402f4fe6038942b03b9a35cfc0d48d86':
  Add image comparison to LayoutLib tests.
 2015-01-06 22:29:52 +00:00
Deepanshu Gupta
8c831b2fc6 am 86f96d07: am 0db2524c: am b2ebb968: Merge "Remove Time from CreateInfo" into lmp-dev 
* commit '86f96d07c7d531d69bab3d402d33eb8f15038eee':
  Remove Time from CreateInfo
 2015-01-06 22:29:46 +00:00
Deepanshu Gupta
c2e9875dcb am 229ce665: am 937db7a3: am 53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev 
* commit '229ce66583a51baabf83fec4d0c42af0d3ecba38':
  Add DatePicker, CalendarView to LayoutLib tests
 2015-01-06 22:29:39 +00:00
Deepanshu Gupta
84097e3977 am b187106c: am e69e4f8b: am f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-dev 
* commit 'b187106c5397072b6ae26061cec847ec9343caee':
  Fix DatePicker rendering.
 2015-01-06 22:29:34 +00:00
Deepanshu Gupta
c7fe979303 am 48ab6bec: am 8c686ddd: am d20a518c: Merge "Make Preference-cookie map non static." into lmp-dev 
* commit '48ab6becea828c0bcaaf79fe930aac31881f59db':
  Make Preference-cookie map non static.
 2015-01-06 22:29:29 +00:00
Deepanshu Gupta
addaeff9b2 am b88a65df: am cec8e5a1: am f861c0ce: Merge "Fix default initial value for preferences" into lmp-dev 
* commit 'b88a65df73798becc57004b3fc55fdf8c0a83a13':
  Fix default initial value for preferences
 2015-01-06 22:29:24 +00:00
Deepanshu Gupta
e15f580b9d am 2bd01ebf: am 7ed14549: am 7081a114: Merge "Add preferences rendering." into lmp-dev 
* commit '2bd01ebfa99815d4fb6b4e77754146a22cf66d03':
  Add preferences rendering.
 2015-01-06 22:29:17 +00:00
Ricardo Cervera
934c8ddc20 am ebc28729: am e7d1db56: am d69238ef: am 4bb503cf: docs: Minor fixes in Android Studio pages. 
* commit 'ebc2872929177c4780c68a0371a44c25f89a4f1f':
  docs: Minor fixes in Android Studio pages.
 2015-01-06 22:29:12 +00:00
Baligh Uddin
efc0bbecc5 am 94c4b4b2: (-s ours) am 15552158: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '94c4b4b2a5c368a4894bbd8a42301f7ce443129b':
  Import translations. DO NOT MERGE
 2015-01-06 22:29:07 +00:00
Sarah Maddox
efd72a4845 am f22bca34: am 7d9309b6: am 029acc8e: am ab515931: Merge "docs: Fixes typo on Play services page for Maps." into lmp-docs 
* commit 'f22bca34a08c4e24981f169d20135835a189cbf4':
  docs: Fixes typo on Play services page for Maps.
 2015-01-06 22:28:54 +00:00
Joe Fernandez
952ebe3fac am 64d74fbf: am 69434df3: am 180bd6be: am 76db15a8: docs: fix problem with TOC after Japanese pages merge 
* commit '64d74fbf8739d6992ccb9b42c53705ad9fce9e91':
  docs: fix problem with TOC after Japanese pages merge
 2015-01-06 22:28:49 +00:00
David Friedman
859e176bfe am aed8152d: 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 'aed8152d864b90363569c3a2de09de35048cfeb2':
  Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
 2015-01-06 22:28:43 +00:00
Joe Fernandez
9ebb780ccb am 750c0385: am 214e6867: am c27d5fd6: am 7cec35ef: Merge "docs: b/18122848 [DAC] Android TV - Recommendation card" into lmp-docs 
* commit '750c0385601964ae0bf16b75fe94eb1da22ffa29':
  docs: b/18122848 [DAC] Android TV - Recommendation card
 2015-01-06 22:28:38 +00:00
Joe Fernandez
633db0ee66 am c4429f1f: am 001f6f54: am 66fefd0c: am a9a36ab2: Merge "docs: plugin link name update" into lmp-docs 
* commit 'c4429f1fac0a7be38adaed24eec87e3d3d1e077c':
  docs: plugin link name update
 2015-01-06 22:28:33 +00:00
Scott Rowe
dfc950b40d am aa7c1f68: am 13d31b0a: am d7d1411a: am e2b44f86: docs: Making TV Apps Searchable - new training 
* commit 'aa7c1f6845dcac1ade80196280ead40958bd1acd':
  docs: Making TV Apps Searchable - new training
 2015-01-06 22:28:25 +00:00
Deepanshu Gupta
565f224540 am a6671b70: am 6461e054: Merge "Add image comparison to LayoutLib tests." into lmp-dev 
* commit 'a6671b707446963f402a71219725f317a57b42af':
  Add image comparison to LayoutLib tests.
 2015-01-06 22:23:01 +00:00
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