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

65418 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roman Nurik
a24c8bf255 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:53 -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
b4c7ec56d6 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:09 -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
John Grossman
595d76ee82 Reuse callback buffers in the Visualizer. 
Don't re-allocate buffers used by Visualizer callbacks as this causes an
unacceptable amount of GC thrash.  Instead, lazily allocate the buffers and only
reallocate them when the required size changes.

See http://b/issue?id=5717519 for details.

Change-Id: I50458961992a64d9b3c46db7e5e8e6414a92228f
Signed-off-by: John Grossman <johngro@google.com>
 2012-01-12 11:52:39 -08:00
Daniel Sandler
338618e7ad 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:36 -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
cf89dcb321 am cf602dbd: docs: replace "decide for me image" bug: 5860467 
* commit 'cf602dbd0b907d113e703cc8e4c8b378dce0a4c4':
  docs: replace "decide for me image" bug: 5860467
 2012-01-12 11:37:46 -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
1b94af5f45 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:01 -08:00
Scott Main
ebb7f5664b 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:20 -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
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
7cb3c5b664 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:20:56 -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
Robert Greenwalt
c60a627c00 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:33 -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
Danielle Millett
d712248e4e 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:36 -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
Brian Colonna
79b499005f 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:36:02 -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
Xia Wang
b1e65faf13 am 4ac4ab4e: Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922" into ics-mr1 
* commit '4ac4ab4ef046eed4d1ada7bbb1d54ee0a244d454':
  Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922
 2012-01-11 17:54:25 -08:00
Xia Wang
19bdbca0bb am 1446c7b2: Merge "Get average value for image processing test bug#: 5566079" into ics-mr1 
* commit '1446c7b2ed41f718afef86787b3ffd3f7b4ee9d7':
  Get average value for image processing test bug#: 5566079
 2012-01-11 17:54:18 -08:00
Xia Wang
4ac4ab4ef0 Merge "Remove sleep from test acitivity to avoid ANR when key event is injected bug#: 5737922" into ics-mr1 2012-01-11 17:52:06 -08:00
Xia Wang
1446c7b2ed Merge "Get average value for image processing test bug#: 5566079" into ics-mr1 2012-01-11 17:51:48 -08:00
Scott Main
d4eb682b5f docs: further clarify the behavior of targetSdkVersion 
bug: 5854083

Change-Id: I913a245b754604165b4570447f797f7cc66af5f9
 2012-01-11 17:23:06 -08:00
Katie McCormick
4f7014d738 am 6a52c632: Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1 
* commit '6a52c632530fa39de570c9a6630264178c20e58e':
  Doc change: Adding Bluetooth HDP info.
 2012-01-11 16:42:44 -08:00
Katie McCormick
6a52c63253 Merge "Doc change: Adding Bluetooth HDP info." into ics-mr1 2012-01-11 16:40:37 -08:00
Katie McCormick
2e32a78ead Doc change: Adding Bluetooth HDP info. 
Change-Id: Icdc19ed9ea09422ac2ea01c03b4a569d8ae94121
 2012-01-11 16:18:50 -08:00
John Wang
8f4de37a38 am 6ad68ba9: Adjust the mapping of LTE signal bars. 
* commit '6ad68ba9d99d48cc5c189dc7e32e577f56ce51fd':
  Adjust the mapping of LTE signal bars.
 2012-01-11 15:36:07 -08:00
John Wang
6ad68ba9d9 Adjust the mapping of LTE signal bars. 
bug:5640958
Change-Id: I91efc5a81b505aae59dac9b1d69314efaffda6b6
 2012-01-11 14:47:19 -08:00
Matthew Xie
f3171fb60c Set Bluetooth adapter to PowerOff mode when turnoff with airplane on 
Currently, when airplane mode was on and BT was on, turning BT off
moved BT to hotoff state. This fix moves BT all the way to Poweroff
state to have better power performance.
bug 5854282

Change-Id: I7ba41797a46a81ddb3a576453f2a8303b5eed525
 2012-01-11 14:46:13 -08:00
Chia-chi Yeh
50fe709995 VPN: silence VPN notifications. 
Bug: 5852859
Change-Id: I269d8de298a1fd69a8d777150ae97927537a5424
 2012-01-11 14:26:24 -08:00
Selim Gurun
6b284507aa am 51938e26: Merge "Do Not Merge. Move ssl callbacks to webcore thread." into ics-mr1 
* commit '51938e26913a98aa8de0292e9be8ea9d9ebc67c3':
  Do Not Merge. Move ssl callbacks to webcore thread.
 2012-01-11 14:20:45 -08:00
Selim Gurun
51938e2691 Merge "Do Not Merge. Move ssl callbacks to webcore thread." into ics-mr1 2012-01-11 14:18:14 -08:00
Daniel Sandler
5962fd5ec9 Clean up wifi/mobile indicators in the expanded panel. 
We now have two separate RSSI icons, one for wifi and one
for mobile data, as originally proposed in bug 5544770.
Each has an accompanying label showing the appropriate
network description string (PLMN or SSID or "No internet
connection"); these will be truncated as necessary to avoid
clobbering other UI elements in the panel.

Bug: 5543495
Bug: 5621224
Change-Id: I8fc322f8471fc94000e7230de359d3f1fe561b1e
 2012-01-11 16:57:51 -05:00
Jason Simmons
6e5d9dfc5f Merge "Add a getEndpointInfo accessor to AIDL-generated RPC proxy classes" into ics-aah 2012-01-11 12:51:52 -08:00
Mike Lockwood
a7cc8f6f49 Merge "Allow disabling network stats support in a resource overlay" into ics-aah 2012-01-11 11:24:11 -08:00
Eric Laurent
87ebdf6e01 am c15cf3d2: Merge "stagefright: limit audio gap for looped playback" into ics-mr1 
* commit 'c15cf3d286f3d63d141b73f639a5a61ddb028029':
  stagefright: limit audio gap for looped playback
 2012-01-11 11:12:55 -08:00
Eric Laurent
c15cf3d286 Merge "stagefright: limit audio gap for looped playback" into ics-mr1 2012-01-11 11:10:38 -08:00
Selim Gurun
972b1a505c Do Not Merge. Move ssl callbacks to webcore thread. 
Bug: 4586251

Cherry picking from master for ics-mr1.

Current ssl cert logic makes callbacks to webkit from the
UI thread. This is not right. Move the callbacks to proper thread.

Change-Id: I59affba47eca01b74e2bc33d88ef83a5850d6ce9
 2012-01-11 10:18:54 -08:00
Roman Nurik
41102347c5 am c894fb7e: Prevent Android Design sidenav links from opening a new window 
* commit 'c894fb7e15f46381fc783da1236b8bbb4a0e33d6':
  Prevent Android Design sidenav links from opening a new window
 2012-01-11 00:21:12 -08:00
Roman Nurik
c894fb7e15 Prevent Android Design sidenav links from opening a new window 
Change-Id: I0ec74fb7ae9e348717d0d96603cd03c58c03459d
 2012-01-10 23:59:20 -08:00
Scott Main
c8e80e2405 am acd152f0: docs: editorial fix to homepage 
* commit 'acd152f0b7f53c7f09986205b60feb3b6597f700':
  docs: editorial fix to homepage
 2012-01-10 21:13:05 -08:00
Scott Main
acd152f0b7 docs: editorial fix to homepage 
Change-Id: Iaebcacb6be770435091de181e8ee3f9c81d58139
 2012-01-10 21:10:08 -08:00
Jim Miller
28a0767751 Fix 5620754: don't show pattern screen after SIM PUK unlock 
This fixes a bug introduced in testing 34a62348. The code now
properly invokes the callbacks before returning.

Change-Id: I637a8a792838379f0c8b42ef634da82787fcd961
 2012-01-10 18:35:21 -08:00
Scott Main
eb84dbe918 am 05fc9f65: Merge "docs: add links to Android Design from dev docs" into ics-mr1 
* commit '05fc9f655aaa01cdb38229d1dc6155a341fa316b':
  docs: add links to Android Design from dev docs
 2012-01-10 17:10:20 -08:00
Scott Main
05fc9f655a Merge "docs: add links to Android Design from dev docs" into ics-mr1 2012-01-10 17:08:19 -08:00