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

106780 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Malin
7bf74bc04c am 1e3a0203: am 6f9e30e3: Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs 
* commit '1e3a02030949df8c1d1f37a37fc23f25357632f0':
  Android Training: Add Location Testing Lesson
 2013-09-12 10:51:12 -07:00
Joe Malin
1e3a020309 am 6f9e30e3: Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs 
* commit '6f9e30e3b76f564db3a56de24e4efdc5a64455f0':
  Android Training: Add Location Testing Lesson
 2013-09-12 10:48:38 -07:00
Joe Malin
6f9e30e3b7 Merge "Android Training: Add Location Testing Lesson" into jb-mr2-docs 2013-09-12 17:45:05 +00:00
Joe Malin
72fdbc88bb Android Training: Add Location Testing Lesson 
Change-Id: I855e1c3dd0db65be7dc970437af2d52ccf836cb7
 2013-09-12 10:07:30 -07:00
Dirk Dougherty
834ba47485 am 4c6cde54: am 89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs 
* commit '4c6cde545c5d2e76d9ba8ef926399463369da7e7':
  Pass whitelist of sample groups to doclava.
 2013-09-12 09:22:20 -07:00
Dirk Dougherty
4c6cde545c am 89579294: Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs 
* commit '89579294ce0fbe728738fa09fb45cc53fd79bfb5':
  Pass whitelist of sample groups to doclava.
 2013-09-12 09:15:25 -07:00
Dirk Dougherty
89579294ce Merge "Pass whitelist of sample groups to doclava." into jb-mr2-docs 2013-09-12 16:01:52 +00:00
Dirk Dougherty
a6c02679e1 Pass whitelist of sample groups to doclava. 
Change-Id: I36f3e3426115cc296531cf41d20ab07a4d429b19
 2013-09-12 00:37:50 -07:00
quddusc
eacfc30834 am a0b259a9: am 161e423e: Merge "docs: Fixed deprecated value. Bug: 10641906" into jb-mr2-docs 
* commit 'a0b259a917f9c7cf73b4e8ceab104cdab4383c24':
  docs: Fixed deprecated value. Bug: 10641906
 2013-09-11 10:15:12 -07:00
quddusc
a0b259a917 am 161e423e: Merge "docs: Fixed deprecated value. Bug: 10641906" into jb-mr2-docs 
* commit '161e423ead0e2272ebb0b73957abf0c916ad57ff':
  docs: Fixed deprecated value. Bug: 10641906
 2013-09-11 10:09:45 -07:00
quddusc
161e423ead Merge "docs: Fixed deprecated value. Bug: 10641906" into jb-mr2-docs 2013-09-09 20:22:55 +00:00
Dirk Dougherty
cbe6482a84 am b096bee1: am dd93ae32: Doc change: fix typo. 
* commit 'b096bee155cc089144d59640494adba0b31d56ed':
  Doc change: fix typo.
 2013-09-09 10:45:57 -07:00
Dirk Dougherty
b096bee155 am dd93ae32: Doc change: fix typo. 
* commit 'dd93ae32a8d50147a95a270cc99f9474dbf9ee27':
  Doc change: fix typo.
 2013-09-09 10:42:47 -07:00
Dirk Dougherty
dd93ae32a8 Doc change: fix typo. 
Change-Id: Idd14111f1b62430560a11c5803a864f2bad5eff0
 2013-09-09 10:36:37 -07:00
quddusc
5a5df7f936 docs: Fixed deprecated value. 
Bug: 10641906

Change-Id: I1e89e031292fb225f67c7f8a06924f29a9e950b2
 2013-09-06 13:53:11 -07:00
Wink Saville
fc7a146b82 am 50f86448: am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev 
* commit '50f864480d6e9cf9e4d83b4533e3764753b4d408':
  Do not change NetworkInfo.DetailedState.
 2013-09-06 09:17:19 -07:00
Wink Saville
50f864480d am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev 
* commit '59a9884bf8280e2db9db7680370e98f40a065d56':
  Do not change NetworkInfo.DetailedState.
 2013-09-06 09:12:50 -07:00
Wink Saville
59a9884bf8 Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev 2013-09-06 16:09:36 +00:00
Wink Saville
67c3821926 Do not change NetworkInfo.DetailedState. 
I'd changed DetailedState to force ConnectivityService to treat
provisioning apn's specially. In particular so that they wouldn't
be identified they were fully connected until the provisioning
actually started. The problem is that DetailedState is a public enum
that has a CTS test and just changing the CTS to allow for the new
state (CONNECTED_TO_PROVISIONING_NETWORK) was inappropriate.

Instead I've added a new mIsConnectedToProvisioningNetwork variable
and used the DetailedState.SUSPENDED as the intermediate state.

Bug: 10620248
Change-Id: Id4a842398cad67455541ce629959351c27d83639
 2013-09-05 12:02:25 -07:00
Deepanshu Gupta
b50de4951a am dd4efc22: am 3a762d8b: Merge "Fix text rendering" into jb-mr2-dev 
* commit 'dd4efc22c736973ecfa1b7b4af9e71f971dd48b3':
  Fix text rendering
 2013-09-05 11:58:59 -07:00
Deepanshu Gupta
97c88368e0 am c78d173b: am 68411471: Merge "Fix layout rendering for RTL locales" into jb-mr2-dev 
* commit 'c78d173b730dcfdf107e6ac2bc959d459fe3eedd':
  Fix layout rendering for RTL locales
 2013-09-05 11:58:54 -07:00
Deepanshu Gupta
dd4efc22c7 am 3a762d8b: Merge "Fix text rendering" into jb-mr2-dev 
* commit '3a762d8bfbe6b2d4066bc5cc90301063c19976c4':
  Fix text rendering
 2013-09-05 11:52:48 -07:00
Deepanshu Gupta
c78d173b73 am 68411471: Merge "Fix layout rendering for RTL locales" into jb-mr2-dev 
* commit '68411471083abd7a7713483b5cd40f394387b7b3':
  Fix layout rendering for RTL locales
 2013-09-05 11:52:42 -07:00
Deepanshu Gupta
3a762d8bfb Merge "Fix text rendering" into jb-mr2-dev 2013-09-05 18:49:31 +00:00
Deepanshu Gupta
6841147108 Merge "Fix layout rendering for RTL locales" into jb-mr2-dev 2013-09-05 18:48:55 +00:00
Deepanshu Gupta
0d9c922c96 Fix text rendering 
There are still some errors
1. Little vertical clippping for extra tall glyphs.
2. Breaking into scripts isn't perfect which results in incorrect layout
of text.

Change-Id: I54de3c05eca5e8affb1135c120eea24c3afe8a47
 2013-09-05 10:58:10 -07:00
Dirk Dougherty
76fcf6c73e am 07c9bcc3: am 4ef51c3c: Merge "Add a few more samples to browser." into jb-mr2-docs 
* commit '07c9bcc3a60a8860b65aa43badd8ab1f1858522b':
  Add a few more samples to browser.
 2013-09-04 22:26:54 -07:00
Dirk Dougherty
07c9bcc3a6 am 4ef51c3c: Merge "Add a few more samples to browser." into jb-mr2-docs 
* commit '4ef51c3c4298cbd7980029b6b1cad2f6696f7bb5':
  Add a few more samples to browser.
 2013-09-04 22:23:48 -07:00
Dirk Dougherty
4ef51c3c42 Merge "Add a few more samples to browser." into jb-mr2-docs 2013-09-05 05:19:41 +00:00
Dirk Dougherty
2826df3f3d Add a few more samples to browser. 
Change-Id: Iac7acc22a8dd71950b32e2c35c82f53abc34168a
 2013-09-04 21:55:47 -07:00
Wink Saville
323af8b49d am aa5b0f8b: am ce1e3798: Add provisioning apn timeout. 
* commit 'aa5b0f8bdadcfa1ddb041e09b815ea4b5986e901':
  Add provisioning apn timeout.
 2013-09-04 18:14:07 -07:00
Wink Saville
aa5b0f8bda am ce1e3798: Add provisioning apn timeout. 
* commit 'ce1e37981caec29df2671a6e2909f00da7f24a00':
  Add provisioning apn timeout.
 2013-09-04 18:11:07 -07:00
Scott Main
f56076eefb am 966b9d46: am 002057bf: Merge "update dashboards for 9/13" into jb-mr2-docs 
* commit '966b9d467dbb21d7bbc0a49067110ff4ddaffb89':
  update dashboards for 9/13
 2013-09-04 15:40:27 -07:00
Scott Main
966b9d467d am 002057bf: Merge "update dashboards for 9/13" into jb-mr2-docs 
* commit '002057bf0452168fd88eb81c2d36f02cfb260769':
  update dashboards for 9/13
 2013-09-04 15:36:59 -07:00
Scott Main
002057bf04 Merge "update dashboards for 9/13" into jb-mr2-docs 2013-09-04 22:35:04 +00:00
Scott Main
847480c6d1 update dashboards for 9/13 
Change-Id: I50171e5448fa062ed59d585c603cb5ac80f80d47
 2013-09-04 15:08:40 -07:00
Deepanshu Gupta
88db0ee2af Fix layout rendering for RTL locales 
This changeset adds the framework resources for RTL locales and mirrors
the layout if the application is RTL aware.

Use ICU to check the character orientation of the locale - right to left
or left to right. Set the layout direction on the top level layout
accordingly. Also, load the RTL resources for Nav Bar when the locale is
RTL.

Change-Id: I1ed0d516ab64120a0abca413ba678036661508f8
 2013-09-04 14:23:53 -07:00
Scott Main
c6ed9ff77a am ca0d88b8: am c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs 
* commit 'ca0d88b841db52fc926027f412003a8bf6efdf39':
  replace instances of Wi-Fi Direct with Wi-Fi P2P
 2013-09-04 09:20:31 -07:00
Scott Main
ca0d88b841 am c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs 
* commit 'c3adcf9dc745932bf3a059a7201644dd96b97750':
  replace instances of Wi-Fi Direct with Wi-Fi P2P
 2013-09-04 09:18:23 -07:00
Scott Main
f579f134ee am e0718c04: am 605d56c0: Merge "clarify javadoc for constructors. bug: 10563421" into jb-mr2-docs 
* commit 'e0718c044bc81db0334f2973b9884b968c18ce07':
  clarify javadoc for constructors. bug: 10563421
 2013-09-04 09:17:05 -07:00
Scott Main
c3adcf9dc7 Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs 2013-09-04 16:15:00 +00:00
Scott Main
e0718c044b am 605d56c0: Merge "clarify javadoc for constructors. bug: 10563421" into jb-mr2-docs 
* commit '605d56c0492536488c997c6ca0b85fd38fd4e19a':
  clarify javadoc for constructors. bug: 10563421
 2013-09-04 09:13:57 -07:00
Scott Main
605d56c049 Merge "clarify javadoc for constructors. bug: 10563421" into jb-mr2-docs 2013-09-04 16:10:59 +00:00
Wink Saville
ce1e37981c Add provisioning apn timeout. 
Bug: 10609993
Change-Id: I2dd4fe23fa2b22ef8f4849c161c630d1a85cdb4b
 2013-09-03 16:41:44 -07:00
Dirk Dougherty
7081684f17 am c236f992: am 5e52ee6e: Doc change: small refinement of brand usage guidelines. 
* commit 'c236f99234bbcc9b1ced14777b179adb59922b0f':
  Doc change: small refinement of brand usage guidelines.
 2013-09-03 11:48:34 -07:00
Dirk Dougherty
c236f99234 am 5e52ee6e: Doc change: small refinement of brand usage guidelines. 
* commit '5e52ee6ecf08b299b433104798e736e2bc3904d5':
  Doc change: small refinement of brand usage guidelines.
 2013-09-03 11:44:24 -07:00
Dirk Dougherty
5e52ee6ecf Doc change: small refinement of brand usage guidelines. 
Change-Id: I3e7513ee6b5cc0dd0204ca5b78c9fd13e4c8cf4a
 2013-09-03 11:32:09 -07:00
Scott Main
c27ea258d2 clarify javadoc for constructors. 
bug: 10563421

Change-Id: Ifa898005a13f987e4de07d1a34cb3b289d533256
 2013-08-30 14:26:56 -07:00
Ed Tam
468c60b334 am 00e4c672: am f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev 
* commit '00e4c6721b344eca1d8b0de0e82e5de6f4f21f16':
  Telephony: SMS over IMS, DO NOT MERGE
 2013-08-30 14:06:47 -07:00
Ed Tam
00e4c6721b am f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev 
* commit 'f85aa0fc12edccf529dbaf0340372bf3a19bc4be':
  Telephony: SMS over IMS, DO NOT MERGE
 2013-08-30 14:04:45 -07:00