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

105789 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
c73220050e am f9b41efe: Merge "Don\'t include flags in configuration change if their value hasn\'t changed." 
* commit 'f9b41efe17718a21df115d95c47a94d97a767076':
  Don't include flags in configuration change if their value hasn't changed.
 2013-05-26 00:02:37 -07:00
Dianne Hackborn
fc09b326da am fee6d0cb: Merge "Fix documentation of requestCode parameter." 
* commit 'fee6d0cb1e27b13f6ed91c1cdcb9d524bb967ea2':
  Fix documentation of requestCode parameter.
 2013-05-26 00:02:31 -07:00
Dianne Hackborn
087384b0af am f3251033: Merge "Framework/base: Added synchronization block to avoid race condition" 
* commit 'f325103356c559d6378da7fb7db3b2a49aba5d13':
  Framework/base: Added synchronization block to avoid race condition
 2013-05-26 00:02:24 -07:00
Dianne Hackborn
f46449abed Merge "Avoid IllegalArgumentException in Preference.java compareTo()" 2013-05-26 06:59:30 +00:00
Dianne Hackborn
0a40bef955 Merge "Fix CalendarView to show the month title properly." 2013-05-26 06:58:14 +00:00
Dianne Hackborn
f9b41efe17 Merge "Don't include flags in configuration change if their value hasn't changed." 2013-05-26 06:57:05 +00:00
Dianne Hackborn
fee6d0cb1e Merge "Fix documentation of requestCode parameter." 2013-05-26 06:56:03 +00:00
Dianne Hackborn
f325103356 Merge "Framework/base: Added synchronization block to avoid race condition" 2013-05-26 06:30:26 +00:00
Yu Shan Emily Lau
03367e2971 am b830d527: Merge "Update test with CamercorderProfile video size." into jb-mr2-dev 
* commit 'b830d527deb75a36aa78367026d6631a9b4e1126':
  Update test with CamercorderProfile video size.
 2013-05-24 18:53:47 -07:00
Yu Shan Emily Lau
b830d527de Merge "Update test with CamercorderProfile video size." into jb-mr2-dev 2013-05-25 01:51:40 +00:00
Scott Main
79c538094b am 4a47f17a: Merge "add links to orientation flags in attribute docs to help determine the supported API level for each value and update the manifest reference page with new attributes" into jb-mr2-dev 
* commit '4a47f17a9db8fd2b8b17ad10a629216cc3c6333c':
  add links to orientation flags in attribute docs to help determine the supported API level for each value and update the manifest reference page with new attributes
 2013-05-24 18:18:33 -07:00
Scott Main
4a47f17a9d Merge "add links to orientation flags in attribute docs to help determine the supported API level for each value and update the manifest reference page with new attributes" into jb-mr2-dev 2013-05-25 01:17:06 +00:00
Romain Guy
ac629ee86d am 529a9e39: Merge "TransitionDrawable should not become a LayerDrawable Bug #9057757" into jb-mr2-dev 
* commit '529a9e391e386aac37ea722d2517d376968b3d31':
  TransitionDrawable should not become a LayerDrawable Bug #9057757
 2013-05-24 17:40:40 -07:00
Romain Guy
529a9e391e Merge "TransitionDrawable should not become a LayerDrawable Bug #9057757" into jb-mr2-dev 2013-05-25 00:38:26 +00:00
Romain Guy
90e10cc586 TransitionDrawable should not become a LayerDrawable 
Bug #9057757

Calling TransitionDrawable.mutate() would turn it into a LayerDrawable,
causing it to draw all its children on screen at the same time.

Change-Id: I5efa87c43114a9c817719f08890ce41965f3220a
 2013-05-24 17:31:17 -07:00
The Android Open Source Project
d607b9c725 Reconcile with jb-mr2-release - do not merge 
Change-Id: I0f933138aaf9f70694ef9a326c3db63770a93917
 2013-05-24 15:28:19 -07:00
Scott Main
c851638092 am eebec7b1: Merge "fix javadoc links. turns out, without parameters, javadoc will link to the best matching method signature, even if it\'s from the superclass. So these were pointing to Object.nofify()" into jb-mr2-dev 
* commit 'eebec7b1fe68cef9c4feed1f56af2592b402a629':
  fix javadoc links. turns out, without parameters, javadoc will link to the best matching method signature, even if it's from the superclass. So these were pointing to Object.nofify()
 2013-05-24 14:42:58 -07:00
Scott Main
eebec7b1fe Merge "fix javadoc links. turns out, without parameters, javadoc will link to the best matching method signature, even if it's from the superclass. So these were pointing to Object.nofify()" into jb-mr2-dev 2013-05-24 21:40:45 +00:00
Scott Main
509267d618 add links to orientation flags in attribute docs 
to help determine the supported API level for each value
and update the manifest reference page with new attributes

Change-Id: I583a9b3f3be759be71044533055dec26e3616b72
 2013-05-24 14:32:14 -07:00
Alan Viverette
4026a797bc am 14ccf554: Merge "DO NOT MERGE. Fix number picker accessibility focus." into jb-mr2-dev 
* commit '14ccf554d0168d94c35c058b057d7d1aca228c6e':
  DO NOT MERGE. Fix number picker accessibility focus.
 2013-05-24 14:21:55 -07:00
Alan Viverette
14ccf554d0 Merge "DO NOT MERGE. Fix number picker accessibility focus." into jb-mr2-dev 2013-05-24 21:19:55 +00:00
Michael Wright
4759c35e42 am bf0d561c: Merge "Pipe through bounding box information (DO NOT MERGE)" into jb-mr2-dev 
* commit 'bf0d561c73abd97a1a3794e9aa62b21911279a12':
  Pipe through bounding box information (DO NOT MERGE)
 2013-05-24 13:53:47 -07:00
Deepanshu Gupta
fc691f9df0 am 417e512b: Merge "Add missing native methods." into jb-mr2-dev 
* commit '417e512ba1d099583c41bd7595f2124ca77c2aee':
  Add missing native methods.
 2013-05-24 13:53:44 -07:00
Michael Wright
bf0d561c73 Merge "Pipe through bounding box information (DO NOT MERGE)" into jb-mr2-dev 2013-05-24 20:52:40 +00:00
Deepanshu Gupta
417e512ba1 Merge "Add missing native methods." into jb-mr2-dev 2013-05-24 20:52:07 +00:00
Robert Greenwalt
8c1cb60b78 Use the old interface when resetting connections 
The new one is often null when disconnected, so using the new fails.
In other situations, it's the connections on the old network we want
to reset anyway, so the old code when it would work would also do
the wrong thing (unless new iface == old iface).

bug:9112928
Change-Id: I1fcae89cc3aa9d712e516e7c97cece0b89869bd9
 2013-05-24 12:25:04 -07:00
Scott Main
d4b710c698 new android studio download v0.1.1 
Change-Id: I3a504365942fcf74b20ce06ae5356e4c05e53a95
 2013-05-24 11:13:29 -07:00
Robert Greenwalt
e70b8d7002 am 46fa10b1: am 1d8c5b5b: Merge "Update tethering profile for specific operators" 
* commit '46fa10b1a0a67e1937c9e696d1fd786162dcfb8e':
  Update tethering profile for specific operators
 2013-05-24 11:03:45 -07:00
Scott Main
85dd5ec6c0 update GPS setup page to include emulator support. 
revise the doc layout with headings

Change-Id: If063782474e4187779dbc1fd23743fa87a69d316
 2013-05-24 11:02:55 -07:00
Robert Greenwalt
46fa10b1a0 am 1d8c5b5b: Merge "Update tethering profile for specific operators" 
* commit '1d8c5b5b1df96004d6c6e0d056f0c3707461a01a':
  Update tethering profile for specific operators
 2013-05-24 11:01:28 -07:00
Robert Greenwalt
1d8c5b5b1d Merge "Update tethering profile for specific operators" 2013-05-24 17:59:03 +00:00
seonju.oh
8645031246 Update tethering profile for specific operators 
Update or add tethering profiles in config.xml.
And also add MOBILE_DUN to config_tether_upstream_types

FR-ORG,SFR
ES-VDF,ORG,Movistar
IT-VDF,TIM
GR-VDF
US-TMO
CA-Rogers,Fido
Isreal-ORG,PC HOT Mobile
HK-CSL,Hutchison
AU-Telstra

Change-Id: Ic3501263679785362bc50a5a4ea3751e7f0c7b21
Signed-off-by: Seonju Oh <seonju.oh@lge.com>
Signed-off-by: Sungmin Choi <sungmin.choi@lge.com>
 2013-05-24 10:33:11 -07:00
Alan Viverette
dbed27e5e4 DO NOT MERGE. Fix number picker accessibility focus. 
The node bounds populated by the child TextView were not consistent
with the bounds manually populated for its parent NumberPicker.

Bug: 9072003
Change-Id: Icbfa64f52cf11fd39c7243936227b8ba36280c3c
 2013-05-24 10:03:24 -07:00
Scott Main
89beba593d update eclipse download URL; /mobile URL will be deprecated 
Change-Id: I18117d83e01c7f2a3a9c325b4cb84ec4fa6911f4
 2013-05-24 09:38:57 -07:00
Robert Greenwalt
f2eb6fbc0a am 36a151ab: Merge "Use the old interface when resetting connections" into jb-mr2-dev 
* commit '36a151abcd794524358a74599a1f4ab130ca7b55':
  Use the old interface when resetting connections
 2013-05-24 09:24:32 -07:00
Robert Greenwalt
36a151abcd Merge "Use the old interface when resetting connections" into jb-mr2-dev 2013-05-24 16:21:35 +00:00
Yu Shan Emily Lau
9c539e8511 Update test with CamercorderProfile video size. 
Bug:9114681
Change-Id: Id8ac6e98849715d21cd4a983fc13935debea5e5f
 2013-05-23 22:02:28 -07:00
Robert Greenwalt
80eb63b58b Use the old interface when resetting connections 
The new one is often null when disconnected, so using the new fails.
In other situations, it's the connections on the old network we want
to reset anyway, so the old code when it would work would also do
the wrong thing (unless new iface == old iface).

bug:9112928
Change-Id: I1fcae89cc3aa9d712e516e7c97cece0b89869bd9
 2013-05-23 18:33:06 -07:00
Matthew Xie
8310e6196f Change GATT_FAILURE from 0 to 0x101 
GATT_FAILURE 0 clashes with GATT_SUCCESS. For now, they represent different
kind of faiure. One for Gatt operation, one for Gatt registration. But we
should separate them as good practice.
bug 9109238

Change-Id: I686bb6004bc8831aa3e3bbffe2f7c8e24412e3c3
 2013-05-23 17:39:35 -07:00
Deepanshu Gupta
279c00e8e0 Add missing native methods. 
Change-Id: I7b34e2ec0164520efc658053a80f307791a992b1
 2013-05-23 16:44:01 -07:00
Scott Main
b8525dd712 clean up the results for 'android' in search suggestions 
Change-Id: Ia89dce3b2b911f4eaffbe1a224749cda39f65984
 2013-05-23 15:43:37 -07:00
Michael Wright
5e025eb1dc Pipe through bounding box information (DO NOT MERGE) 
Bug: 9110236
Change-Id: I7aefe6589fbaf92e5c71a0ba5425623578bafe95
 2013-05-23 15:06:47 -07:00
Amith Yamasani
6f114b891d Fix account filtering for specific package name 
Hacks to enable gms to see accounts were interfering with checking for
explicit package name.

Bug: 9095427
Change-Id: Iae65ea2a678d7403d023fa1a61c01347b77c3b5a
 2013-05-23 14:45:09 -07:00
Joe Fernandez
a3b33c0417 docs: SDK and ADT r22.0.1 Release Notes 
Change-Id: I64fca371d2456f88c17309aaf5cef693792fcd58
 2013-05-23 14:22:04 -07:00
Joe Fernandez
a44ff5034f am 62f47bc2: am 22689bc5: am a8b2186b: am a502c59e: docs: Add FileProvider to Support Library r13 Release Notes 
* commit '62f47bc29588e495a6f8efd082b34a92f8ec2098':
  docs: Add FileProvider to Support Library r13 Release Notes
 2013-05-23 14:08:51 -07:00
Joe Fernandez
62f47bc295 am 22689bc5: am a8b2186b: am a502c59e: docs: Add FileProvider to Support Library r13 Release Notes 
* commit '22689bc5e52a1c2f2d748440c0eeeebec17637c2':
  docs: Add FileProvider to Support Library r13 Release Notes
 2013-05-23 14:06:41 -07:00
Jim Miller
2f567679f4 am 2f48c4a7: Merge "Check for invalid pointer index in PagedView" into jb-mr2-dev 
* commit '2f48c4a754ce40a0854791c1f4ddf61458fffafc':
  Check for invalid pointer index in PagedView
 2013-05-23 14:05:21 -07:00
Joe Fernandez
22689bc5e5 am a8b2186b: am a502c59e: docs: Add FileProvider to Support Library r13 Release Notes 
* commit 'a8b2186b09a0f79b746d0fbab3611d95877af5fe':
  docs: Add FileProvider to Support Library r13 Release Notes
 2013-05-23 14:04:41 -07:00
Jim Miller
2f48c4a754 Merge "Check for invalid pointer index in PagedView" into jb-mr2-dev 2013-05-23 21:03:09 +00:00
Joe Fernandez
a8b2186b09 am a502c59e: docs: Add FileProvider to Support Library r13 Release Notes 
* commit 'a502c59e679c1b355d6ad3387449d82c590d84cf':
  docs: Add FileProvider to Support Library r13 Release Notes
 2013-05-23 14:01:23 -07:00