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

83563 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
7534553d4c merge in jb-mr0-release history after reset to jb-dev 2012-08-09 11:37:03 -07:00
mike wakerly
1567a4341b Fix typo in UsbManager javadoc. 
Closes http://b.android.com/32863

Change-Id: I8fc03ee70209413f279f606b393e79c12ee9c0d2
 2012-08-09 11:25:16 -07:00
Baligh Uddin
a28604840c Import translations. DO NOT MERGE 
Change-Id: Icbcdd3a3c7dc300c30f23cc8870e8f6df63e22c6
Auto-generated-cl: translation import
 2012-08-09 11:14:23 -07:00
The Android Automerger
c47ac79e31 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-09 09:29:51 -07:00
John Spurlock
9a67ad9f4c am 7c46e438: Merge "Fix the dock-insertion Dream entry codepath." into jb-mr1-dev 
* commit '7c46e4380e6c50c30aad80807f87af25f000c7ff':
  Fix the dock-insertion Dream entry codepath.
 2012-08-09 08:19:41 -07:00
John Spurlock
7c46e4380e Merge "Fix the dock-insertion Dream entry codepath." into jb-mr1-dev 2012-08-09 08:17:14 -07:00
John Spurlock
8909d0582f am 634471ed: Load default Dream settings into a clean db. 
* commit '634471edc409f00f38633e334cd6853954a2b093':
  Load default Dream settings into a clean db.
 2012-08-09 08:16:58 -07:00
Daniel Sandler
015b9f45d4 Fix the dock-insertion Dream entry codepath. 
Bug: 6956040
Change-Id: I663e13f8a28db13b94d0f5aa4dbcf0cd64ef22fe
 2012-08-09 11:11:33 -04:00
John Spurlock
634471edc4 Load default Dream settings into a clean db. 
Set the Dream defaults during onCreate, not only onUpgrade.

Bug: 6959513
Change-Id: Ia93097edaf1150813c75b6be809db9c97987868f
 2012-08-09 10:41:37 -04:00
Baligh Uddin
ec89177b2e am b7649306: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'b7649306e9c8c06128c0f405f9da97c95f8be336':
  Import translations. DO NOT MERGE
 2012-08-08 20:45:34 -07:00
Baligh Uddin
b7649306e9 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-08 20:43:29 -07:00
Amith Yamasani
4860cfc684 Send BOOT_COMPLETED to all users. 
At least until we have a concept of logged-in users.

Change-Id: I65e3bed2aeef9692dbc64169cf02a7451cfed1cd
 2012-08-08 19:15:58 -07:00
Jeff Brown
c698c9cc6a am a1300467: Merge "Enable use of Surface as a native window in EGL14 wrapper." into jb-mr1-dev 
* commit 'a1300467332e3189e1b7c02af03fd66aac8e79e9':
  Enable use of Surface as a native window in EGL14 wrapper.
 2012-08-08 18:43:25 -07:00
Jeff Brown
a130046733 Merge "Enable use of Surface as a native window in EGL14 wrapper." into jb-mr1-dev 2012-08-08 18:41:05 -07:00
Jeff Brown
35489c0a3d am 1670dc9a: Merge "Add FloatMath.exp." into jb-mr1-dev 
* commit '1670dc9abf60368cca64c66df038aef76c1f0675':
  Add FloatMath.exp.
 2012-08-08 18:31:30 -07:00
Jeff Brown
1670dc9abf Merge "Add FloatMath.exp." into jb-mr1-dev 2012-08-08 18:29:08 -07:00
Jeff Brown
1296c63bf1 Enable use of Surface as a native window in EGL14 wrapper. 
Change-Id: Ia3546fd02f9b60d4505fbc0602522b95e3e5b6be
 2012-08-08 18:23:59 -07:00
Jeff Brown
5d728bb9ff Add FloatMath.exp. 
Change-Id: I7f215e5fd4cb942ddee56eebaef04be565ac79f3
 2012-08-08 18:23:53 -07:00
Jeff Brown
205a9c08c9 am b7df3a71: Merge "Make display info accessible from hidden api." into jb-mr1-dev 
* commit 'b7df3a714f43ee6fe0861e8bc81c4b15082b751e':
  Make display info accessible from hidden api.
 2012-08-08 18:23:41 -07:00
Jeff Brown
b7df3a714f Merge "Make display info accessible from hidden api." into jb-mr1-dev 2012-08-08 18:21:27 -07:00
Wink Saville
8498f32bb9 am f0875570: am eb2257cc: am 6f2361e7: Merge "Telephony: Dynamically instantiate IccCard" 
* commit 'f08755705f1758452d3473677039406a8d138f2e':
  Telephony: Dynamically instantiate IccCard
 2012-08-08 17:47:33 -07:00
Wink Saville
f08755705f am eb2257cc: am 6f2361e7: Merge "Telephony: Dynamically instantiate IccCard" 
* commit 'eb2257ccc94679404cf22d876f0a98109a5dc25d':
  Telephony: Dynamically instantiate IccCard
 2012-08-08 17:44:24 -07:00
Nick Kralevich
b4c4f4c74d am 5a286051: Merge "PackageParser: remove temporary code." into jb-mr1-dev 
* commit '5a28605155e51cdbd58737a8b7c47b337c5539bb':
  PackageParser: remove temporary code.
 2012-08-08 17:21:28 -07:00
Nick Kralevich
5a28605155 Merge "PackageParser: remove temporary code." into jb-mr1-dev 2012-08-08 17:19:06 -07:00
Wink Saville
eb2257ccc9 am 6f2361e7: Merge "Telephony: Dynamically instantiate IccCard" 
* commit '6f2361e7a97329feba7ac19b1a2635e315f73021':
  Telephony: Dynamically instantiate IccCard
 2012-08-08 17:09:26 -07:00
Amith Yamasani
4fe1082ec6 am 8264408f: Start the correct settings from the status bar. 
* commit '8264408f5995534f8e3147b001664ea0df52aaa5':
  Start the correct settings from the status bar.
 2012-08-08 16:55:30 -07:00
Amith Yamasani
8264408f59 Start the correct settings from the status bar. 
Added a new method to Context: startActivityAsUser() requiring the
INTERACT_ACROSS_USERS_FULL permission.

Show the correct Recents list, based on current user.
Added a getRecentTasksForUser() in ActivityManager. Hidden and requires
the INTERACT_ACROSS_USERS_FULL permission.

Change-Id: If5b56465efdd3ead36601a3b51ed4af157bbf35c
 2012-08-08 16:52:53 -07:00
Wink Saville
6f2361e7a9 Merge "Telephony: Dynamically instantiate IccCard" 2012-08-08 16:36:34 -07:00
Jeff Sharkey
ab4e251a8e am fb11ffa2: Merge "Isolate NetworkStateTracker creation, test." into jb-mr1-dev 
* commit 'fb11ffa2a04f0a6b1291cd7ffc68032fcc322312':
  Isolate NetworkStateTracker creation, test.
 2012-08-08 16:28:10 -07:00
Jeff Sharkey
fb11ffa2a0 Merge "Isolate NetworkStateTracker creation, test." into jb-mr1-dev 2012-08-08 16:25:41 -07:00
Jeff Sharkey
6c73eb8a73 am 82f479d0: Merge "Cleaner controls between Vpn and init services." into jb-mr1-dev 
* commit '82f479d0647855148af84fe2ba5484cb188c92cc':
  Cleaner controls between Vpn and init services.
 2012-08-08 16:23:59 -07:00
Jeff Sharkey
fb878b66b9 Isolate NetworkStateTracker creation, test. 
Change ConnectivityService to use a factory when creating
NetworkStateTrackers, which gives us a good place to inject mocks
for testing.  Add initial tests to verify that network routes are
added and removed as networks changed.

Change-Id: I11cbc61a84c2ed4afa2670036295b1494eab26e1
 2012-08-08 16:23:41 -07:00
Jeff Sharkey
82f479d064 Merge "Cleaner controls between Vpn and init services." into jb-mr1-dev 2012-08-08 16:22:23 -07:00
Romain Guy
c84fe3eb09 am f3c16a12: Merge "Reduce gradients textures size whenever possible" into jb-mr1-dev 
* commit 'f3c16a12aa0408a69ff358843d020f9ff6b883f1':
  Reduce gradients textures size whenever possible
 2012-08-08 16:09:16 -07:00
Adam Powell
591a708ea0 am 08532ab9: Merge "Fix indeterminate ProgressBars with weird sizes and padding; optimize ActionBar measurement" into jb-mr1-dev 
* commit '08532ab9ba073c217e39272db00740d75f00248a':
  Fix indeterminate ProgressBars with weird sizes and padding; optimize ActionBar measurement
 2012-08-08 16:07:33 -07:00
Romain Guy
f3c16a12aa Merge "Reduce gradients textures size whenever possible" into jb-mr1-dev 2012-08-08 16:06:37 -07:00
Romain Guy
320d46bf84 Reduce gradients textures size whenever possible 
Change-Id: Ifd58625ee62edac3b5d20b77553cb98b6fa2b46e
 2012-08-08 16:05:42 -07:00
Adam Powell
08532ab9ba Merge "Fix indeterminate ProgressBars with weird sizes and padding; optimize ActionBar measurement" into jb-mr1-dev 2012-08-08 16:04:35 -07:00
Adam Powell
6322af54cf Fix indeterminate ProgressBars with weird sizes and padding; optimize 
ActionBar measurement

Fix a bug where preserved aspect ratios in ProgressBar indeterminate
drawables were causing drawable bounds to be calculated incorrectly
when the ProgressBar had padding specified.

Measure the ActionBar menu view's height with EXACT measure mode,
preventing an extra measure pass to match child heights for some
cases.

Change-Id: I8c4678662a015b57ba2686d5b5c5fc27d4ef8d36
 2012-08-08 16:02:36 -07:00
Nick Kralevich
a30a4806ac PackageParser: remove temporary code. 
This code isn't needed and wasn't doing what I thought
it was doing.

Bug: 3306452
Change-Id: Ifeab672e379fd331a6f0ef1504eebb29aa6b4466
 2012-08-08 15:39:45 -07:00
Romain Guy
401695f55a It seems that apparently useless public APIs are actually useful 
Bug #6953651

Change-Id: Ic47ce504e63262711f5d3edc76f7d2b9c12471ad
 2012-08-08 15:07:31 -07:00
Rich Cannings
527a761ed4 Revert "Pass URLs to package verifiers" 
This reverts commit 24713907fe4632d263aea82f7a35c8fb08918a09

Change-Id: Ie04ba73475b813635c4a74915c45e83250801b6b
 2012-08-08 15:07:19 -07:00
Romain Guy
091b517139 am c89b14bb: It seems that apparently useless public APIs are actually useful Bug #6953651 
* commit 'c89b14bba0f6cc2c91629080617f7ed215f697f3':
  It seems that apparently useless public APIs are actually useful Bug #6953651
 2012-08-08 15:01:43 -07:00
Romain Guy
c89b14bba0 It seems that apparently useless public APIs are actually useful 
Bug #6953651

Change-Id: Ic47ce504e63262711f5d3edc76f7d2b9c12471ad
 2012-08-08 14:58:54 -07:00
Kenny Root
3d1235a51b am 6ab4511a: Merge "Use TrustedCertificateStore for chain building" into jb-mr1-dev 
* commit '6ab4511aa61f48cd2b4fe0444077d78cd404bab7':
  Use TrustedCertificateStore for chain building
 2012-08-08 14:50:59 -07:00
Kenny Root
6ab4511aa6 Merge "Use TrustedCertificateStore for chain building" into jb-mr1-dev 2012-08-08 14:49:30 -07:00
Subir Jhanb
95c29a8bbc am 603af61a: Add a new permission to have access to Gal Provider BUG:6897999 
* commit '603af61a7cd49f214743b286520419a3fe460774':
  Add a new permission to have access to Gal Provider BUG:6897999
 2012-08-08 14:37:42 -07:00
Subir Jhanb
603af61a7c Add a new permission to have access to Gal Provider 
BUG:6897999

Change-Id: Ie60963b7f3911b402b971e794178754e1b4f0a43
 2012-08-08 14:31:45 -07:00
Jean-Baptiste Queru
c366e19823 am 9951b7c4: am e5c46fae: am 6d0dd51e: Merge "Return early when checking divider before child zero." 
* commit '9951b7c4f094d39db70626ed665f848971220c48':
  Return early when checking divider before child zero.
 2012-08-08 14:10:57 -07:00
Jean-Baptiste Queru
1cc9386e96 am 88a42921: am 807c7ae0: am 7835d4fb: Merge "Fix SurfaceView notifies on invalid surfaces." 
* commit '88a4292186fef902db476d63529d0b15a17d9d4d':
  Fix SurfaceView notifies on invalid surfaces.
 2012-08-08 14:10:53 -07:00