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

62900 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
2afcd2d1a2 am 3938e4fb: Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1 
* commit '3938e4fbaae132db9b4676ba26f6b3c042a6879e':
  docs: emphasize qualifier order and mention implicit version qualifer
 2012-01-13 18:25:44 -08:00
Scott Main
3938e4fbaa Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1 2012-01-13 18:23:40 -08:00
Scott Main
114875e837 am 40d6e7d9: Merge "docs: mention x86 as a native platform filter" into ics-mr1 
* commit '40d6e7d913fe865accb8313efdb87aacd6d71f18':
  docs: mention x86 as a native platform filter
 2012-01-13 18:23:35 -08:00
Dianne Hackborn
d4d68fe202 am cc7bd5ab: Merge "Update notification documentation to follow current guidelines." into ics-mr1 
* commit 'cc7bd5ab550855c14c76701709b35d12a9677eb2':
  Update notification documentation to follow current guidelines.
 2012-01-13 18:23:34 -08:00
Daniel Sandler
80c4cd1fd7 am bd9d9d3a: cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05 
* commit 'bd9d9d3ae2a758139c7dd722c4836a33b9b059a8':
  cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
 2012-01-13 18:23:33 -08:00
Scott Main
40d6e7d913 Merge "docs: mention x86 as a native platform filter" into ics-mr1 2012-01-13 18:21:42 -08:00
Scott Main
e2225df259 docs: mention x86 as a native platform filter 
Change-Id: I003b1e0e649f36e8971df85ef2a28f991875d605
 2012-01-13 18:20:10 -08:00
Dianne Hackborn
cc7bd5ab55 Merge "Update notification documentation to follow current guidelines." into ics-mr1 2012-01-13 16:36:05 -08:00
The Android Automerger
2240730390 merge in ics-mr1-release history after reset to ics-mr1 2012-01-13 16:18:17 -08:00
Daniel Sandler
bd9d9d3ae2 cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05 
Change-Id: I8910c0982ffe2be482f6ae1a49343a1c79be0632
 2012-01-13 15:12:07 -08:00
Kenny Root
e80341c8c5 am 2ddf6ea6: Merge "Fix issue with selecting proper JNI libraries" into ics-mr1 
* commit '2ddf6ea6dc67043fb9f91df366187c2153c30d30':
  Fix issue with selecting proper JNI libraries
 2012-01-13 13:12:34 -08:00
Kenny Root
2ddf6ea6dc Merge "Fix issue with selecting proper JNI libraries" into ics-mr1 2012-01-13 13:11:02 -08:00
Dianne Hackborn
100651779f am 2e282f35: Merge "Fix issue #5823276: home repaints after full-screen app is exited" into ics-mr1 
* commit '2e282f35b009fe4c23daca35592dae2032641643':
  Fix issue #5823276: home repaints after full-screen app is exited
 2012-01-13 12:58:45 -08:00
Dianne Hackborn
2e282f35b0 Merge "Fix issue #5823276: home repaints after full-screen app is exited" into ics-mr1 2012-01-13 12:56:40 -08:00
Bart Sears
bcce2a1953 am da7b7700: Merge "Update to latest version of Roboto" into ics-mr1 
* commit 'da7b7700d0f499ac9b0bac51365b3da235388ae6':
  Update to latest version of Roboto
 2012-01-13 12:35:07 -08:00
Bart Sears
da7b7700d0 Merge "Update to latest version of Roboto" into ics-mr1 2012-01-13 12:32:43 -08:00
Christopher Tate
89620c5d98 am 2cf18d28: Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1 
* commit '2cf18d28785fdd188641867503586627cb212302':
  Streamline package-installed handling by the Backup Manager
 2012-01-13 12:08:09 -08:00
Christopher Tate
2cf18d2878 Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1 2012-01-13 11:49:20 -08:00
Bart Sears
6c16a58b2c Update to latest version of Roboto 
Bug: 5527891

U+0125 (h with Circumflex):  Moved the Circumflex to not stick out
       beyond the left edge of the "h"
U+0300, U+0301, U+0303, U+0309, U+030F, U+0323: Move to the left so
       that they can be composited.
U+047C (Capital Omega with Titlo): Fixed the Titlo accent
U+047D (Small Omega with Titlo): Fixed the Titlo accent
U+048E (Capital ER with tick): Changed the tick to be diagonal
U+2248 (Almost equal to):  Added the glyph

Change-Id: Ibcadcd008a58f42d8bd4238d768101d8bf726ff6
 2012-01-13 11:44:23 -08:00
John Huang
e65723044d am 2753e826: Merge "Fix teardown of secondary connections on CDMA" into ics-mr1 
* commit '2753e826b2d0e7a4c5f80c3e825afa4aa579942b':
  Fix teardown of secondary connections on CDMA
 2012-01-13 11:39:03 -08:00
John Huang
2753e826b2 Merge "Fix teardown of secondary connections on CDMA" into ics-mr1 2012-01-13 11:37:15 -08:00
Jean-Baptiste Queru
c0ef548c74 am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" 
* commit 'd75961eecbfeb3f7e027a2a1f6011a26dd7d2d2d':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
 2012-01-13 11:25:09 -08:00
Jean-Baptiste Queru
d75961eecb am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" 
* commit 'b4cee0f871e0f5a2abd6c6f05b65710b69423f2c':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
 2012-01-13 11:22:08 -08:00
Scott Main
be0cf70dc3 docs: emphasize qualifier order and mention implicit version qualifer 
Change-Id: I6e1d174a27ccbdc5179bd3d06de0a69c17a5cfcc
 2012-01-13 11:19:05 -08:00
Robert Ly
7da0abc52e am 62472581: Merge "cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62" into ics-mr1 
* commit '62472581c30a3202b7bbd86e644b4346d5a4e65c':
  cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62
 2012-01-13 11:09:27 -08:00
Robert Ly
2eeb53c155 update overview page for rs api docs to open iframe links in parent 
Change-Id: Ic0aa77192fa19b045a7fd9df5926255511fdc3be
 2012-01-13 10:18:43 -08:00
Robert Ly
62472581c3 Merge "cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62" into ics-mr1 2012-01-13 10:13:14 -08:00
Robert Ly
0272f1dfd7 cherrypick from master - add overview description for RS API reference Change-Id: Id5554c607ad4c435f92bfa939e4ce4833a638f62 
Change-Id: Iff4b4bd171818208bb3be46dd3ef7e91b6cbd80f
 2012-01-13 10:07:20 -08:00
Jean-Baptiste Queru
b4cee0f871 Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" 2012-01-13 07:48:56 -08:00
Robert Greenwalt
2fceb7fec0 Fix teardown of secondary connections on CDMA 
Restores functionallity from Gingerbread.  We should tear down when the
enabledcount goes to zero, but we should always notify and attempt to
switch back to default when indicated.

bug:5830081
Change-Id: Ib8469bb5369da21e8cc05fb755b2d7e24c8e02a6
 2012-01-12 17:38:54 -08:00
Christopher Tate
0bacfd2ba6 Streamline package-installed handling by the Backup Manager 
In particular, don't do O(asec_apps * installed_apps) work during the
broadcast receiver's operation.  On devices with many installed apps
and a large number of them moved to ASECs, this was causing the system
process to become unresponsive and the watchdog to fire -- which in turn
would initiate a restart loop, as the same package-installed broadcast
would then be issued again once the package manager rescanned the ASEC
containers, ad infinitum.  With this change, the expensive call to the
package manager is only made once rather than asec_apps times.

Bug 5850283

Change-Id: I14e280ea1fa6af19cebc58869a20fbb599c92c8c
 2012-01-12 16:15:09 -08:00
Dianne Hackborn
6ceca588a2 Update notification documentation to follow current guidelines. 
The documentation is now consistent with the current UI guidelines
for handling notifications, and includes complete sample code showing
the correct way to do this.

Change-Id: I68f0afc62c2af164c3205535e62093679e2a256a
 2012-01-12 15:48:20 -08:00
Scott Main
cea3892bd7 am 722c8c02: Merge "docs: make AD logo clickable on home page" into ics-mr1 
* commit '722c8c02f1e17c232b041440ea97a2fda336a6e8':
  docs: make AD logo clickable on home page
 2012-01-12 15:47:15 -08:00
Scott Main
722c8c02f1 Merge "docs: make AD logo clickable on home page" into ics-mr1 2012-01-12 15:44:53 -08:00
Scott Main
8b56d20e30 docs: make AD logo clickable on home page 
Change-Id: Ib8a94280d4183b82bcbc5969f2dff1a67c1ecc53
 2012-01-12 15:33:38 -08:00
Chia-chi Yeh
1e9e7f76d5 am ff321d49: Merge "VPN: silence VPN notifications." into ics-mr1 
* commit 'ff321d496a6a07fc667112ecfe4d9a107d44147b':
  VPN: silence VPN notifications.
 2012-01-12 14:26:43 -08:00
Chia-chi Yeh
ff321d496a Merge "VPN: silence VPN notifications." into ics-mr1 2012-01-12 14:24:30 -08:00
Roman Nurik
4ecb263398 am aaaafca8: docs: Android design CSS/JS fixes 
* commit 'aaaafca8543eaa75f1865d70c801c9b62caa56e2':
  docs: Android design CSS/JS fixes
 2012-01-12 14:07:51 -08:00
Dianne Hackborn
01b02a734d Fix issue #5823276: home repaints after full-screen app is exited 
Don't consider a window as a candidate for the top fullscreen window
if it is not going to be a candiate for layout.

Also don't consider windows a candidate for layout if their app token
is hidden.  This fixes a transient state where we are preparing to
unhide the window but have not done so yet.

Change-Id: Ife5299ffa003c1df1a4f787b7a2809cbf614ec16
 2012-01-12 14:05:03 -08:00
The Android Automerger
9cc3bd956d merge in ics-mr1-release history after reset to ics-mr1 2012-01-12 14:01:29 -08:00
Roman Nurik
aaaafca854 docs: Android design CSS/JS fixes 
- Remove new window icon for Developer site link
- Make videos re-load and replay on click to prevent
  failed replay for unseekable videos

Change-Id: I689607d0d53247b0e599612cb7d23a98d6ad24a1
 2012-01-12 13:57:44 -08:00
Roman Nurik
0786bc734e am baa88ef7: Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1 
* commit 'baa88ef7d3b4d3b16f97a3c56a3049dcb686baf9':
  docs: minor Design Principles fixes for Android Design
 2012-01-12 12:46:50 -08:00
Roman Nurik
baa88ef7d3 Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1 2012-01-12 12:45:00 -08:00
Jim Miller
1aff11be45 am 7a286d83: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1 
* commit '7a286d8391a58637e6834f4de296bf66183ce1b2':
  Fix 5620754: don't show pattern screen after SIM PUK unlock
 2012-01-12 12:31:07 -08:00
Jim Miller
7a286d8391 Merge "Fix 5620754: don't show pattern screen after SIM PUK unlock" into ics-mr1 2012-01-12 12:28:59 -08:00
Roman Nurik
403cb28a81 docs: minor Design Principles fixes for Android Design 
Change-Id: I3d69c5fd420e7e6a7d70ebf4a65179af23a70859
 2012-01-12 12:08:07 -08:00
Daniel Sandler
66e66e1d70 am 755a967b: Merge "Clean up wifi/mobile indicators in the expanded panel." into ics-mr1 
* commit '755a967bdc2cddb6fbadd10e357f8a5328520061':
  Clean up wifi/mobile indicators in the expanded panel.
 2012-01-12 11:40:43 -08:00
Daniel Sandler
755a967bdc Merge "Clean up wifi/mobile indicators in the expanded panel." into ics-mr1 2012-01-12 11:38:39 -08:00
Scott Main
499b944133 am cf602dbd: docs: replace "decide for me image" bug: 5860467 
* commit 'cf602dbd0b907d113e703cc8e4c8b378dce0a4c4':
  docs: replace "decide for me image" bug: 5860467
 2012-01-12 11:35:54 -08:00
Scott Main
cf602dbd0b docs: replace "decide for me image" 
bug: 5860467

Change-Id: I45f10df561c9392dc5b4621305413d1e7621e05d
 2012-01-12 11:30:27 -08:00