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

179457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
03d7b6f232 am 7b895dea: am d0173277: am 5a21b0c2: Merge "GpsLocationProvider: Read data enabled status from TelephonyManager." into lmp-mr1-dev 
* commit '7b895dea886c303dba4c31d04172e684ccec3885':
  GpsLocationProvider: Read data enabled status from TelephonyManager.
 2015-01-07 00:58:11 +00:00
Amith Yamasani
5c72de4cee am 442dcb17: am 21735e22: am dcf323ad: Merge "NPE in SearchManager.triggerSearch" 
* commit '442dcb1761f5f200c12c3f86409f780fbcf20e51':
  NPE in SearchManager.triggerSearch
 2015-01-07 00:58:04 +00:00
Yin-Chia Yeh
cabe15ac76 am 641178f9: am c2112a75: am 8d46f934: Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev 
* commit '641178f94fa5561cb5fe2f893f689b7cd568eaa1':
  Camera: doc update for color aberration modes
 2015-01-07 00:57:59 +00:00
Ye Wen
db400acb24 am 4ae347a4: am ded6ccdc: am 55fb7576: Merge "Add new mms error for no data network (airplane mode or no mobile data)" into lmp-mr1-dev 
* commit '4ae347a4f11d34f3bc6f4fc8f7f6ca0f6588a710':
  Add new mms error for no data network (airplane mode or no mobile data)
 2015-01-07 00:57:52 +00:00
Paul Lawrence
c233a3b603 am 91bf111a: am 53d1022e: am a15d6402: Merge "Fix crash caused by toHex returning exception" 
* commit '91bf111aef4a0fe1cd11f08d09d0e53c8278e51e':
  Fix crash caused by toHex returning exception
 2015-01-07 00:57:39 +00:00
Deepanshu Gupta
416891cff2 am 27ce2763: Merge "resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again" into lmp-mr1-dev-plus-aosp 
* commit '27ce2763325bcb7940232a11892e12fb86053cf7':
  resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again
 2015-01-07 00:57:22 +00:00
Ricardo Cervera
25bb2daec6 am 641353b6: am 85e0e70d: am 58872406: am a9a51433: am f211b625: am fa6fb0da: docs: Minor fixes to Watch Faces design guidelines. 
* commit '641353b6c28708ec8a5e1eb4143138e5b3e4674b':
  docs: Minor fixes to Watch Faces design guidelines.
 2015-01-07 00:57:14 +00:00
Deepanshu Gupta
31326967cf am d5455fed: am aebd7fdb: am 565f2245: am a6671b70: am 6461e054: Merge "Add image comparison to LayoutLib tests." into lmp-dev 
* commit 'd5455fedaf0a55dfe25cf94d6bbb9ecf6f305725':
  Add image comparison to LayoutLib tests.
 2015-01-07 00:45:41 +00:00
Deepanshu Gupta
f509c98ae9 am a2a5ce49: resolved conflicts for merge of 8c831b2f to lmp-mr1-dev-plus-aosp 
* commit 'a2a5ce49b29b8e3bf3cd695ff9f968e5579f4be2':
  Remove Time from CreateInfo
 2015-01-07 00:45:37 +00:00
Deepanshu Gupta
148d8641c5 am 5760f153: am c2e9875d: am 229ce665: am 937db7a3: am 53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev 
* commit '5760f1535b0bb619c72e8d4478fc65283bd89eb7':
  Add DatePicker, CalendarView to LayoutLib tests
 2015-01-07 00:45:31 +00:00
Deepanshu Gupta
af03e6eafc am 67cf0bf4: am 84097e39: am b187106c: am e69e4f8b: am f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-dev 
* commit '67cf0bf421370c756d93ca52697fbce03e34c09c':
  Fix DatePicker rendering.
 2015-01-07 00:45:27 +00:00
Deepanshu Gupta
08de06ddf7 am adcd2241: am c7fe9793: am 48ab6bec: am 8c686ddd: am d20a518c: Merge "Make Preference-cookie map non static." into lmp-dev 
* commit 'adcd224135e3c12f483547ffa8bb2cb0250ba923':
  Make Preference-cookie map non static.
 2015-01-07 00:45:23 +00:00
Deepanshu Gupta
b79d83d34c am d050df72: am addaeff9: am b88a65df: am cec8e5a1: am f861c0ce: Merge "Fix default initial value for preferences" into lmp-dev 
* commit 'd050df7275137f9c57ce79a7b46d51e2d1fb9290':
  Fix default initial value for preferences
 2015-01-07 00:45:18 +00:00
Deepanshu Gupta
b95475404e resolved conflicts for merge of 20db8770 to master 
Change-Id: Ifffcf8e2741ec242d940c3ba81244d4df57642fc
 2015-01-06 16:41:58 -08:00
Ricardo Cervera
7de2e066ae Merge "resolved conflicts for merge of 6302a72a to master" 2015-01-07 00:36:21 +00:00
Alan Viverette
714e236c18 Merge "Add getDither, getFilterBitmap to Drawable for CTS testing" 2015-01-07 00:36:09 +00:00
Ricardo Cervera
c5a1c1363c resolved conflicts for merge of 6302a72a to master 
Change-Id: I3adbbb983a2d7b0b85d3de0b14cbb2619aa711dd
 2015-01-06 16:31:37 -08:00
Shishir Agrawal
7b895dea88 am d0173277: am 5a21b0c2: Merge "GpsLocationProvider: Read data enabled status from TelephonyManager." into lmp-mr1-dev 
* commit 'd0173277b20b69c73ad0bc4bf4f17c8d900d4097':
  GpsLocationProvider: Read data enabled status from TelephonyManager.
 2015-01-07 00:24:20 +00:00
Amith Yamasani
442dcb1761 am 21735e22: am dcf323ad: Merge "NPE in SearchManager.triggerSearch" 
* commit '21735e222e0009b1ddcb080faa5b51117d0da879':
  NPE in SearchManager.triggerSearch
 2015-01-07 00:17:09 +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
Amith Yamasani
21735e222e am dcf323ad: Merge "NPE in SearchManager.triggerSearch" 
* commit 'dcf323adaf3d59fb720dc534380090f9df3a618c':
  NPE in SearchManager.triggerSearch
 2015-01-07 00:10:56 +00:00
Yin-Chia Yeh
641178f94f am c2112a75: am 8d46f934: Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev 
* commit 'c2112a75983cce62ed493ec0feafbb2c27ad76b4':
  Camera: doc update for color aberration modes
 2015-01-07 00:10:51 +00:00
Amith Yamasani
dcf323adaf Merge "NPE in SearchManager.triggerSearch" 2015-01-07 00:05:11 +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
Ye Wen
4ae347a4f1 am ded6ccdc: am 55fb7576: Merge "Add new mms error for no data network (airplane mode or no mobile data)" into lmp-mr1-dev 
* commit 'ded6ccdc7691a520e3bfe6374fd23ecec395b078':
  Add new mms error for no data network (airplane mode or no mobile data)
 2015-01-07 00:01:40 +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
Paul Lawrence
91bf111aef am 53d1022e: am a15d6402: Merge "Fix crash caused by toHex returning exception" 
* commit '53d1022e835f0556095dee168f5bb491a29fd0ac':
  Fix crash caused by toHex returning exception
 2015-01-06 23:45:48 +00:00
Paul Lawrence
53d1022e83 am a15d6402: Merge "Fix crash caused by toHex returning exception" 
* commit 'a15d6402cf4f99e448c7aaa69553483cdb18e0d4':
  Fix crash caused by toHex returning exception
 2015-01-06 23:39:44 +00:00
Paul Lawrence
a15d6402cf Merge "Fix crash caused by toHex returning exception" 2015-01-06 23:34:07 +00:00
Paul Lawrence
24063b5ebd Fix crash caused by toHex returning exception 
toHex was changed to throw an exception in
I4986a8e806d9066129f696ab9f2e80655424e723, but its caller was not adjusted
accordingly, causing a crash whenever an unencrypted device was booted.

Bug: 18886749
Change-Id: If0505f617001cf5e0d99cf14c8b09e6a6a377167
 2015-01-06 15:09:49 -08:00
Deepanshu Gupta
27ce276332 Merge "resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again" into lmp-mr1-dev-plus-aosp 2015-01-06 23:00:39 +00:00
Deepanshu Gupta
e88c120ebf resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again 
The earlier resolution (a2a5ce49b29b8e3bf3cd695ff9f968e5579f4be2)
wasn't the right one. This fixes it.

Change-Id: I6a6dc908d3e7dd510064a46df932d129a58eed98
 2015-01-06 14:58:37 -08:00
Ricardo Cervera
641353b6c2 am 85e0e70d: am 58872406: am a9a51433: am f211b625: am fa6fb0da: docs: Minor fixes to Watch Faces design guidelines. 
* commit '85e0e70dfa0deeda303a17da2d6d3981028af06f':
  docs: Minor fixes to Watch Faces design guidelines.
 2015-01-06 22:57:10 +00:00
Deepanshu Gupta
d5455fedaf am aebd7fdb: am 565f2245: am a6671b70: am 6461e054: Merge "Add image comparison to LayoutLib tests." into lmp-dev 
* commit 'aebd7fdb66b41b77a3cf51a7cf6911e8db3c7199':
  Add image comparison to LayoutLib tests.
 2015-01-06 22:50:18 +00:00
Baligh Uddin
70f52f6a1d am efc0bbec: (-s ours) am 94c4b4b2: (-s ours) am 15552158: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
automerge: 5e1b4a0  -s ours

* commit '5e1b4a0c8301716bd20fa172db523013e7b698bd':
  Import translations. DO NOT MERGE
 2015-01-06 22:50:17 +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
Sarah Maddox
1b8a5fb594 am efd72a48: am f22bca34: am 7d9309b6: am 029acc8e: am ab515931: Merge "docs: Fixes typo on Play services page for Maps." into lmp-docs 
automerge: 7aa9d75

* commit '7aa9d752c8cb5cfb9eeeeec23f53d1ad8ea271c2':
  docs: Fixes typo on Play services page for Maps.
 2015-01-06 22:47:29 +00:00
Deepanshu Gupta
a2a5ce49b2 resolved conflicts for merge of 8c831b2f to lmp-mr1-dev-plus-aosp 
Change-Id: I8894287fd43afc863d070cab04cfaa1bf70f7ebb
 2015-01-06 14:46:27 -08:00
Joe Fernandez
f4e13642c3 am 952ebe3f: am 64d74fbf: am 69434df3: am 180bd6be: am 76db15a8: docs: fix problem with TOC after Japanese pages merge 
automerge: 88f10a8f

* commit '88f10a8f8ef616676dbf7f0ef68df32a8b75eea8':
  docs: fix problem with TOC after Japanese pages merge
 2015-01-06 22:45:54 +00:00
David Friedman
a4a325350c am 859e176b: 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 
automerge: b64dea3

* commit 'b64dea3607ee12b3fd0e164b5c5fc90791bcdccd':
  Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
 2015-01-06 22:44:32 +00:00
Joe Fernandez
cf973b13a9 am 9ebb780c: am 750c0385: am 214e6867: am c27d5fd6: am 7cec35ef: Merge "docs: b/18122848 [DAC] Android TV - Recommendation card" into lmp-docs 
automerge: 698f155

* commit '698f1557ff32c38b76891787050c64c2e01fd794':
  docs: b/18122848 [DAC] Android TV - Recommendation card
 2015-01-06 22:41:51 +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
Joe Fernandez
d03afd4e57 am 633db0ee: am c4429f1f: am 001f6f54: am 66fefd0c: am a9a36ab2: Merge "docs: plugin link name update" into lmp-docs 
automerge: 60906b5

* commit '60906b55ba63f24f94c2df0f6c856aad977d3213':
  docs: plugin link name update
 2015-01-06 22:39:58 +00:00
Scott Rowe
5d1a4cf68b am dfc950b4: am aa7c1f68: am 13d31b0a: am d7d1411a: am e2b44f86: docs: Making TV Apps Searchable - new training 
automerge: d35c1d3

* commit 'd35c1d3f47102a836d97121cb5c7f921f5022edf':
  docs: Making TV Apps Searchable - new training
 2015-01-06 22:38:43 +00:00
Deepanshu Gupta
5760f1535b am c2e9875d: am 229ce665: am 937db7a3: am 53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev 
* commit 'c2e9875dcb173a4965b5c0e6022fc2e81f0a37ef':
  Add DatePicker, CalendarView to LayoutLib tests
 2015-01-06 22:36:45 +00:00