Commit Graph

3273 Commits

Author SHA1 Message Date
Amith Yamasani
f1b02c8b1a am 904bc315: Merge "Fix NPE in Display Settings." into jb-dev
* commit '904bc3155f06a1b02ac8a5985ac781d8d6dee798':
  Fix NPE in Display Settings.
2012-05-15 11:31:25 -07:00
Eric Laurent
50fcedf776 am 10636840: Merge "Implement new volume display policy." into jb-dev
* commit '106368400d4798e14daf3c32100bc87c35a480b0':
  Implement new volume display policy.
2012-05-15 11:30:51 -07:00
Jeff Sharkey
caf15613c2 Enforce READ_EXTERNAL in Developer Options.
Move from Storage to Developer Options, and add interstitial dialog
with more details.

Bug: 6461446
Change-Id: I6d3d8fdc61a3e920ed58ab4d726949ac3c31feab
2012-05-14 20:53:11 -07:00
Amith Yamasani
77f75098cc am 97bbb533: Merge "Fix up-navigation for different levels of Settings screens." into jb-dev
* commit '97bbb5332414be257678476cf037e396c0b88c17':
  Fix up-navigation for different levels of Settings screens.
2012-05-14 19:33:32 -07:00
Dianne Hackborn
40b4243bd5 am e5050b1b: Merge "Implement issue #6477793: Add "restore" button to manage apps" into jb-dev
* commit 'e5050b1be72c5552bfc9c734d5a0e89f215bed62':
  Implement issue #6477793: Add "restore" button to manage apps
2012-05-14 19:32:40 -07:00
Amith Yamasani
904bc3155f Merge "Fix NPE in Display Settings." into jb-dev 2012-05-14 17:53:28 -07:00
Amith Yamasani
980a6c3c4b Fix NPE in Display Settings.
Handle occasional race in delivering change notifications.

Bug: 6012882
Change-Id: Ic9eff72920ff65a2c8ab85f4af59ba438cd8f99f
2012-05-14 17:46:23 -07:00
Eric Laurent
106368400d Merge "Implement new volume display policy." into jb-dev 2012-05-14 16:30:41 -07:00
Eric Laurent
9d078e984e Implement new volume display policy.
Whenever a stream type is muted, the progress bar in volume preference
is at 0.
If a stream is muted by ringer mode and does not control ringer mode,
the progress bar is disabled.

Change-Id: I29a5e459754f989369dc80504c18ce7ca08ed891
2012-05-14 14:06:23 -07:00
Amith Yamasani
3d384f4ca2 Fix up-navigation for different levels of Settings screens.
No up affordance for 2-pane screens since there's already
a fragment breadcrumb for navigating up.

Bug: 6452961

Change-Id: Iad9a5c2d0b68cc8f2aec7d5ed8e2ab14d023d48c
2012-05-14 11:57:10 -07:00
Dianne Hackborn
e5050b1be7 Merge "Implement issue #6477793: Add "restore" button to manage apps" into jb-dev 2012-05-13 15:25:14 -07:00
Dianne Hackborn
14d5714a82 Implement issue #6477793: Add "restore" button to manage apps
Added!

Change-Id: I1b4ffdd24a1c5878ae3acf3970f9364304eb5250
2012-05-13 15:19:57 -07:00
Jeff Brown
35e59cbed9 am cefc41fd: Merge "Update references to PowerManager constants that have moved." into jb-dev
* commit 'cefc41fd9705d3d3c5cbc47d1dd854a618bcf313':
  Update references to PowerManager constants that have moved.
2012-05-11 19:35:21 -07:00
Jeff Brown
cefc41fd97 Merge "Update references to PowerManager constants that have moved." into jb-dev 2012-05-11 19:33:09 -07:00
Jeff Brown
defcb0060d Update references to PowerManager constants that have moved.
Bug: 6435382
Change-Id: Ieea857644dc0cf758e0ff4fd595c6a0115457df0
2012-05-11 18:40:27 -07:00
Kenny Root
a1b0f80712 am 72a84b78: Merge "WiFi: only send engine setting when key_id is set" into jb-dev
* commit '72a84b78d08d41d6e76767744d03d928e0aa26e1':
  WiFi: only send engine setting when key_id is set
2012-05-11 15:52:08 -07:00
Kenny Root
72a84b78d0 Merge "WiFi: only send engine setting when key_id is set" into jb-dev 2012-05-11 15:49:31 -07:00
Kenny Root
4591cf8840 am 6a665664: Strip off phase2 prefix when setting spinner
* commit '6a6656641c58fd4396c011639dbc02a58636294f':
  Strip off phase2 prefix when setting spinner
2012-05-11 12:41:46 -07:00
Kenny Root
6a6656641c Strip off phase2 prefix when setting spinner
The writing and reading code for phase2 settings were asymmetric so the
phase2 spinner would always be set as "None". This change strips off the
prefix to set the spinner.

Bug: 6482316
Change-Id: Iaaa1088ec22625f1b8e3974c8a9610cccf0dda90
2012-05-11 12:18:55 -07:00
Kenny Root
f543a71e7a WiFi: only send engine setting when key_id is set
For EAP methods that don't need a key, don't set the engine settings or
else wpa_supplicant will have an error. Instead, look to see whether
key_id is set and use that to indicate when the engine should be
set.

Additionally, don't require keystore when key_id is not null but is
still an empty string.

Bug: 6480500
Change-Id: I137de47dfcbbd3da24d693701e249e15d7528228
2012-05-11 10:02:19 -07:00
satok
61dff255d0 am e508dc25: Fix the crash during opning the illegal settings of the spell checker
* commit 'e508dc25f2d3168f37fe5963fc99b0a034a3a298':
  Fix the crash during opning the illegal settings of the spell checker
2012-05-11 03:31:28 -07:00
satok
e508dc25f2 Fix the crash during opning the illegal settings of the spell checker
Bug: 5591245
Change-Id: I4ff61a59b0622c74b34bc50a00fc9773c04a6395
2012-05-11 18:52:02 +09:00
Amith Yamasani
0fe4812afa am ee10cecc: Merge "Use Spinner instead of Tabs, so that a 4th entry doesn\'t disappear off the screen." into jb-dev
* commit 'ee10ceccde8155016af557e96c9ac6a6e2bb477d':
  Use Spinner instead of Tabs, so that a 4th entry doesn't disappear off the screen.
2012-05-10 15:56:32 -07:00
Amith Yamasani
7a3221bb95 Use Spinner instead of Tabs, so that a 4th entry doesn't disappear off the screen.
This is for the 3 to 4 lists that you can switch between in the Settings->Apps
screen.

Bug: 6375122

Change-Id: I8a4e46b8aa3e06bc79edb5f65400462060fe5a29
2012-05-10 15:18:25 -07:00
Jean Chalard
8f266e9b5e am 7dabe458: Fix breadcrumbs for user dictionary settings on tablets.
* commit '7dabe4583c2bb12ed1d072139399f6bca8067994':
  Fix breadcrumbs for user dictionary settings on tablets.
2012-05-10 09:26:35 -07:00
Jean Chalard
faf14a817a am eed02dd2: Fix a bug with adding a word
* commit 'eed02dd2d51a876894f9f10023b1418ea6a45d8e':
  Fix a bug with adding a word
2012-05-10 09:26:32 -07:00
Jean Chalard
5d25f66865 am 27154387: Implement the "more locales" feature.
* commit '271543876d3ecccdb5547554778e91c9e7dd87ba':
  Implement the "more locales" feature.
2012-05-10 09:26:31 -07:00
Jean Chalard
68a852cf8f am eb995c79: Merge "Fix a bug with a duplicate entry" into jb-dev
* commit 'eb995c7939d6c471d41e606fd3d886ba72fc1851':
  Fix a bug with a duplicate entry
2012-05-10 09:26:28 -07:00
Jean Chalard
fe300b0ae5 am cfed94a6: Merge "Implement the delete button for user words" into jb-dev
* commit 'cfed94a65607fe9bb3387104c5368df31d73d04e':
  Implement the delete button for user words
2012-05-10 09:26:27 -07:00
Russell Brenner
08e36e1769 am 7ff82ad4: Merge "Include Add Network button for Setup Wizard" into jb-dev
* commit '7ff82ad4e06c8cf0339cc0bce0b54df9a2993a4f':
  Include Add Network button for Setup Wizard
2012-05-10 09:26:24 -07:00
Dianne Hackborn
71b9ef6132 am 622fc7aa: Remove auto-brightness adjustment setting.
* commit '622fc7aa5f1cf1a3840fb3777e731c6dc5f28d62':
  Remove auto-brightness adjustment setting.
2012-05-10 09:25:51 -07:00
Dianne Hackborn
10fba8a44a am 87ca7017: Tweak development settings to report system property changes.
* commit '87ca70172cc25ed2195d310b71d9c652a0757b88':
  Tweak development settings to report system property changes.
2012-05-10 09:24:09 -07:00
Jean Chalard
7dabe4583c Fix breadcrumbs for user dictionary settings on tablets.
Bug: 6026080
Change-Id: I1c0fa796c8f60e0c0f406e277d9e29fc09a44742
2012-05-10 18:56:09 +09:00
Jean Chalard
eed02dd2d5 Fix a bug with adding a word
It was possible to insert a word without a shortcut while the same
word used to be present with a shortcut. This change fixes that.

Bug: 6026080
Change-Id: I3be98bf450aad8e2eb38336e8f77aedab39d5797
2012-05-10 18:12:54 +09:00
Jean Chalard
271543876d Implement the "more locales" feature.
Bug: 6026080
Change-Id: I051a734321793e9130dc2cc77d4e7f670d2ce93d
2012-05-10 18:11:04 +09:00
Jean Chalard
eb995c7939 Merge "Fix a bug with a duplicate entry" into jb-dev 2012-05-10 00:29:21 -07:00
Jean Chalard
cfed94a656 Merge "Implement the delete button for user words" into jb-dev 2012-05-10 00:28:15 -07:00
Russell Brenner
7ff82ad4e0 Merge "Include Add Network button for Setup Wizard" into jb-dev 2012-05-09 22:53:59 -07:00
Russell Brenner
44a49ed67e Include Add Network button for Setup Wizard
To allow first-time users to set up on networks with hidden SSID,
include this button on the action bar. Temporarily using
placeholder text until artwork is available.

Bug: 6446220
Change-Id: I437ad3f37b42b93f7a0c6838cbb0c5090073e32d
2012-05-09 22:34:39 -07:00
Jean Chalard
f14002ca6b Fix a bug with a duplicate entry
When going to the "all languages" dictionary and opening an
entry, the "all languages" entry would be listed twice.

Change-Id: Ie8cd7e9e824e95c05899b956905af6590b8929bc
2012-05-10 13:28:27 +09:00
Jean Chalard
5bdde7f939 Implement the delete button for user words
Bug: 6026080
Change-Id: I43345874edb0a1b51dfcac9c99e74c345eeef7e6
2012-05-10 13:22:21 +09:00
Dianne Hackborn
622fc7aa5f Remove auto-brightness adjustment setting.
Not yet ready for release.

Change-Id: I4668e890080d63a29aeeeab4daad6a6466ae36af
2012-05-09 16:59:26 -07:00
Dianne Hackborn
87ca70172c Tweak development settings to report system property changes.
Uses the new IBinder hack to tell all registered system services
about the property change.  This should get most processes of
interest...  some of them many times over, even.

This implementation does the broadcast for every debug property
change, though currently the only ones handling it are the
trace and layout bounds debugging properties.

Change-Id: Ibe3a10a40184751b8b2ed00021a224182d8f3f30
2012-05-09 14:53:44 -07:00
Amith Yamasani
05acd274a1 am 48c72676: Merge "Apps tabs align to title on 2-pane settings." into jb-dev
* commit '48c72676b3717fc1f46c6e0ca9c4842ca6f588e1':
  Apps tabs align to title on 2-pane settings.
2012-05-09 13:32:43 -07:00
Amith Yamasani
48c72676b3 Merge "Apps tabs align to title on 2-pane settings." into jb-dev 2012-05-09 13:30:48 -07:00
Amith Yamasani
f0b05de3e0 Apps tabs align to title on 2-pane settings.
Pad the lists in Apps screen.
Pad the color bar to align with the list.

Bug: 6449489

Change-Id: I28c39e2aae04a1fe36c6b7dc447ae19da575edaf
2012-05-09 12:05:17 -07:00
Daisuke Miyakawa
76bd6bec98 am fc363380: Merge "Introduce new "vibrate when ringing"" into jb-dev
* commit 'fc363380c2637d1737c4fb2ed8baf78e2a3ae59d':
  Introduce new "vibrate when ringing"
2012-05-09 10:17:53 -07:00
Daisuke Miyakawa
fc363380c2 Merge "Introduce new "vibrate when ringing"" into jb-dev 2012-05-09 10:16:14 -07:00
Andrew Flynn
38f360a640 am decaba2c: Merge "Allow WiFi picker to exit after a valid connection is made" into jb-dev
* commit 'decaba2c674ec9c31283d9137654da35cfd13238':
  Allow WiFi picker to exit after a valid connection is made
2012-05-09 10:12:59 -07:00
Andrew Flynn
decaba2c67 Merge "Allow WiFi picker to exit after a valid connection is made" into jb-dev 2012-05-09 10:10:34 -07:00