Commit Graph

3896 Commits

Author SHA1 Message Date
Irfan Sheriff
2a9cbb61b3 am f197105e: Merge "Fix wifi compareTo" into jb-mr1-dev
* commit 'f197105e3bd83a1f244cb690a1aa615624629961':
  Fix wifi compareTo
2012-12-13 11:30:41 -08:00
Irfan Sheriff
f197105e3b Merge "Fix wifi compareTo" into jb-mr1-dev 2012-12-13 11:28:48 -08:00
Irfan Sheriff
ebc57e3ae6 Fix wifi compareTo
Bug: 7521354
Change-Id: I8d77594dacb56f17126f0e33ff6e47379f615d40
2012-12-13 11:00:24 -08:00
Amith Yamasani
aeb57edaef Pass the locale code in the help url for help pages.
Otherwise the help will always be shown in English.

Bug: 7564049
Change-Id: I94da36aa1ae5aabd118178866b7e570bb77add34
2012-12-06 14:40:51 -08:00
Jake Hamby
bc5d9271a9 Add latest area info broadcast to Settings status screen.
When the SIM has a Brazilian country code, add an item to the
status screen to show the most recently received area info cell
broadcast, requested from CellBroadcastReceiver, which also
broadcasts any updates to the area info. To read the area info
broadcast or request it from CellBroadcastReceiver requires
READ_PHONE_STATE permission.

Bug: 7445881
Change-Id: I387e23ecd0802b212ecb3e44f900a3a7a4b27e76
2012-12-04 18:18:55 -08:00
Danielle Millett
495626818d Merge "Removing tutorial for choosing a pattern as part of b/7459863" into jb-mr1.1-dev 2012-11-30 18:26:58 -08:00
Jeff Sharkey
5e337eda4f Merge "Push scrollbars to screen edges." into jb-mr1.1-dev 2012-11-30 17:44:53 -08:00
Jeff Sharkey
b0f3f8dbea Merge "Fix incorrectly inverted text color." into jb-mr1.1-dev 2012-11-30 17:44:23 -08:00
Amith Yamasani
1cadd481bc Merge "Disable USB debugging checkbox and backup password for secondary users" into jb-mr1.1-dev 2012-11-30 16:42:05 -08:00
Jeff Sharkey
97d07fa3ae Push scrollbars to screen edges.
Push scrollbar to screen edges on custom ListView and ScrollViews to
match Preferences framework behavior.

Bug: 7633165
Change-Id: Ideecd0e243c7de7bf977caef2b1585e707a00ca4
2012-11-30 16:15:09 -08:00
Amith Yamasani
48d000ee2e Disable USB debugging checkbox and backup password for secondary users
This prevents secondary users from turning on adb debugging, even if they
find a way to launch developer options. Similarly, don't let them add or
change the adb backup password.

Bug: 7637920
Change-Id: I297f0c515a276ede6a7f12d2add72faec4eeb384
2012-11-30 14:20:04 -08:00
Jeff Sharkey
8f28cd5d75 Fix incorrectly inverted text color.
Bug: 7632947
Change-Id: I2eb8c4c24bda5b08215204330c30431bf6d0fc27
2012-11-30 12:32:58 -08:00
Daniel Sandler
77ec6de156 Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into jb-mr1.1-dev 2012-11-30 10:58:04 -08:00
Evan Charlton
6c269982f3 Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev 2012-11-30 10:15:25 -08:00
Jeff Sharkey
4166ec39ec Use uniform font size for APNs and timezones. DO NOT MERGE.
Also get rid of some orange highlight!

Bug: 7632945
Change-Id: I6a4b59f4eef81b128d128f5a429fb96f6366843a
2012-11-29 14:50:11 -08:00
Jeff Sharkey
c2b43dbee8 Avoid split action bar when it only has one item. DO NOT MERGE.
Bug: 7632944
Change-Id: I055564b4f8d2a3fc97346e13e1d8818196a8f988
2012-11-29 14:50:02 -08:00
Jake Hamby
0206284a66 Merge "Fix Bluetooth enable dialog to match Android style guide." into jb-mr1.1-dev 2012-11-29 14:14:10 -08:00
Dianne Hackborn
af60480107 Merge "Be quiet!" into jb-mr1.1-dev 2012-11-28 18:18:00 -08:00
Dianne Hackborn
79d42bb622 Be quiet!
Change-Id: Ifcce5bf4b2fca35fe50a2684983dc726534c3d0c
2012-11-28 18:05:00 -08:00
Adam Cohen
441588d221 Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
Change-Id: Ia1eb902618855e1a86a84c9090cdeefe5a404fd7
2012-11-28 16:37:49 -08:00
Daniel Sandler
7dee75c424 Add android.settings.DREAM_SETTINGS for Daydream settings.
Bug: 7480927
Change-Id: I5777f7c4aec9ad7d7eb9f7eeb882d2342cb481c3
2012-11-27 22:41:30 -05:00
Danielle Millett
12c1451f1f Removing tutorial for choosing a pattern as part of b/7459863
Removing the tutorial that is shown the first time a user sets up
a pattern as their lock type.

Change-Id: If73c936e41458af729740fe5b178b9452c7dd2c0
2012-11-21 15:44:16 -05:00
Jake Hamby
95c1003f1c Fix Bluetooth enable dialog to match Android style guide.
When an app requests to enable Bluetooth and/or Bluetooth discovery,
we show a dialog for user confirmation. Remove the dialog title,
update the message text and button labels to be more descriptive,
and use the standard dialog layout instead of a custom layout.

Also fixes the button layout on the Bluetooth permission test app so
that the "Discoverable" button doesn't wrap to two lines.

Bug: 6001468
Change-Id: I731e2f31b4c822395fc3f83584a092550d9ae7d3
2012-11-20 18:21:44 -08:00
Eric Laurent
15c27bb40b Merge "fix dock audio enable dialog" into jb-mr1.1-dev 2012-11-16 14:05:00 -08:00
Amith Yamasani
6097726522 Merge "Use AlarmManager calls to set date/time, instead of SystemClock.setTime" into jb-mr1.1-dev 2012-11-16 10:43:04 -08:00
Amith Yamasani
5f05010438 Use AlarmManager calls to set date/time, instead of SystemClock.setTime
This way secondary users' settings app can request the system server to
set the time. Alarm driver cannot be opened as a secondary user.

Bug: 7459635
Change-Id: I1ae1630dc448021d35280a297c5d9960f8e8fc2e
2012-11-15 14:44:41 -08:00
Vikram Aggarwal
f15f9d6765 Merge "Remove back button entirely when disabled" into jb-mr1.1-dev 2012-11-15 12:53:25 -08:00
Amith Yamasani
940f6f0c46 Merge "Fix a race condition when switching between settings panels" into jb-mr1.1-dev 2012-11-15 12:21:31 -08:00
Jeff Sharkey
f707491cfb Internationalize bytes and percentages.
Bug: 7545890
Change-Id: I634fafe9d61a2ebbf7a0cc56d8255457ee9fe1b2
2012-11-14 16:56:11 -08:00
Amith Yamasani
5cdc937251 Fix a race condition when switching between settings panels
The fragment was removed while the images were being loaded, so the
activity was null. This fix holds on to the Resources object.

Bug: 7490425
Change-Id: Ic2d8dd3c620fc34ce8255104001e17b39f828601
2012-11-14 16:23:40 -08:00
Eric Laurent
9f4afb0762 fix dock audio enable dialog
The dock audio enable setting is not saved if the user
dismisses the dialog without checking or unchecking the check box.
The dialog is then displayed each time the device is docked until the
user checks/unchecks the dialog or goes to sound settings to enable
or disable dock audio.

Bug 7518165.

Change-Id: Ifbc6179e78b64b5b7577ac750acf9846525e47c5
2012-11-12 14:29:17 -08:00
Vikram Aggarwal
bf459dafdc Remove back button entirely when disabled
Bug: 7480506 Encryption screen shows back button
Change-Id: Iba2706fd6b61303178b472071f32d65bdf72e50d
2012-11-09 14:40:22 -08:00
Evan Charlton
673130bbf8 Use plurals for the developer steps countdown
When counting down how many steps are left before the user becomes a
developer, use plurals so that "steps" becomes "step" correctly.

Change-Id: I5dbe2c229c9e6ed0c45aaae8c303b23efc76f75d
2012-11-07 16:18:17 -08:00
Michael Jurka
a108d9fc0e Final tweaks to visuals of widget picker 2012-11-07 15:32:23 -08:00
Michael Jurka
f5336fd114 Allowing rotation while adding lockscreen widgets
Also cleaning up some unused code

Bug: 7468012
2012-11-07 01:12:04 -08:00
Michael Jurka
a487bca470 Updated layouts for keyguard widget picker
Bug: 7381803

Change-Id: I9a6a8fe3216002b486e7b6ddf7544d9fc4e73de8
2012-11-07 00:00:11 -08:00
Michael Jurka
5c5eff45e9 Pass argument to lock screen to show widget
after adding it
2012-11-06 16:22:04 -08:00
Michael Jurka
4119788b1b Add widget previews to the key guard widget picker
Bug: 7381803

Change-Id: I86946b7d0d75f8a1f89120600be2513bdf9026f0
2012-11-06 15:14:03 -08:00
Michael Jurka
ab3472f594 Supporting EXTRA_APPWIDGET_OPTIONS correctly 2012-11-05 18:56:14 -08:00
Jim Miller
fd34f98960 Merge "Disable the "none" security selection in settings when there's only 1 user" into jb-mr1-lockscreen-dev 2012-11-04 18:28:35 -08:00
Jim Miller
783ea85bec Disable the "none" security selection in settings when there's only 1 user
Fixes bug 7454567

Change-Id: Ifffa1403af8d45bc3c7da1f459b87f0a2c064b80
2012-11-02 13:19:32 -07:00
Dianne Hackborn
4de4061c8b Fix issue #7448596: Can't uninstall app that was installed by another user
Change-Id: I6614346f8da80ffedd71645ee2920cf85b92c87c
2012-10-31 18:12:03 -07:00
Michael Jurka
0b2bd8d11d New widget picker for keyguard widgets
New layout for widget picker is still not up to
final design, but this change prepares all the
backend work

Also, remove use of features filter from the
picker, since this is being removed from the API

Change-Id: I9b332e22cf34b98c20c720602c920d28aed01d6c
2012-10-31 16:46:24 -07:00
Eric Laurent
f892bc856c display audio dialog when connecting low end dock
Display a dialog to enable the use of the dock audio connection
when a low end dock is connected for the first time.

Modify DockService to process docked and undocked messages even if
the device indicated is null (meaning the dock is not a bluetooth dock)
only for low end docks.

Bug 7302106.

Change-Id: I331d83a74fecf5f26b24bfc178342df414bd8153
2012-10-30 10:41:46 -07:00
Jeff Sharkey
c2c9d5bde1 Merge "Selectively enable bugreport in power menu." into jb-mr1-dev 2012-10-29 16:35:08 -07:00
Jeff Sharkey
2817c46c04 Selectively enable bugreport in power menu.
The underlying bugreport init service depends on USB debugging being
turned on for user builds.  This change makes the developer options
UI reflect this constraint.

Bug: 7427434
Change-Id: I8dc16cc53ec4a97a3b39ee631694456be3bde081
2012-10-29 14:57:41 -07:00
Vikram Aggarwal
8d028a87e9 Allow wireless charging during encrypt
Bug: 7426476 Cant Encrypt mako device using Charging pad as charging
             source

Change-Id: I6584a9e7a1533e06f0b0d55c1afd42641ee7ac3d
2012-10-29 12:42:55 -07:00
Eric Laurent
79b7fdd2c0 Merge "added dock audio settings for non bluetooth docks" into jb-mr1-dev 2012-10-27 14:43:39 -07:00
Eric Laurent
e00cd9ff60 added dock audio settings for non bluetooth docks
This is a quick implementation allowing support for non bluetooth
audio docks.

Longer term it would be better to generalize DockService to support
all kinds of docks.

Bug 7302106.

Change-Id: I2df31ddbd8057a7297b244ea6a9e2d5a6a39bf7f
2012-10-27 13:30:55 -07:00
Michael Jurka
8a4024ecac Add ability to add clock widget to keyguard
Change-Id: I70e6fbb664181efc2906ed33d732695279462a95
2012-10-25 16:05:10 -07:00