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

117679 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
3e41d9bf41 am fc7c4b9d: am 2a48dbce: am 905c50a2: Merge "Improve DocumentsProvider and contract docs." into klp-dev 
* commit 'fc7c4b9d7234b645adb31cb819b75ba925adab7a':
  Improve DocumentsProvider and contract docs.
 2013-10-15 17:55:45 -07:00
Jeff Sharkey
fc7c4b9d72 am 2a48dbce: am 905c50a2: Merge "Improve DocumentsProvider and contract docs." into klp-dev 
* commit '2a48dbcee91a3a37dacaa96763c92f116d916a15':
  Improve DocumentsProvider and contract docs.
 2013-10-15 17:52:29 -07:00
Jeff Sharkey
2a48dbcee9 am 905c50a2: Merge "Improve DocumentsProvider and contract docs." into klp-dev 
* commit '905c50a21238aa1de38989f1f9169cf40ebe02d5':
  Improve DocumentsProvider and contract docs.
 2013-10-15 17:49:40 -07:00
Jeff Sharkey
905c50a212 Merge "Improve DocumentsProvider and contract docs." into klp-dev 2013-10-16 00:47:36 +00:00
Baligh Uddin
9ba1527e7d Merge "Import translations. DO NOT MERGE" 2013-10-16 00:44:32 +00:00
Robert Greenwalt
bc32fa0d72 am aa546ae9: am ec4d5da6: am 1b7f99b9: Merge "Retry captiveportal check even if only one addr" into klp-dev 
* commit 'aa546ae97723ffd5400279f566f6e9c591a389d8':
  Retry captiveportal check even if only one addr
 2013-10-15 17:41:03 -07:00
Craig Mautner
33379fb317 am 67122f46: am 504b6045: am 4270ebc7: Merge "Remove debug logging." into klp-dev 
* commit '67122f46be4ab186c1f88780a2043b458797254a':
  Remove debug logging.
 2013-10-15 17:37:24 -07:00
Craig Mautner
35cb3efc8a am f7a64d2f: am d68cd8cc: am 41bf03e1: Merge "Restore window manager stack order on user switch." into klp-dev 
* commit 'f7a64d2f123897a255adf2e3ea3c60f09b750b2d':
  Restore window manager stack order on user switch.
 2013-10-15 17:37:21 -07:00
Robert Greenwalt
aa546ae977 am ec4d5da6: am 1b7f99b9: Merge "Retry captiveportal check even if only one addr" into klp-dev 
* commit 'ec4d5da6f99b70768ace085782cf5b24f8697025':
  Retry captiveportal check even if only one addr
 2013-10-15 17:37:05 -07:00
Robert Greenwalt
ec4d5da6f9 am 1b7f99b9: Merge "Retry captiveportal check even if only one addr" into klp-dev 
* commit '1b7f99b90ad5c4c20ee1bfbe3c7eb6bfb96a267e':
  Retry captiveportal check even if only one addr
 2013-10-15 17:33:28 -07:00
Craig Mautner
67122f46be am 504b6045: am 4270ebc7: Merge "Remove debug logging." into klp-dev 
* commit '504b60453f30b78da3a13e022a1d8a7badf26ae1':
  Remove debug logging.
 2013-10-15 17:33:26 -07:00
Craig Mautner
f7a64d2f12 am d68cd8cc: am 41bf03e1: Merge "Restore window manager stack order on user switch." into klp-dev 
* commit 'd68cd8cc40226dfd0b63227b6c186de4a4fd9ba0':
  Restore window manager stack order on user switch.
 2013-10-15 17:33:23 -07:00
Robert Greenwalt
1b7f99b90a Merge "Retry captiveportal check even if only one addr" into klp-dev 2013-10-16 00:31:04 +00:00
Igor Murashkin
b1743ab92e am 09de7975: am a451b603: am 577d0dac: Merge changes I536021b9,I6eb541c9,I6ac08eca into klp-dev 
* commit '09de7975fead1b47ea78f6f812a2f649e5dfb31d':
  SmartCamera: Fix to build against latest camera2 api
  Camera2Tests: update SmartCamera for async api
  Camera2Tests: Add SmartCamera App
 2013-10-15 17:30:27 -07:00
Jeff Sharkey
0e4655800b am f53c1a68: am f82a387c: am e3924ca4: Merge "Improve OPEN/CREATE_DOC docs." into klp-dev 
* commit 'f53c1a6841b4c6a1541e9548f425e54c486031d1':
  Improve OPEN/CREATE_DOC docs.
 2013-10-15 17:30:23 -07:00
Jeff Sharkey
98f7422e6a am 9f81a1a4: am 84c8603d: am 3cf56085: Merge "Improve external storage docs on Context." into klp-dev 
* commit '9f81a1a49c4ae01fd815a5ee801764b1362b242e':
  Improve external storage docs on Context.
 2013-10-15 17:30:19 -07:00
Michael Wright
5d5d4a5840 am ee3674a0: am 19fa2122: am 6bd7603a: Merge "Force the wallpaper to reload when dimensions change" into klp-dev 
* commit 'ee3674a01bc827057618d86f2dc921485b9a1393':
  Force the wallpaper to reload when dimensions change
 2013-10-15 17:30:16 -07:00
Baligh Uddin
3d057aa034 am 754fee0a: am ffe8b79f: (-s ours) am e1b6b6c5: Bring deleted files from the dead. These files were dropped by the translation pipelines because they do not contain any translated elements, but in reality they are needed. 
* commit '754fee0a2314392f72fc8fbfda35c721eefb452d':
  Bring deleted files from the dead. These files were dropped by the translation pipelines because they do not contain any translated elements, but in reality they are needed.
 2013-10-15 17:30:12 -07:00
Craig Mautner
504b60453f am 4270ebc7: Merge "Remove debug logging." into klp-dev 
* commit '4270ebc7db8fcc42b64286c38ad84189e6a5b9e4':
  Remove debug logging.
 2013-10-15 17:29:51 -07:00
Baligh Uddin
ae024e75ec am 15bbb7b7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev-plus-aosp 
* commit '15bbb7b731bbb185836f5ac47242682ddd95d885':
  Import translations. DO NOT MERGE
 2013-10-15 17:29:49 -07:00
Craig Mautner
d68cd8cc40 am 41bf03e1: Merge "Restore window manager stack order on user switch." into klp-dev 
* commit '41bf03e133dfd0b9a4c492bd9fa4242c6f9cec3a':
  Restore window manager stack order on user switch.
 2013-10-15 17:29:48 -07:00
Jim Miller
7041bd2c42 am 35077089: am d5bda747: am 2cc95775: Merge "Fix possible crash in System UI" into klp-dev 
* commit '3507708905e2d4aced05ece0d157ee9def40b624':
  Fix possible crash in System UI
 2013-10-15 17:29:46 -07:00
Baligh Uddin
1a452a57d4 am ae7bf4d0: (-s ours) am d99b9fd3: (-s ours) am 1fcf34d8: (-s ours) Import translations. DO NOT MERGE 
* commit 'ae7bf4d0abe00e8541c5b48725664aba7496ed04':
  Import translations. DO NOT MERGE
 2013-10-15 17:29:43 -07:00
Craig Mautner
4270ebc7db Merge "Remove debug logging." into klp-dev 2013-10-16 00:27:50 +00:00
Craig Mautner
41bf03e133 Merge "Restore window manager stack order on user switch." into klp-dev 2013-10-16 00:27:32 +00:00
Igor Murashkin
09de7975fe am a451b603: am 577d0dac: Merge changes I536021b9,I6eb541c9,I6ac08eca into klp-dev 
* commit 'a451b6038585a71c5c8c84b019fdf3aa3d58d8f6':
  SmartCamera: Fix to build against latest camera2 api
  Camera2Tests: update SmartCamera for async api
  Camera2Tests: Add SmartCamera App
 2013-10-15 17:15:56 -07:00
Jeff Sharkey
f53c1a6841 am f82a387c: am e3924ca4: Merge "Improve OPEN/CREATE_DOC docs." into klp-dev 
* commit 'f82a387cc7e82a18622465e62370e2c4203839f1':
  Improve OPEN/CREATE_DOC docs.
 2013-10-15 17:15:44 -07:00
Jeff Sharkey
9f81a1a49c am 84c8603d: am 3cf56085: Merge "Improve external storage docs on Context." into klp-dev 
* commit '84c8603da051638b41baabef54bcc0f4cbef9735':
  Improve external storage docs on Context.
 2013-10-15 17:15:40 -07:00
Michael Wright
ee3674a01b am 19fa2122: am 6bd7603a: Merge "Force the wallpaper to reload when dimensions change" into klp-dev 
* commit '19fa212251542ac8f24ec0b24316bb08417cb44e':
  Force the wallpaper to reload when dimensions change
 2013-10-15 17:15:35 -07:00
Baligh Uddin
754fee0a23 am ffe8b79f: (-s ours) am e1b6b6c5: Bring deleted files from the dead. These files were dropped by the translation pipelines because they do not contain any translated elements, but in reality they are needed. 
* commit 'ffe8b79f36d7ae997bb75751f2d8b1920eb2cd97':
  Bring deleted files from the dead. These files were dropped by the translation pipelines because they do not contain any translated elements, but in reality they are needed.
 2013-10-15 17:15:34 -07:00
Igor Murashkin
a451b60385 am 577d0dac: Merge changes I536021b9,I6eb541c9,I6ac08eca into klp-dev 
* commit '577d0dac1d263c6f403f15c587aaf11983e10e44':
  SmartCamera: Fix to build against latest camera2 api
  Camera2Tests: update SmartCamera for async api
  Camera2Tests: Add SmartCamera App
 2013-10-15 17:06:46 -07:00
Igor Murashkin
577d0dac1d Merge changes I536021b9,I6eb541c9,I6ac08eca into klp-dev 
* changes:
  SmartCamera: Fix to build against latest camera2 api
  Camera2Tests: update SmartCamera for async api
  Camera2Tests: Add SmartCamera App
 2013-10-16 00:01:07 +00:00
Jeff Sharkey
f82a387cc7 am e3924ca4: Merge "Improve OPEN/CREATE_DOC docs." into klp-dev 
* commit 'e3924ca486fcb95bb8eb06992d841decc1b6065a':
  Improve OPEN/CREATE_DOC docs.
 2013-10-15 16:48:54 -07:00
Jeff Sharkey
84c8603da0 am 3cf56085: Merge "Improve external storage docs on Context." into klp-dev 
* commit '3cf56085f1a70c200ffd3389dd91fd284a76b91a':
  Improve external storage docs on Context.
 2013-10-15 16:48:51 -07:00
Michael Wright
19fa212251 am 6bd7603a: Merge "Force the wallpaper to reload when dimensions change" into klp-dev 
* commit '6bd7603a56cd671c4523d66c1e7378c27a6ac33c':
  Force the wallpaper to reload when dimensions change
 2013-10-15 16:45:10 -07:00
Jeff Sharkey
e3924ca486 Merge "Improve OPEN/CREATE_DOC docs." into klp-dev 2013-10-15 23:45:10 +00:00
Jeff Sharkey
3cf56085f1 Merge "Improve external storage docs on Context." into klp-dev 2013-10-15 23:44:54 +00:00
Jeff Sharkey
e8c00d8ed4 Improve DocumentsProvider and contract docs. 
Bug: 10567557
Change-Id: I71e7f7ad172e9986e58b9c9533b1c948c5530397
 2013-10-15 16:44:22 -07:00
Michael Wright
6bd7603a56 Merge "Force the wallpaper to reload when dimensions change" into klp-dev 2013-10-15 23:40:14 +00:00
Baligh Uddin
15bbb7b731 Merge "Import translations. DO NOT MERGE" into klp-dev-plus-aosp 2013-10-15 23:25:12 +00:00
John Spurlock
a943b0337c am c5b6267d: resolved conflicts for merge of e8962d4b to klp-dev-plus-aosp 
* commit 'c5b6267dac35300821e6b6e062370d0ee935acc1':
  Update resource name for renamed string.
 2013-10-15 16:18:07 -07:00
Jim Miller
3507708905 am d5bda747: am 2cc95775: Merge "Fix possible crash in System UI" into klp-dev 
* commit 'd5bda747971db5fc2dde78dcc5bb42e62659667d':
  Fix possible crash in System UI
 2013-10-15 16:17:06 -07:00
Baligh Uddin
ae7bf4d0ab am d99b9fd3: (-s ours) am 1fcf34d8: (-s ours) Import translations. DO NOT MERGE 
* commit 'd99b9fd3213fecbf987ab285228f985676ae86e5':
  Import translations. DO NOT MERGE
 2013-10-15 16:17:03 -07:00
Craig Mautner
a7f2bd4da7 Remove debug logging. 
Change-Id: I5d7c11e8b8525bfc8eb87bb0fff4f71337b4a39d
 2013-10-15 16:13:50 -07:00
Baligh Uddin
ffe8b79f36 am e1b6b6c5: Bring deleted files from the dead. These files were dropped by the translation pipelines because they do not contain any translated elements, but in reality they are needed. 
* commit 'e1b6b6c5816b321864b6a5d72a46860fda8fa7cd':
  Bring deleted files from the dead. These files were dropped by the translation pipelines because they do not contain any translated elements, but in reality they are needed.
 2013-10-15 16:00:13 -07:00
John Spurlock
c5b6267dac resolved conflicts for merge of e8962d4b to klp-dev-plus-aosp 
Change-Id: I3b223b9a532f8a154d21d79828b2a95098ab2bd1
 2013-10-15 18:59:45 -04:00
Baligh Uddin
e1b6b6c581 Bring deleted files from the dead. 
These files were dropped by the translation
pipelines because they do not contain any
translated elements, but in reality they
are needed.

Bug: 11226380
 2013-10-15 22:47:02 +00:00
Craig Mautner
4f1df4faed Restore window manager stack order on user switch. 
Only the activity stacks were being restored. Also add needed debug
logs.

Fixes bug 11223831.

Change-Id: Ief42688721c49e8cea14277619c797bf7c25b859
 2013-10-15 15:44:14 -07:00
Igor Murashkin
69b94f7c55 SmartCamera: Fix to build against latest camera2 api 
Bug: 10818732
Change-Id: I536021b9663331532e2f4c21a4fc0f3de5da9aa9
 2013-10-15 15:23:07 -07:00
Igor Murashkin
bd7f343c75 Camera2Tests: update SmartCamera for async api 
Change-Id: I6eb541c96ee50756c35e7785fdae63e8e45e2726
 2013-10-15 15:11:41 -07:00