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

62467 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bart Sears
3f6114164f am cb513ba7: am e6a96560: Merge "Content and viewport rects set in one step." into ics-mr1 
* commit 'cb513ba7f14fdf08b5729edef5baf22e302e3e08':
  Content and viewport rects set in one step.
 2011-11-18 15:22:57 -08:00
Svetoslav Ganov
556ac0b217 am 322f884d: am 0358787f: Merge "Add the support libraries to the platform documentation (build)." into ics-mr1 
* commit '322f884dfda201f7bcb5b8cbff80d0ae5122ced3':
  Add the support libraries to the platform documentation (build).
 2011-11-18 15:22:37 -08:00
Joe Fernandez
31659f05f3 am 0c778cdd: am dea90a0e: am 366113fa: Merge "docs: Camera Features for developers" into ics-mr0 
* commit '0c778cdd9cfdb8007b15eef2eca91f3089590f98':
  docs: Camera Features for developers
 2011-11-18 15:22:31 -08:00
Scott Main
a629de0b71 am e17a4a02: am d353df8d: am 48eaa6c9: docs: update caption for action bar figure to match new screenshot 
* commit 'e17a4a02617dbefbc870df8280ffa1cd82fff2a0':
  docs: update caption for action bar figure to match new screenshot
 2011-11-18 15:06:31 -08:00
Daniel Sandler
6686effc61 am 2e56995e: am da0e7b0c: Merge "Tie screen saver to the screen off timeout." into ics-mr1 
* commit '2e56995e9e19f18958167a28911120f31b096756':
  Tie screen saver to the screen off timeout.
 2011-11-18 14:47:58 -08:00
Adam Powell
74b7c892cb am 65035d2a: am 8c54182f: Merge "Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)" into ics-mr1 
* commit '65035d2a72fd8c847aa9c78c0e97058535ec18a5':
  Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)
 2011-11-18 14:47:55 -08:00
Jim Miller
b32f5037e9 Merge "resolved conflicts for merge of 1a783be3 to master" 2011-11-18 14:44:50 -08:00
Daisuke Miyakawa
26650aef86 Merge "Introduce Callable URI as hidden API" 2011-11-18 14:02:28 -08:00
Jeff Sharkey
d813e79009 Merge "Clean up NMS AIDL and permissions checking." 2011-11-18 13:57:59 -08:00
Jim Miller
76b2337cfa resolved conflicts for merge of 1a783be3 to master 
Change-Id: Ibaff3547ac51250fe40adf3aa06d6a30ecfcef54
 2011-11-18 13:56:20 -08:00
Marco Nelissen
02b370f132 Merge "status_t != bool" 2011-11-18 13:52:35 -08:00
Bart Sears
cb513ba7f1 am e6a96560: Merge "Content and viewport rects set in one step." into ics-mr1 
* commit 'e6a96560ed96e5121db2e22168698f14338c8f1d':
  Content and viewport rects set in one step.
 2011-11-18 13:35:14 -08:00
Marco Nelissen
1cad15207d status_t != bool 
b/5567433

Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
 2011-11-18 13:10:56 -08:00
Jeff Sharkey
af75c33e8d Clean up NMS AIDL and permissions checking. 
Bug: 5472290
Change-Id: I30f9d79b1bc7f1d156a3b81b003f2b8ce25d53af
 2011-11-18 12:41:12 -08:00
Jesse Wilson
64b0acf07b Merge "Remove untrue tip about zero-length arrays." 2011-11-18 12:06:42 -08:00
Jesse Wilson
59346fc4e8 Remove untrue tip about zero-length arrays. 
Change-Id: I45ee2d603c1286c96acaa35d0c0fc28ecda47cef
 2011-11-18 15:02:15 -05:00
Bart Sears
e6a96560ed Merge "Content and viewport rects set in one step." into ics-mr1 2011-11-18 11:46:26 -08:00
Svetoslav Ganov
322f884dfd am 0358787f: Merge "Add the support libraries to the platform documentation (build)." into ics-mr1 
* commit '0358787f68c48fb10f2d8067fd53f0471481320a':
  Add the support libraries to the platform documentation (build).
 2011-11-18 10:14:04 -08:00
Svetoslav Ganov
0358787f68 Merge "Add the support libraries to the platform documentation (build)." into ics-mr1 2011-11-18 10:11:35 -08:00
Guang Zhu
33d4dde058 am 1753fd00: am 3af8b699: Merge "add a self instrumentation into framework perf app" into ics-mr1 
* commit '1753fd00764614213cfb9f88b00ee16fe3c1da3e':
  add a self instrumentation into framework perf app
 2011-11-18 09:15:56 -08:00
satok
b9fc0a4d86 am 852b589a: am 1a3c051b: Merge "Hide/show ime switch icon properly" into ics-mr1 
* commit '852b589a51531f8f7a166f36f7596c255896f35c':
  Hide/show ime switch icon properly
 2011-11-18 09:15:54 -08:00
Joe Fernandez
0c778cdd9c am dea90a0e: am 366113fa: Merge "docs: Camera Features for developers" into ics-mr0 
* commit 'dea90a0e1c9c1d15657024893b6793dc21bc27ef':
  docs: Camera Features for developers
 2011-11-18 06:17:59 -08:00
Joe Fernandez
dea90a0e1c am 366113fa: Merge "docs: Camera Features for developers" into ics-mr0 
* commit '366113fa1bea5ef39cf6557f18ff00310eb6e458':
  docs: Camera Features for developers
 2011-11-18 06:14:01 -08:00
Scott Main
e17a4a0261 am d353df8d: am 48eaa6c9: docs: update caption for action bar figure to match new screenshot 
* commit 'd353df8db4f51868e1e09463b2c25e3637ad8e95':
  docs: update caption for action bar figure to match new screenshot
 2011-11-18 02:53:00 -08:00
Scott Main
d353df8db4 am 48eaa6c9: docs: update caption for action bar figure to match new screenshot 
* commit '48eaa6c9e5ab224201b17d2ea3e7e43e04c40f3b':
  docs: update caption for action bar figure to match new screenshot
 2011-11-18 02:49:49 -08:00
Jim Miller
be3bf963c4 am a8606cf6: am 398f80ea: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1 
* commit 'a8606cf661fde3300165f181c5825cf0535adc66':
  Fix 5620754: don't show pattern screen after SIM PUK unlock
 2011-11-18 02:37:49 -08:00
Jamie Gennis
892a9d674d am 9da22d2c: am 2ba13186: Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1 
* commit '9da22d2cc31069d86a92021d8540bb5a77c9591b':
  SurfaceTexture: fix a bug with buffer reallocation
 2011-11-18 02:37:41 -08:00
Jamie Gennis
99f0528b5e am e2fca63a: am c8fd6e30: Merge "EGL: fix blob cache extension detection" into ics-mr1 
* commit 'e2fca63a18c7bd3fb0c14e1c5dc391cd699cea9f':
  EGL: fix blob cache extension detection
 2011-11-18 02:37:39 -08:00
David Brown
7476ea58f7 am 7d22534b: am 3f51f954: Merge "Fix a crash caused by SIP addresses containing "%40" instead of "@"" into ics-mr1 
* commit '7d22534b4cba49b1bd9d88969c3189a2c6fecf55':
  Fix a crash caused by SIP addresses containing "%40" instead of "@"
 2011-11-18 02:37:28 -08:00
Jamie Gennis
fa1a6eb584 am 0272e600: am a37a78e2: Merge "GLES: add image external enums" into ics-mr1 
* commit '0272e60060162d2c32aec02d9cd1414dbbe14782':
  GLES: add image external enums
 2011-11-18 02:37:22 -08:00
The Android Open Source Project
e761f1e58f am 17c01198: am 31b0c687: Reconcile with ics-mr0-release 
* commit '17c011985e53e7513c13bc1ed40aa65222dc660a':
 2011-11-18 02:37:17 -08:00
Daniel Sandler
2e56995e9e am da0e7b0c: Merge "Tie screen saver to the screen off timeout." into ics-mr1 
* commit 'da0e7b0c7a0bb1f9f972c3ed042b8cd752031046':
  Tie screen saver to the screen off timeout.
 2011-11-17 21:04:37 -08:00
Daniel Sandler
da0e7b0c7a Merge "Tie screen saver to the screen off timeout." into ics-mr1 2011-11-17 21:02:40 -08:00
Adam Powell
65035d2a72 am 8c54182f: Merge "Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)" into ics-mr1 
* commit '8c54182f0b6c706adc6247d6f1da7147b357920d':
  Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)
 2011-11-17 19:46:19 -08:00
Adam Powell
8c54182f0b Merge "Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)" into ics-mr1 2011-11-17 19:44:14 -08:00
Jim Miller
1a783be36f am 70bded0a: Merge "Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels" into ics-mr1 
* commit '70bded0ab8390cb53342f1fb1f1ff9ee56f60e5f':
  Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels
 2011-11-17 18:59:59 -08:00
Jim Miller
70bded0ab8 Merge "Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels" into ics-mr1 2011-11-17 18:58:20 -08:00
Guang Zhu
1753fd0076 am 3af8b699: Merge "add a self instrumentation into framework perf app" into ics-mr1 
* commit '3af8b699830bb5804f3c1b6420d9210b2fd8adb9':
  add a self instrumentation into framework perf app
 2011-11-17 18:06:18 -08:00
Guang Zhu
3af8b69983 Merge "add a self instrumentation into framework perf app" into ics-mr1 2011-11-17 18:04:23 -08:00
satok
852b589a51 am 1a3c051b: Merge "Hide/show ime switch icon properly" into ics-mr1 
* commit '1a3c051bcc787363d9154da4a8e8e562dda32926':
  Hide/show ime switch icon properly
 2011-11-17 18:03:46 -08:00
satok
1a3c051bcc Merge "Hide/show ime switch icon properly" into ics-mr1 2011-11-17 18:02:09 -08:00
Adam Powell
c992087d09 Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX) 
Disable the window-level progress spinner; another is already shown while
connecting.

Use the correct Settings icon for SystemUI.

Specify the activity title for the USB mass storage screen in the
manifest to avoid title flashing during startup.

Change-Id: Ic57af56bf1661a5eaa91fff77471dc8447340d16
 2011-11-17 18:01:07 -08:00
Jim Miller
9a3caf39e4 Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels 
This bug is the result of onPause()/onResume() not being called properly
when we have both lock and unlock screens present, which is true for the SIM
and PUK unlock cases.

The fix is to invoke onPause() and onResume() on both of them if they exist.

Verified the rest of the code correctly handles having both.

Also, when the user cancels, we now clear the fields.

Change-Id: If7fbd31df7eab9e3d60656d50d2392607a4bf471
 2011-11-17 17:58:40 -08:00
Jim Miller
a8606cf661 am 398f80ea: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1 
* commit '398f80eacb8e59d868f287bf273a1253fe219ce4':
  Fix 5620754: don't show pattern screen after SIM PUK unlock
 2011-11-17 17:44:37 -08:00
Jim Miller
398f80eacb Merge "Fix 5620754: don't show pattern screen after SIM PUK unlock" into ics-mr1 2011-11-17 17:41:50 -08:00
Joe Fernandez
366113fa1b Merge "docs: Camera Features for developers" into ics-mr0 2011-11-17 17:34:33 -08:00
Jamie Gennis
9da22d2cc3 am 2ba13186: Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1 
* commit '2ba13186b268de3527af6da1933a4b65877548d9':
  SurfaceTexture: fix a bug with buffer reallocation
 2011-11-17 17:11:59 -08:00
Jamie Gennis
e2fca63a18 am c8fd6e30: Merge "EGL: fix blob cache extension detection" into ics-mr1 
* commit 'c8fd6e3057a98a992b96c2bce3fa2a981c6e45c0':
  EGL: fix blob cache extension detection
 2011-11-17 17:11:57 -08:00
Jamie Gennis
2ba13186b2 Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1 2011-11-17 17:10:47 -08:00
Jamie Gennis
c8fd6e3057 Merge "EGL: fix blob cache extension detection" into ics-mr1 2011-11-17 17:10:32 -08:00