Dianne Hackborn
8ec5b83fc8
Merge commit '1dac277f' into manualmerge
...
Required rewriting the okay battery broadcast stuff.
Conflicts:
services/java/com/android/server/status/StatusBarPolicy.java
2009-07-01 21:19:35 -07:00
Dianne Hackborn
1dac277f93
Implement issue #1943927 (need notification in status bar when adb is active)
...
This is a little hacky -- we just assume that if adb is enabled and power
is connected through usb, then it is active.
The icons and text are temporary until final design is provided.
2009-06-30 13:40:51 -07:00
Dianne Hackborn
c13713519d
am 3d74bb4a: Add "why?" button to low battery dialog.
...
Merge commit '3d74bb4ab27ae9601f5c9c3706fad287845fb672'
* commit '3d74bb4ab27ae9601f5c9c3706fad287845fb672':
Add "why?" button to low battery dialog.
2009-06-19 11:49:27 -07:00
Dianne Hackborn
3d74bb4ab2
Add "why?" button to low battery dialog.
...
This takes the user to the power usage activity.
2009-06-19 11:46:58 -07:00
Android (Google) Code Review
8d3002e047
am 35feec46: Merge change 2761 into donut
...
Merge commit '35feec46d90d434a2439765d127a9e8f68a52340'
* commit '35feec46d90d434a2439765d127a9e8f68a52340':
TODO's from Teleca with modifications from wink.
2009-06-02 00:51:32 -07:00
Wink Saville
f315238a2b
TODO's from Teleca with modifications from wink.
2009-06-01 14:39:20 -07:00
Android (Google) Code Review
ad8195bb0e
am 2f11599e: Merge change 1579 into donut
...
Merge commit '2f11599eb317887a8cca14d8e66bfc485e5169e7'
* commit '2f11599eb317887a8cca14d8e66bfc485e5169e7':
Teleca 2b changes
2009-05-19 01:19:18 -07:00
Wink Saville
e9b06d754a
Teleca 2b changes
2009-05-18 21:47:50 -07:00
Mihai Preda
a82842f98d
Move ACTION_BATTERY_LOW logic to BatteryService (bug 1630733).
2009-05-07 11:59:10 +02:00
Wink Saville
04e71b3db8
AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.
...
Automated import of CL 144245
2009-04-02 11:00:54 -07:00
Wink Saville
767a662ecd
AI 144185: Integrate cdma into the main code base.
...
Automated import of CL 144185
2009-04-02 01:37:02 -07:00
Dianne Hackborn
4840e143df
Automated import from //branches/master/...@142348,142348
2009-03-24 22:40:29 -07:00
Dianne Hackborn
627bba736d
Automated import from //branches/donutburger/...@142347,142347
2009-03-24 22:32:56 -07:00
The Android Open Source Project
105925376f
auto import from //branches/cupcake_rel/...@140373
2009-03-18 17:39:46 -07:00
The Android Open Source Project
9066cfe988
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
The Android Open Source Project
d83a98f4ce
auto import from //depot/cupcake/@135843
2009-03-03 18:28:45 -08:00
The Android Open Source Project
076357b856
auto import from //depot/cupcake/@132589
2009-03-03 14:04:24 -08:00
The Android Open Source Project
3dec7d563a
auto import from //depot/cupcake/@137055
2009-03-02 22:54:33 -08:00
The Android Open Source Project
d24b8183b9
auto import from //branches/cupcake/...@130745
2009-02-10 15:44:00 -08:00
The Android Open Source Project
f013e1afd1
Code drop from //branches/cupcake/...@124589
2008-12-17 18:05:43 -08:00
The Android Open Source Project
54b6cfa9a9
Initial Contribution
2008-10-21 07:00:00 -07:00
