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

154338 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Lawrence
0e6178b81e am c220d8e5: Stop crypto UI from crashing during encryption 
* commit 'c220d8e57ca97c70db1fd72f040bd6c6f70bbf13':
  Stop crypto UI from crashing during encryption
 2014-10-24 20:08:33 +00:00
Paul Lawrence
c220d8e57c Stop crypto UI from crashing during encryption 
Don't try to read crypto meta data during this time

Bug: 18037893
Change-Id: I3628572b3b90e6fc0a7c71089b447fb0e5303ee9
 2014-10-24 10:37:40 -07:00
Joe Fernandez
57f1fd1993 am cab73381: Merge "docs: Fix typo in search class" into lmp-dev 
* commit 'cab733811554ffcf257ee194a5245521713faf5d':
  docs: Fix typo in search class
 2014-10-24 06:08:43 +00:00
Joe Fernandez
458128603f am 553dd209: Merge "docs: Fixed 404 link in SDK Tools page." into lmp-dev 
* commit '553dd209992ffe9bba1160333762c5f3fa6651b0':
  docs: Fixed 404 link in SDK Tools page.
 2014-10-24 06:08:40 +00:00
Joe Fernandez
c53546e9c2 am 3b6d518e: Merge "docs: Fix hprof-conv location in docs." into lmp-dev 
* commit '3b6d518e79c1045286d2bc368148b44dd1a39bf3':
  docs: Fix hprof-conv location in docs.
 2014-10-24 06:02:35 +00:00
Joe Fernandez
b118395346 am 4ae8b8f3: Merge "docs: Fixing misc minor bugs." into lmp-dev 
* commit '4ae8b8f3652ed2382ee5593151ea72b315fb5384':
  docs: Fixing misc minor bugs.
 2014-10-24 06:02:31 +00:00
Joe Fernandez
cab7338115 Merge "docs: Fix typo in search class" into lmp-dev 2014-10-24 06:01:57 +00:00
Joe Fernandez
553dd20999 Merge "docs: Fixed 404 link in SDK Tools page." into lmp-dev 2014-10-24 06:00:56 +00:00
Joe Fernandez
3b6d518e79 Merge "docs: Fix hprof-conv location in docs." into lmp-dev 2014-10-24 06:00:19 +00:00
Joe Fernandez
4ae8b8f365 Merge "docs: Fixing misc minor bugs." into lmp-dev 2014-10-24 05:59:04 +00:00
Hochi Huang
4a7873f19a [FM]Fix FM App record fail Buganizer ID: 17975676 
Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
    Review: https://partner-android-review.git.corp.google.com/#/c/185235

Change-Id: I024db429b8ff56851c814857691b06ea5e69198a
 2014-10-24 00:47:54 +00:00
Luan Nguyen
fd73db2257 am 578210db: Merge "docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution." into lmp-dev 
* commit '578210db199f41dc7c14e53ba925956de835f3c0':
  docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution.
 2014-10-23 22:51:09 +00:00
Luan Nguyen
578210db19 Merge "docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution." into lmp-dev 2014-10-23 22:45:03 +00:00
Trevor Johns
2988436b65 am fb28bd15: Merge "Docs: Add TOC page for Wearable samples" into lmp-dev 
* commit 'fb28bd158dd387225bb55e31da60101436e7b13c':
  Docs: Add TOC page for Wearable samples
 2014-10-23 21:52:47 +00:00
Legler Wu
c11a944a57 [DS] Change the copyright 
Change the copyright as Android.

    Review: https://partner-android-review.git.corp.google.com/#/c/185241

Change-Id: Id548867805a65c2887ca19cb79d155b5a8c82753
 2014-10-23 20:27:51 +00:00
Luan Nguyen
912abbedee docs: Update thumbnail images for resources, update minor text for WR-GS, and 
update the title image resolution.

Change-Id: I83e89e3969bd6b837074e86a810cf801be3a6caf
 2014-10-23 13:04:29 -07:00
Nancy Chen
0145e17db7 Merge "Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount." into lmp-sprout-dev 2014-10-23 19:08:20 +00:00
Filip Gruszczynski
625ec48491 Check if context is actually an activity. 
Bug: 18101409
Change-Id: Iab21338ef4ccaab0ce66d664502e0b5e88ad9c50
 2014-10-23 10:56:24 -07:00
Trevor Johns
fb28bd158d Merge "Docs: Add TOC page for Wearable samples" into lmp-dev 2014-10-23 16:51:39 +00:00
Trevor Johns
abcb138da8 Docs: Add TOC page for Wearable samples 
Change-Id: I0fdf412f20fb2a45c34c9700ed1ca9446cfc6ff3
 2014-10-23 09:29:05 -07:00
Ricardo Cervera
ce3d72e4ad am 8755d9a5: Merge "docs: Updating dependency vers nums for support libs." into lmp-dev 
* commit '8755d9a5361d716433505e883986e8bf5f28d041':
  docs: Updating dependency vers nums for support libs.
 2014-10-23 15:43:48 +00:00
Ricardo Cervera
92ddea1894 am 30d0b242: Merge "docs: Support lib dependency fix. Bug: 18029377" into lmp-dev 
* commit '30d0b24280abe4b2c5e1e20819d87f60d34964de':
  docs: Support lib dependency fix. Bug: 18029377
 2014-10-23 15:43:44 +00:00
Ricardo Cervera
8755d9a536 Merge "docs: Updating dependency vers nums for support libs." into lmp-dev 2014-10-23 15:10:09 +00:00
Ricardo Cervera
30d0b24280 Merge "docs: Support lib dependency fix. Bug: 18029377" into lmp-dev 2014-10-23 15:09:42 +00:00
Joe Fernandez
3bd3a9c105 am 7c2bfa2e: Merge "docs: Add Wear App Quality checklist" into lmp-dev 
* commit '7c2bfa2eae3d59b0a876e54c4c6b4f21ea997e89':
  docs: Add Wear App Quality checklist
 2014-10-23 07:55:41 +00:00
Trevor Johns
5111993f83 am fdb02fcf: Merge "Docs: Update /samples/new/index.html for Clockwork Beryl release" into lmp-dev 
* commit 'fdb02fcf9c8b55252f4375c2f3e8b4872432cbc8':
  Docs: Update /samples/new/index.html for Clockwork Beryl release
 2014-10-23 07:55:38 +00:00
Joe Fernandez
e30fdb596a am 16350261: Merge "docs: Add article describing Location API for Android Wear." into lmp-dev 
* commit '16350261e0c491880be42a26bf53965c32e8dd0a':
  docs: Add article describing Location API for Android Wear.
 2014-10-23 07:55:34 +00:00
Joe Fernandez
ac0e00dbdf am eaee4693: Merge "docs:Build tools revisions 21.01 and 21.02" into lmp-dev 
* commit 'eaee4693814a1c3fbde06474a85570bbf228fc19':
  docs:Build tools revisions 21.01 and 21.02
 2014-10-23 07:55:31 +00:00
Eric Rowe
d2983ced58 am 34766d9c: Merge "Add delay in ping connectivity test retry" into lmp-dev 
* commit '34766d9c3f88e864d37b5c2ece6218e83cd0fe7c':
  Add delay in ping connectivity test retry
 2014-10-23 07:55:27 +00:00
smain@google.com
3e2502cbee am 32c820fa: update android workplace screenshot bug: 18038081 
* commit '32c820fac0575b406acef688ce365d9c390fd93e':
  update android workplace screenshot bug: 18038081
 2014-10-23 07:55:23 +00:00
Ye Wen
4e0ba1988a am 9d28487e: Merge "Disable Content-Disposition header for 53005 and 310120" into lmp-dev 
* commit '9d28487e05b6f5b2c4d464467f932060de463067':
  Disable Content-Disposition header for 53005 and 310120
 2014-10-23 07:55:19 +00:00
smain@google.com
b7db4ed08d am 9f987e0a: fix a few of the tags for helpouts compatibility 
* commit '9f987e0ac7a410a38a57a69dad1a721324bce766':
  fix a few of the tags for helpouts compatibility
 2014-10-23 07:55:15 +00:00
smain@google.com
20e6a369da am 54504966: Merge "some fixes to TV App quality and TV games doc. add section to TV Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions." into lmp-dev 
* commit '545049665ce3b1cd5a8da44963f849e23aca4412':
  some fixes to TV App quality and TV games doc. add section to TV Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions.
 2014-10-23 07:55:12 +00:00
Joe Fernandez
7c2bfa2eae Merge "docs: Add Wear App Quality checklist" into lmp-dev 2014-10-23 07:03:16 +00:00
Luan Nguyen
9aec78cafa docs: Add Wear App Quality checklist 
Change-Id: I81ef6b3283ffb4d924836a84b52bb04acb301649
 2014-10-22 23:59:40 -07:00
Trevor Johns
fdb02fcf9c Merge "Docs: Update /samples/new/index.html for Clockwork Beryl release" into lmp-dev 2014-10-23 06:15:33 +00:00
Nancy Chen
3ace54b895 Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount. 
Settings and Dialer need label, icon, and color for UI display of
subscriptions/SIMs. Add getters for these methods in SubInfoRecord. Sets
up for the following changes:
+ getIcon will return a drawable instead of a resource ID
+ getColor will return a color value instead of an index
PhoneAccount will also be adding these changes which will be adopted
from SubInfoRecord. Adds changes that were reverted from ag/563976.

Bug: 17971273
Change-Id: Ie2beedf8475c6deb48a6ab83bc9656c1142cc004
 2014-10-22 21:44:45 -07:00
Joe Fernandez
16350261e0 Merge "docs: Add article describing Location API for Android Wear." into lmp-dev 2014-10-23 04:39:25 +00:00
Luan Nguyen
5aad2c9fb0 docs: Add article describing Location API for Android Wear. 
Change-Id: I1956be7df8cc875270d45652d1b0d414b6395982
 2014-10-22 21:36:02 -07:00
Trevor Johns
87cb043f5d Docs: Update /samples/new/index.html for Clockwork Beryl release 
Added SpeedTracker sample to list of new samples.

Change-Id: I88094149ab21b9a24f19bb7693bbce1187b625eb
 2014-10-22 21:14:25 -07:00
Joe Fernandez
eaee469381 Merge "docs:Build tools revisions 21.01 and 21.02" into lmp-dev 2014-10-23 03:14:34 +00:00
Eric Rowe
34766d9c3f Merge "Add delay in ping connectivity test retry" into lmp-dev 2014-10-23 01:41:19 +00:00
Eric Rowe
58a3ddf5aa Add delay in ping connectivity test retry 
Change-Id: Id6e36f42b2a2d84605185780fb7a3f2144e7a9b9
 2014-10-22 18:34:43 -07:00
smain@google.com
32c820fac0 update android workplace screenshot 
bug: 18038081

Change-Id: I6cc59cf002000ee2c938e634ef3662fbba2c70cc
 2014-10-22 17:58:50 -07:00
Nancy Chen
df0ace2627 Merge "Add an option to set the selected phone account as the default. (1/3)" into lmp-sprout-dev 2014-10-23 00:42:24 +00:00
Rich Slogar
b3ae31ac1f docs:Build tools revisions 21.01 and 21.02 
Change-Id: I220f35541e88bf3b5dba1981d7375ecece525e2b
 2014-10-22 17:30:07 -07:00
Ye Wen
9d28487e05 Merge "Disable Content-Disposition header for 53005 and 310120" into lmp-dev 2014-10-23 00:23:28 +00:00
smain@google.com
9f987e0ac7 fix a few of the tags for helpouts compatibility 
Change-Id: Ic7f6f281c937bcba8690a50ce1c5417689993352
 2014-10-22 17:13:51 -07:00
smain@google.com
545049665c Merge "some fixes to TV App quality and TV games doc. add section to TV Games doc about controller instructions w/ template download. clarify use of <meta-data> tag and standardize headings per Training conventions." into lmp-dev 2014-10-23 00:06:10 +00:00
smain@google.com
c5c029e91d am 13eb86a1: Merge "add helpouts widget to first round of pages" into lmp-dev 
* commit '13eb86a11308b2cff7159d287a79fd7cfa2b045b':
  add helpouts widget to first round of pages
 2014-10-23 00:02:43 +00:00