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

64348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roman Nurik
ba8b97e202 am 0786bc73: am baa88ef7: Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1 
* commit '0786bc734e55b40a16d1a475f311c5460ff55d36':
  docs: minor Design Principles fixes for Android Design
 2012-01-12 13:38:01 -08:00
Jim Miller
0b92eb4b8c am 1aff11be: am 7a286d83: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1 
* commit '1aff11be4585d6ddff784d7e74188963050805fa':
  Fix 5620754: don't show pattern screen after SIM PUK unlock
 2012-01-12 13:37:58 -08:00
Daniel Sandler
494a17761d am 66e66e1d: am 755a967b: Merge "Clean up wifi/mobile indicators in the expanded panel." into ics-mr1 
* commit '66e66e1d70bdcf184a29bc5eb8cfdeecffdb799f':
  Clean up wifi/mobile indicators in the expanded panel.
 2012-01-12 13:37:54 -08:00
Scott Main
5b7863f2d4 am 499b9441: am cf602dbd: docs: replace "decide for me image" bug: 5860467 
* commit '499b944133298b4da344fbf97cff25c6f6b9d62f':
  docs: replace "decide for me image" bug: 5860467
 2012-01-12 13:37:41 -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
Matthew Xie
cf5cecd854 am 1890fa82: am 79d84930: Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1 
* commit '1890fa822091ea700b7409ac79a57cf650b55003':
  Set Bluetooth adapter to PowerOff mode when turnoff with airplane on
 2012-01-12 11:29:39 -08:00
Matthew Xie
1890fa8220 am 79d84930: Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1 
* commit '79d84930cd776c7173330eeb13b3282b6034fc37':
  Set Bluetooth adapter to PowerOff mode when turnoff with airplane on
 2012-01-12 11:27:10 -08:00
Scott Main
1bdaa928cc am db4296bd: am a618eeb5: Merge "docs: update text and image for "let me make it mine" prinicple in design guide bug: 5853519" into ics-mr1 
* commit 'db4296bde95352b6bb5614fad3b08ffaa49dd9c3':
  docs: update text and image for "let me make it mine" prinicple in design guide bug: 5853519
 2012-01-12 11:26:49 -08:00
Scott Main
db4296bde9 am a618eeb5: Merge "docs: update text and image for "let me make it mine" prinicple in design guide bug: 5853519" into ics-mr1 
* commit 'a618eeb552981d8bca38dbe8c28e2b1b1bffdf5e':
  docs: update text and image for "let me make it mine" prinicple in design guide bug: 5853519
 2012-01-12 11:24:24 -08:00
Matthew Xie
79d84930cd Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1 2012-01-12 11:24:06 -08:00
Scott Main
8f01335257 am b2ff327c: am abfe4cb6: Merge "docs: further clarify the behavior of targetSdkVersion bug: 5854083" into ics-mr1 
* commit 'b2ff327cb41185030077189bc3e80376acf11c68':
  docs: further clarify the behavior of targetSdkVersion bug: 5854083
 2012-01-12 11:23:11 -08:00
Scott Main
a618eeb552 Merge "docs: update text and image for "let me make it mine" prinicple in design guide bug: 5853519" into ics-mr1 2012-01-12 11:22:24 -08:00
Scott Main
b2ff327cb4 am abfe4cb6: Merge "docs: further clarify the behavior of targetSdkVersion bug: 5854083" into ics-mr1 
* commit 'abfe4cb6f0ebd6c901d3210fed719d03db9e80b7':
  docs: further clarify the behavior of targetSdkVersion bug: 5854083
 2012-01-12 11:21:02 -08:00
Scott Main
abfe4cb6f0 Merge "docs: further clarify the behavior of targetSdkVersion bug: 5854083" into ics-mr1 2012-01-12 11:19:08 -08:00
Scott Main
0c95bb478e docs: update text and image for "let me make it mine" prinicple in design guide 
bug: 5853519

Change-Id: I7cccbb6d6eb94f29cbad24d3a07c9222a963434c
 2012-01-12 11:16:35 -08:00
John Reck
f86cf52ead am 6b9a41c5: am baaf136c: am 0a3fcc3e: Fix Apache stack 
* commit '6b9a41c55ef9c8ff6f2c7d76f1b81fbe85b2e7d4':
  Fix Apache stack
 2012-01-12 11:07:16 -08:00
John Reck
6b9a41c55e am baaf136c: am 0a3fcc3e: Fix Apache stack 
* commit 'baaf136cd279e22a7ae4b551ebd5fad23b84996d':
  Fix Apache stack
 2012-01-12 11:03:06 -08:00
John Reck
baaf136cd2 am 0a3fcc3e: Fix Apache stack 
* commit '0a3fcc3eed15ed50bcaa7808b6ccb170fb137210':
  Fix Apache stack
 2012-01-12 11:00:17 -08:00
Michael Jurka
d9bb7a8df8 Merge "Fix NPE in Recent Apps" 2012-01-12 10:41:32 -08:00
Mathias Agopian
2fdc357bc6 Merge "remove dead/usnused code" 2012-01-12 10:37:10 -08:00
Mathias Agopian
3adbec281e Merge "Fix an issue with VSYNC" 2012-01-12 10:36:39 -08:00
Glenn Kasten
1c66547ba2 Merge "Use audio_format_t consistently" 2012-01-12 10:30:28 -08:00
Robert Greenwalt
cc9858049d am 1800ccfa: am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1 
* commit '1800ccfa647cca6e9c051759312d6af12f134f5a':
  Disable wimax when mobile data is in Settings
 2012-01-12 09:29:30 -08:00
Robert Greenwalt
1800ccfa64 am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1 
* commit '4b1261f17ae2a0180be09b1c987ec7e70b2b46a7':
  Disable wimax when mobile data is in Settings
 2012-01-12 09:26:48 -08:00
Robert Greenwalt
140d0158c4 Merge "Ignore case on apn type strings." 2012-01-12 09:25:25 -08:00
Robert Greenwalt
4b1261f17a Merge "Disable wimax when mobile data is in Settings" into ics-mr1 2012-01-12 09:24:45 -08:00
The Android Open Source Project
357987c7a5 am ce77af47: Reconcile with ics-mr1-release 
* commit 'ce77af47e979d365155e4003ca2943b639600e73':
 2012-01-12 09:00:21 -08:00
The Android Open Source Project
ce77af47e9 Reconcile with ics-mr1-release 
Change-Id: Ie242914fa4cfdf35675bbd2777f0817186860526
 2012-01-12 08:56:17 -08:00
Marco Nelissen
3fbc0b2062 Merge "MediaScanner: Disable bulk insert for settings" 2012-01-12 07:49:23 -08:00
Michael Jurka
5db89d806b Merge "Speeding up System UI pressed anim" 2012-01-12 07:35:43 -08:00
Danielle Millett
29833523cc am 63faf6c6: (-s ours) am 2931d8ac: Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1 
* commit '63faf6c66ff129da9e431dbafd1170a14aedb259':
  DO NOT MERGE - Cherry picking from master to MR1
 2012-01-12 07:33:47 -08:00
Danielle Millett
63faf6c66f am 2931d8ac: Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1 
* commit '2931d8ace9118bafe08090cd41e235048b6c2eb2':
  DO NOT MERGE - Cherry picking from master to MR1
 2012-01-12 07:31:37 -08:00
Danielle Millett
2931d8ace9 Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1 2012-01-12 07:28:24 -08:00
Michael Jurka
0b6586649f Speeding up System UI pressed anim 
No longer saving a layer in KeyButtonView.onDraw,
which prevents a framebuffer readback on some
drivers and cuts ~3ms from render time per frame
(on some frames, up to ~10ms)

Change-Id: I5df56c20098f35c8ae6c25e76c67d81e9b72d1f7
 2012-01-12 07:09:40 -08:00
Michael Jurka
b144bd75b8 Fix NPE in Recent Apps 
Change-Id: I936e053a806a1cbf9ac98fb5707d34924c94ff60
 2012-01-12 06:56:39 -08:00
Brian Colonna
d5842b21d8 am 2cd0a0e5: (-s ours) am 8a1131d7: Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1 
* commit '2cd0a0e58e5da20405d1f16c65c7f9729de57c9a':
  DO NOT MERGE cherry-picked FU framework tablet commits
 2012-01-12 06:37:14 -08:00
Brian Colonna
2cd0a0e58e am 8a1131d7: Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1 
* commit '8a1131d78925756835561c3e19cddd2ddf9dbd99':
  DO NOT MERGE cherry-picked FU framework tablet commits
 2012-01-12 06:35:27 -08:00
Brian Colonna
8a1131d789 Merge "DO NOT MERGE cherry-picked FU framework tablet commits" into ics-mr1 2012-01-12 06:33:49 -08:00
Mathias Agopian
0db7590ed2 remove dead/usnused code 
Change-Id: I6fa2bc6ee01790abd2c1533f043d61a5e5c8d26e
 2012-01-11 22:03:41 -08:00
Mathias Agopian
7e9a3706d9 Fix an issue with VSYNC 
one-shot VSYNC listeners could miss a VSYNC event if
scheduled while in waitForVsync().

Change-Id: I720485784aecfea6cc7a23c77081d7af3c9c71db
 2012-01-11 22:03:40 -08:00
satok
e00274a5ab Merge "Make public SpellChecker utilities" 2012-01-11 21:14:23 -08:00
satok
11299b1b8c Make public SpellChecker utilities 
Bug: 5639238
Change-Id: Id7dd2263a6305cc6ba0cf8f4d8ad8fb0d39a48ff
 2012-01-12 13:54:53 +09:00