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

104528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kmccormick
947857c11b am cce88002: am 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322 
* commit 'cce880028ee694e296d2585b8932868b14f71223':
  Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
 2013-06-21 10:57:38 -07:00
kmccormick
cce880028e am 9c309d3d: Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322 
* commit '9c309d3db95b1fc63925a18b81e6ceabcaa18407':
  Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
 2013-06-21 10:56:13 -07:00
Scott Main
fbba76fe21 am 20eac772: am 334dadec: am 033cfd7c: Merge "add Arabic Google Play badges to generator bug: 7994508" into jb-mr1.1-ub-dev 
* commit '20eac772f32e3b40959a8fb7c64565aad94b8054':
  add Arabic Google Play badges to generator bug: 7994508
 2013-06-21 10:38:37 -07:00
Wink Saville
446792ba75 Merge "The config_show4GForLTe is dynamic use latest value." into jb-mr2-dev 2013-06-21 15:43:56 +00:00
Iliyan Malchev
9233fc0023 Revert "Revert "wifi: Get full scan results"" 
This reverts commit c2cbd4c11bfb83344502bd80389538795bae03cb.

Change-Id: Ia1cbde588ae9706966d6340c702fcfe1a82cfa79
 2013-06-21 03:10:20 +00:00
Wink Saville
c06462c1ad The config_show4GForLTe is dynamic use latest value. 
Previously this was updated only at construction time,
but the value isn't even set at that time and can change
at anytime. So instead read the current value when needed.

Bug: 9513380
Change-Id: I50c676beadf5df8190897a9f6ab94c098e8d7e71
 2013-06-20 18:15:20 -07:00
kmccormick
9c309d3db9 Cherrypick from jb-mr2-dev docs: cloud save Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322 
Change-Id: I32fe3880852ed8bcbacec0bb5bf385b0022a791f
 2013-06-20 17:16:47 -07:00
Dirk Dougherty
c496c2a888 am 68630bed: am 8054c46e: am e4bc7d81: am 6cb24e40: Doc change: add video for edu page. 
* commit '68630bedefb36cb6789f573b065c13e441121611':
  Doc change: add video for edu page.
 2013-06-20 15:35:59 -07:00
Dirk Dougherty
68630bedef am 8054c46e: am e4bc7d81: am 6cb24e40: Doc change: add video for edu page. 
* commit '8054c46e9bb87bb481195a6b823fd9d72623c80d':
  Doc change: add video for edu page.
 2013-06-20 15:33:47 -07:00
Dirk Dougherty
8054c46e9b am e4bc7d81: am 6cb24e40: Doc change: add video for edu page. 
* commit 'e4bc7d812199a8d371da264575c74874877d4824':
  Doc change: add video for edu page.
 2013-06-20 15:31:48 -07:00
Dirk Dougherty
e4bc7d8121 am 6cb24e40: Doc change: add video for edu page. 
* commit '6cb24e40ce6218dcd56ad22e13587d7f3d6e54b9':
  Doc change: add video for edu page.
 2013-06-20 15:29:27 -07:00
Dirk Dougherty
6cb24e40ce Doc change: add video for edu page. 
Change-Id: I81c539f0297de620ea0d0ded19d398329218f5df
 2013-06-20 13:53:45 -07:00
Wink Saville
42b04e4cf1 TelephonyManager.listen can have notifyNow always true. 
Since telepony.registry is a real system service notifyNow
parameter doesn't need to be conditional as telephony.registery
will never go away.

This is different from most of the other TelephonyManager
methods which are used to invoke methods on the phone service
which implements ITelephony and is implemented by
PhoneInterfaceManager in the phone application. Since the
phone app is not a system service it can and does go away when
it crashes.

Bug: 9393863
Change-Id: I1a8afc12b0e139e72f05820e49f3d996aec2b52a
 2013-06-20 11:24:17 -07:00
Scott Main
c1c0e32057 add ViewGroup's layoutMode attribute to public resources 
bug: 9359960

Change-Id: I9d3d45c6494ded12170c88f5080bbb0a58d0fd74
 2013-06-20 11:23:26 -07:00
kmccormick
748f6c8548 Merge "Doc change: New class on avoiding save conflicts" into jb-mr2-dev 2013-06-19 23:38:34 +00:00
kmccormick
71baac1358 Doc change: New class on avoiding save conflicts 
Change-Id: Ie20b2c7aca3f0724c9b04c6403deb18e1a07d322
 2013-06-19 15:02:58 -07:00
Wink Saville
c80e3d434f TelephonyManager.listen can have notifyNow always true. 
Since telepony.registry is a real system service notifyNow
parameter doesn't need to be conditional as telephony.registery
will never go away.

This is different from most of the other TelephonyManager
methods which are used to invoke methods on the phone service
which implements ITelephony and is implemented by
PhoneInterfaceManager in the phone application. Since the
phone app is not a system service it can and does go away when
it crashes.

Bug: 9393863
Change-Id: I1a8afc12b0e139e72f05820e49f3d996aec2b52a
 2013-06-19 11:28:06 -07:00
Wink Saville
cc892d68c8 Merge "Change default for config_show4GForLte to true." into jb-mr2-dev 2013-06-19 17:09:28 +00:00
Stephen Hines
713c4bca93 Update RenderScript doxygen reference manual. 
Change-Id: I0ba8f1c6c9b727b337708a3001964a7ee323483c
 2013-06-19 08:54:42 -07:00
Iliyan Malchev
0dff78aa32 Merge "Revert "wifi: Get full scan results"" into jb-mr2-dev 2013-06-19 01:16:23 +00:00
Vineeta Srivastava
c2cbd4c11b Revert "wifi: Get full scan results" 
This reverts commit 67b3fbf49c0c92641e19e3278a1feab7b68aa7b8.

Change-Id: I458924e6c95661f522ffa5e7780c6888cdb3a713

Conflicts:
	wifi/java/android/net/wifi/WifiNative.java
	wifi/java/android/net/wifi/WifiStateMachine.java
 2013-06-18 16:56:02 -07:00
Scott Main
20eac772f3 am 334dadec: am 033cfd7c: Merge "add Arabic Google Play badges to generator bug: 7994508" into jb-mr1.1-ub-dev 
* commit '334dadec751b2e51ff8a98498f02430b765aa091':
  add Arabic Google Play badges to generator bug: 7994508
 2013-06-18 15:31:37 -07:00
Scott Main
334dadec75 am 033cfd7c: Merge "add Arabic Google Play badges to generator bug: 7994508" into jb-mr1.1-ub-dev 
* commit '033cfd7cc8c77fbf98c69010cfd95f09b836a61b':
  add Arabic Google Play badges to generator bug: 7994508
 2013-06-18 15:29:41 -07:00
Scott Main
033cfd7cc8 Merge "add Arabic Google Play badges to generator bug: 7994508" into jb-mr1.1-ub-dev 2013-06-18 22:26:45 +00:00
Scott Main
763bca7bf5 add Arabic Google Play badges to generator 
bug: 7994508

Change-Id: Ic9fa9e69ca3c8015f717455176aa7460a5ea5f16
 2013-06-18 15:19:52 -07:00
Wink Saville
65a90d0709 Change default for config_show4GForLte to true. 
Bug: 9265217
Change-Id: I962910de7826ce9825de2d2dfb9e50b84d0e7c75
 2013-06-18 14:47:14 -07:00
Scott Main
99700bfee0 update supported media formats. 
as per I6372badc3d3a0fcbb1c132e3113331a79b17c26c

Change-Id: If35f4bb35b8aabacb51dec79a00a0c353b8a5d3c
 2013-06-18 10:49:06 -07:00
Scott Main
de04dfb62d Merge "some extra docs for TextDirectionHeuristic" into jb-mr2-dev 2013-06-18 05:10:32 +00:00
Scott Main
1a0a50e7c2 add collapsed list items for 4.1 TOC 
Change-Id: I241fb5415a3b893df7c8491c7a549f3d0d304e74
 2013-06-17 19:19:38 -07:00
Scott Main
e442662330 some extra docs for TextDirectionHeuristic 
Change-Id: I8ceac72a76a29bde0e25ed418110a6e4120654e3
 2013-06-17 19:05:29 -07:00
Scott Main
27a8508ee1 add attributes reference for splimotionevents and layoutmode 
Change-Id: Id78f2957c994fc30a0837084f22766c8cfa70fe8
 2013-06-18 01:33:33 +00:00
Scott Main
7328de3d02 am 23f33bda: am 6b55515e: am 41b08da8: replace \'developers strick back\' with \'this week in android\' playlist 
* commit '23f33bdab3da7ac3eb11d483eb038024ed4e3564':
  replace 'developers strick back' with 'this week in android' playlist
 2013-06-17 17:56:54 -07:00
Scott Main
23f33bdab3 am 6b55515e: am 41b08da8: replace \'developers strick back\' with \'this week in android\' playlist 
* commit '6b55515ed3c1e97b0dd932a482c375d0103f84cc':
  replace 'developers strick back' with 'this week in android' playlist
 2013-06-17 17:54:26 -07:00
Scott Main
6b55515ed3 am 41b08da8: replace \'developers strick back\' with \'this week in android\' playlist 
* commit '41b08da8198e76118ef7167058a88cb920f9fb74':
  replace 'developers strick back' with 'this week in android' playlist
 2013-06-17 17:53:06 -07:00
Scott Main
41b08da819 replace 'developers strick back' with 'this week in android' playlist 
Change-Id: I0aa94f6332da8543d7a2eba80307a36c26d7654c
 2013-06-17 17:47:36 -07:00
Xia Wang
edc3bb661e Disable a flaky test case 
Change-Id: I4ef780ed0c5394b67aa002baefc00e835018c4a0
 2013-06-17 17:14:10 -07:00
The Android Automerger
070a260153 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-16 05:55:34 -07:00
Baligh Uddin
4a9e422680 Import translations. DO NOT MERGE 
Change-Id: I45fbf411dc3f8cdb9a5ebd889ccf3a2868abb5a9
Auto-generated-cl: translation import
 2013-06-14 19:27:44 -07:00
Scott Main
07d6d9e74c Merge "additional documentation for media codec info" into jb-mr2-dev 2013-06-15 00:04:50 +00:00
Daniel Sandler
a0c9b9d2a7 Merge "Temporarily restore some support for icon==0 notifications." into jb-mr2-dev 2013-06-14 20:29:24 +00:00
Scott Main
c06bb7f5b9 additional documentation for media codec info 
Change-Id: I3b4e5baccab6da2dfc8dff8d03872bb5b346a4ad
 2013-06-14 11:56:15 -07:00
Scott Main
3b0205b760 am 0b3fe078: am a17201a8: am 7190a059: fix transition from download to install instructions 
* commit '0b3fe0785c0c6ff0ce834c06b6828f884a658730':
  fix transition from download to install instructions
 2013-06-14 11:02:41 -07:00
Scott Main
0b3fe0785c am a17201a8: am 7190a059: fix transition from download to install instructions 
* commit 'a17201a81691ac337426923d1bdcf9e0a26b841e':
  fix transition from download to install instructions
 2013-06-14 10:56:28 -07:00
Scott Main
a17201a816 am 7190a059: fix transition from download to install instructions 
* commit '7190a05951efa4f5cf94bb22da48dce85c52bd06':
  fix transition from download to install instructions
 2013-06-14 10:53:45 -07:00
Scott Main
7190a05951 fix transition from download to install instructions 
Change-Id: Ibb06779891ffab2c213b7c3401293e6fb7a6c4c9
 2013-06-14 10:51:29 -07:00
Scott Main
6e5942894a am d2ad6dc5: am 6af13a74: am ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins 
* commit 'd2ad6dc5304e5c3a4f0dc1bd04f7ab713ed66c6d':
  change studio version number to use 'x' for final decimal. also go to install guide after download begins
 2013-06-14 10:16:02 -07:00
Scott Main
d2ad6dc530 am 6af13a74: am ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins 
* commit '6af13a74d3dcf56187edf153e0341221faf9f1ad':
  change studio version number to use 'x' for final decimal. also go to install guide after download begins
 2013-06-14 10:12:30 -07:00
Scott Main
6af13a74d3 am ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins 
* commit 'ec025db4a74914640c42412c63413f2d5d46e45d':
  change studio version number to use 'x' for final decimal. also go to install guide after download begins
 2013-06-14 10:09:12 -07:00
Dirk Dougherty
f1d2c5aeb2 Merge "Doc change: diffs for API 18" into jb-mr2-dev 2013-06-14 16:23:12 +00:00
Scott Main
92053f8b28 revise docs for new sensor types. fix markup error causing tons of code font 
Change-Id: I7635bbc44e03b50faeddf5c5fe50f7f47e2cde35
 2013-06-13 16:37:51 -07:00