Commit Graph

4524 Commits

Author SHA1 Message Date
Jeff Sharkey
b9dd8e10ee Merge "Fix animation bugs, stop disabled sweep touches." 2011-06-24 23:13:13 -07:00
Jeff Sharkey
2af35fb44d Fix animation bugs, stop disabled sweep touches.
Change sweep drawables to crossfade correctly between states, and
work around 4946591 by nesting container one level deeper.  Also wait
until first layout pass is finished before applying LayoutTransition.

Prevent touches from reaching sweeps when chart is disabled.  Also
bring back log scale for data.

Change-Id: I2194714ab075fd32525681119f30427c1b96fc50
2011-06-24 23:11:51 -07:00
Gilles Debunne
362bd107a1 Minor changes in Settings
Battery moved to main menu.

Change-Id: I0db89c197a1256aaac35ceb95bfa4a567ea6613f
2011-06-24 16:20:35 -07:00
David Brown
8373b45169 Add "emergency call" button to CryptKeeper
This allows you to make an emergency call without needing to decrypt
your device first.

The exact appearance of the button, and the two possible icons shown to
the left of the text, are taken directly from the corresponding
framework resources (see keyguard_screen_*.xml, ic_emergency.png, and
stat_sys_phone_call.png.)

Also, the code in CryptKeeper.java for updating the state of, and
handling clicks from, the "Emergency call" button is mostly duplicated
from the corresponding code in LockPatternUtils and
LockPatternKeyguardView under frameworks/base.

Bug: 4494186
Change-Id: I36a713fdbc3281a7ba46762d47d5b61fb3cd194d
2011-06-24 16:18:30 -07:00
Dianne Hackborn
c9a477aeac am e3cfa9bc: am 13bac39d: Remove obsolete compat mode UI.
* commit 'e3cfa9bc557e92d7a1b01270a405a9bd99700310':
  Remove obsolete compat mode UI.
2011-06-24 12:41:05 -07:00
Dianne Hackborn
e3cfa9bc55 am 13bac39d: Remove obsolete compat mode UI.
* commit '13bac39d2120a82b8a22b52f0db0727aa04b1f38':
  Remove obsolete compat mode UI.
2011-06-24 12:24:21 -07:00
Jason parks
4548cdf3a9 Check to see if the power source is a valid charger.
This will allow for devices that can be powered
over USB to be encrypted while plugged into USB.

Bug: 4901080
Change-Id: I7eaa2146c1c4e4dfc9724b11a08ff13a16eda117
2011-06-24 14:06:03 -05:00
Dianne Hackborn
127757637b Merge "Add "large text" accessibility option." 2011-06-24 10:47:47 -07:00
The Android Open Source Project
b60a316279 Reconcile with gingerbread-release
Change-Id: I5c53acce972848ec4adb67782e9e741b3555654b
2011-06-24 08:08:51 -07:00
Jeff Sharkey
f54f435f1f More data usage chart iteration, app details.
Moved app details back into single Fragment to support animations and
template tabs.  Show the network in background behind app details
chart series to match designs.

Clamping sweeps at axis boundaries.

Bug: 4813014, 4598460, 4818029
Change-Id: I72c0b21ee1d595e4da31d293ae0dab9e801041f3
2011-06-23 22:30:05 -07:00
Jeff Sharkey
255e71eb53 Resize data usage assets.
Change-Id: If133332b9fd25698fcd94a67bc357052ca19e3c3
2011-06-23 17:42:41 -07:00
Dianne Hackborn
13bac39d21 Remove obsolete compat mode UI.
Change-Id: Ie16f70af4b8d6f33db21363a478049659669e0b3
2011-06-23 17:04:06 -07:00
Dianne Hackborn
00453157ae Add "large text" accessibility option.
Also re-arrange the UI a bit to clearly put the button for
enabling/disabiling accessibility services along-side said
services.

Change-Id: Ica1ddecddf6e97800909ba6bea9ce4e124b59c01
2011-06-23 16:36:43 -07:00
Justin Ho
1ad08445d3 Merge "Turn off hardware acceleration to avoid crashes due to driver." 2011-06-23 15:27:10 -07:00
Amith Yamasani
ac48d0281f Turn off hardware acceleration to avoid crashes due to driver.
TODO: Turn this back on when driver bug is fixed.

Bug: 4883047
Change-Id: I8efb6d77035595650fff8acb8ddbd95a93fc711c
2011-06-23 15:24:06 -07:00
Gilles Debunne
2c12ed9e4b Merge "Refactoring in Settings/Applications" 2011-06-23 12:57:17 -07:00
Gilles Debunne
f52f509446 Merge "Bug 4879032: NPE fix when restarting Settings." 2011-06-23 10:47:15 -07:00
Jaikumar Ganesh
062b54834f am 45679d94: (-s ours) am 38ae9125: (-s ours) am 7ab66973: Merge "DO NOT MERGE Show user dialog for BT." into gingerbread
* commit '45679d942fa47b947b4ce7b45b82998b2972928d':
  DO NOT MERGE Show user dialog for BT.
2011-06-23 07:48:24 -07:00
Jaikumar Ganesh
e3c8d3e88e am 47504c7b: am a7bb204a: am c6f14410: Merge "Remove CHAR LIMIT from string to fix build." into gingerbread
* commit '47504c7b93823a7e5a0e0b4d9b0ca8f5093f79f9':
  Remove CHAR LIMIT from string to fix build.
2011-06-23 07:40:38 -07:00
Jeff Sharkey
52c3f4461b Iterate on data usage chart UI.
Switched to inflating chart views from XML, using attributes for
configuration.  Start using drawable assets for chart components
instead of manually painting.  Include hand-cut assets, and animate
between states when touched to invoke.

Clamp sweeps to valid chart ranges and prepare for sweep labels.

Bug: 4768483, 4598460
Change-Id: Ic660c35bec826eb5e3f6a1dde3cc04d8c437ef2b
2011-06-23 00:39:47 -07:00
Adam Powell
aef3981e86 Merge "Fix build." 2011-06-22 21:11:01 -07:00
Adam Powell
382b8be088 Fix build.
Change-Id: I766022f4b4224253bd6bc54427b8b2dd482685e1
2011-06-22 21:09:31 -07:00
Kenny Root
811d5c154e Merge "Change dummy calendar setting during locale change" 2011-06-22 20:55:58 -07:00
Jaikumar Ganesh
50edbbbc09 am 87c04ba6: am f3670df2: am 2c85966d: Merge "New strings for Bluetooth" into gingerbread
* commit '87c04ba668ed856ec61326e90c1fade980d4e893':
  New strings for Bluetooth
2011-06-22 20:31:14 -07:00
Gilles Debunne
b396c9b8c0 Bug 4879032: NPE fix when restarting Settings.
Change-Id: I65b9fb220bf51357c02555902cdb263df7db1016
2011-06-22 17:24:18 -07:00
Gilles Debunne
2c88a877f8 Refactoring in Settings/Applications
Battery, Development moved to main menu.
Unknown sources moved to Security.
Main menu links directly to ManageApplications.
ApplicationSettings was kept in case an other app referenced it.

Change-Id: I0271d4222cfc192f9235f21e06bf3b56f77db1a4
2011-06-22 11:20:48 -07:00
satok
f61d5570ee Merge "Add an activity to show an ime switch dialog" 2011-06-21 23:09:39 -07:00
Gilles Debunne
0eb603d099 Merge "Split Location and Security settings." 2011-06-21 16:53:51 -07:00
Gilles Debunne
a6a8a1479b Split Location and Security settings.
Needs final icon for location.

Change-Id: I8d826203c4d0ca4ae768f59ecdeae2700bad7c86
2011-06-21 16:53:00 -07:00
Gilles Debunne
2454f49c93 Fixed Bluetooth availability test in Settings
Added similar test for WiFi to be consistent.

Added null tests in BluetoothEnabler.

Change-Id: Ia6e7b150a1bc060c7ce0b4db12ab3f6c958af104
2011-06-21 16:37:26 -07:00
Jaikumar Ganesh
45679d942f am 38ae9125: (-s ours) am 7ab66973: Merge "DO NOT MERGE Show user dialog for BT." into gingerbread
* commit '38ae9125b4535d44b608359f3345fd75d99cc7a5':
  DO NOT MERGE Show user dialog for BT.
2011-06-21 14:08:20 -07:00
Jaikumar Ganesh
38ae9125b4 am 7ab66973: Merge "DO NOT MERGE Show user dialog for BT." into gingerbread
* commit '7ab66973a973b9d23c411bf1c6631fa93c4903bf':
  DO NOT MERGE Show user dialog for BT.
2011-06-21 13:24:22 -07:00
Jaikumar Ganesh
7ab66973a9 Merge "DO NOT MERGE Show user dialog for BT." into gingerbread 2011-06-21 11:23:47 -07:00
Gilles Debunne
e78c187905 Settings refactoring
Wifi and bluetooth pane refactored, main toggles moved to left pane.

Change-Id: I42ea4cf3bdf24158f3c67e0dea311258206cd78a
2011-06-21 11:05:29 -07:00
Narayan Kamath
222a619668 Use the new settings API.
Check for a meta-data element instead of a hardcoded
settings class.

Change-Id: Ife67ea64ad1f4ee36749c0b6f8c96d5a22d5b6e2
2011-06-21 13:43:40 +01:00
Jaikumar Ganesh
7bfa6dca07 DO NOT MERGE Show user dialog for BT.
Show user dialog for incoming BT connection
requests from unknown devices.

Contribution by: Wei (Matthew) Xie

Change-Id: I7e9e8bbbd8808a7569f84d213fa3d716f7f5bc80
2011-06-20 19:30:21 -07:00
Jeff Sharkey
a610199ef7 Merge "Detect radios in data usage, control them." 2011-06-20 17:24:23 -07:00
Jeff Sharkey
29d56b303f Detect radios in data usage, control them.
Teach data usage to inspect hardware radios to determine which tabs
and options to display.  Control "Mobile data enabled" state through
ConnectivityManager.  Persist "Show Wi-Fi" state.

Bug: 4599714, 4645276, 4620024, 4599271, 4596812
Change-Id: I4479593d74a8ba744a056767422f1e03182a7a94
2011-06-20 17:23:43 -07:00
Jaikumar Ganesh
47504c7b93 am a7bb204a: am c6f14410: Merge "Remove CHAR LIMIT from string to fix build." into gingerbread
* commit 'a7bb204a1a4a46c853c3590027ad5bffb294f738':
  Remove CHAR LIMIT from string to fix build.
2011-06-20 16:35:45 -07:00
Jaikumar Ganesh
a7bb204a1a am c6f14410: Merge "Remove CHAR LIMIT from string to fix build." into gingerbread
* commit 'c6f144106c627b28d90d33c54564c70890bc2f42':
  Remove CHAR LIMIT from string to fix build.
2011-06-20 16:28:09 -07:00
Jaikumar Ganesh
c6f144106c Merge "Remove CHAR LIMIT from string to fix build." into gingerbread 2011-06-20 16:19:35 -07:00
Jaikumar Ganesh
a5ff907328 Remove CHAR LIMIT from string to fix build.
Change-Id: I590126db92329efcc6aea95bb97bb9d053905276
2011-06-20 16:14:11 -07:00
Jaikumar Ganesh
87c04ba668 am f3670df2: am 2c85966d: Merge "New strings for Bluetooth" into gingerbread
* commit 'f3670df2ca8e521179907978c7009cba791df7c4':
  New strings for Bluetooth
2011-06-20 15:58:25 -07:00
Jaikumar Ganesh
f3670df2ca am 2c85966d: Merge "New strings for Bluetooth" into gingerbread
* commit '2c85966dd881917b426eefd9643adedf6b0d4ffc':
  New strings for Bluetooth
2011-06-20 15:54:16 -07:00
Jaikumar Ganesh
2c85966dd8 Merge "New strings for Bluetooth" into gingerbread 2011-06-20 15:29:43 -07:00
Jaikumar Ganesh
0f44329c74 New strings for Bluetooth
This is for the user dialog for incoming BT requests.

Change-Id: Ifa8f8e9e00861c65cf1d2f0520d072935b845785
2011-06-20 15:10:53 -07:00
Eric Fischer
a1307695c1 Import revised translations.
Change-Id: Ib916cb8bb0b6f45452300b50b5ac138f89a89c29
2011-06-20 14:54:12 -07:00
satok
fb0fd42fa0 Add an activity to show an ime switch dialog
Bug: 4671417

Change-Id: I8e29dbfb3d0bbb9270888ac757f53542ce658ba9
2011-06-20 21:39:06 +09:00
Jeff Sharkey
827fde31e8 Match NetworkStatsService refactoring.
Change-Id: Ia5c7fa6e60dd1915939437c859af696fb01498bc
2011-06-19 21:59:01 -07:00
Jeff Sharkey
a662e4975b NetworkTemplate refactoring for data stats.
To match framework changes.

Change-Id: I0f648ae5753149f9774c8096540834451ba41279
2011-06-18 22:22:29 -07:00