Svetoslav Ganov
7c0a86efe0
am 6a09c07b
: Merge "Removing explore by touch from settings." into jb-dev
...
* commit '6a09c07b20e2a99a86882ecb8c30ee35f6c6f4ca':
Removing explore by touch from settings.
2012-05-18 14:21:39 -07:00
Michael Kolb
a63bda69d7
am 5dfc5053
: Merge "Add seperate activity for setup wizard wifi picker to adjust theme" into jb-dev
...
* commit '5dfc505301f70de24adf0724fb270ab3d5b5cd9b':
Add seperate activity for setup wizard wifi picker to adjust theme
2012-05-18 14:21:38 -07:00
Jeff Sharkey
409433e904
Merge "Avoid NPE until we understand better." into jb-dev
2012-05-18 14:05:25 -07:00
Jeff Sharkey
3da415f19b
Avoid NPE until we understand better.
...
Bug: 6450986
Change-Id: I68af8fedc419cd3142ba2bb7530b77aca7718123
2012-05-18 14:00:10 -07:00
Svetoslav Ganov
6a09c07b20
Merge "Removing explore by touch from settings." into jb-dev
2012-05-18 13:50:37 -07:00
Irfan Sheriff
db3d4bb8c4
Fix p2p settings crash
...
- Restore on orientation change
- Use appropriate string for dialog
Bug: 6456079
Bug: 6463563
Change-Id: I1fa0b90a14d09608b580ebf3d66b92fc8721eae7
2012-05-18 13:27:05 -07:00
Michael Kolb
5dfc505301
Merge "Add seperate activity for setup wizard wifi picker to adjust theme" into jb-dev
2012-05-18 13:23:43 -07:00
Svetoslav Ganov
ec94c78ec8
Removing explore by touch from settings.
...
1. Now accessibility services request this mode and
we show a dialog so the user can give a consent.
Accessibility servces can toggle this mode at
runtime from their settings, for example.
bug:5932640
Change-Id: Id4d3e9c83c488f97b7e53d4baadf7de886958a4d
2012-05-18 12:35:58 -07:00
Michael Kolb
b5f006bf97
Add seperate activity for setup wizard wifi picker to adjust theme
...
Bug: 6517721
Change-Id: I639122435161cd4816b82ab73f91ebbcd2df027e
2012-05-18 11:23:48 -07:00
The Android Automerger
a2e97e4bd6
merge in nakasi-factoryrom-release history after reset to jb-dev
2012-05-18 10:49:58 -07:00
Dianne Hackborn
d3bacbfa3e
am 7d2658ff
: Merge "Fix issues 6512411 and 6512951 in ManageApplications." into jb-dev
...
* commit '7d2658ffbf1b6bfcf51a28de5ea98293245f7ebe':
Fix issues 6512411 and 6512951 in ManageApplications.
2012-05-17 18:17:50 -07:00
Dianne Hackborn
7d2658ffbf
Merge "Fix issues 6512411 and 6512951 in ManageApplications." into jb-dev
2012-05-17 18:15:44 -07:00
Dianne Hackborn
a4af18755e
Fix issues 6512411 and 6512951 in ManageApplications.
...
6512411 java.lang.IndexOutOfBoundsException: Invalid index 0, size is 0
6512951 Settings crash while returning from App info screen
Also fix padding around the UI, and display of storage use.
Change-Id: Ibfcfe1a4a80f25f81ba2cabbb2e3d60aaa9ac04e
2012-05-17 18:15:28 -07:00
Jeff Brown
cb94584629
am 796e0a09
: Merge "Add support for grouping keyboard layouts by collection." into jb-dev
...
* commit '796e0a0960ae59d8406f62138f6259f4170e5b90':
Add support for grouping keyboard layouts by collection.
2012-05-17 17:17:13 -07:00
Jeff Brown
796e0a0960
Merge "Add support for grouping keyboard layouts by collection." into jb-dev
2012-05-17 16:33:46 -07:00
Jeff Brown
a350352e03
Add support for grouping keyboard layouts by collection.
...
Bug: 6405203
Change-Id: I458c4976562ecea2fa03d96258ff28ebbdc95294
2012-05-17 16:02:38 -07:00
Russell Brenner
8b0abe63c3
Wifi select screen redlines
...
Bug: 6458336
Use proportional layout when wifi settings is used
by setup wizard
Change-Id: I91f50df29b23b1bece9cbd65a1426f8bc8d7c7f7
2012-05-17 15:04:41 -07:00
Russell Brenner
737d5aa9cf
am 1c0a8f95
: Merge "Wifi select screen redlines" into jb-dev
...
* commit '1c0a8f953ba85bd21660a44dbbf891f313367196':
Wifi select screen redlines
2012-05-17 12:51:32 -07:00
Russell Brenner
1c0a8f953b
Merge "Wifi select screen redlines" into jb-dev
2012-05-17 12:49:15 -07:00
Daniel Sandler
527a669330
am 70b59998
: Refinements to notification controls in Settings.
...
* commit '70b599983967b68894a9c41df2279424f6ab3fef':
Refinements to notification controls in Settings.
2012-05-17 10:27:24 -07:00
Daniel Sandler
70b5999839
Refinements to notification controls in Settings.
...
- the switch is now a checkbox
- a dialog is posted to explain the ramifications of
disabling notifications
- the user may no longer disable notifications from system
apps (signed with the system cert); this is roughly the
same as the constraint on disabling packages (with the
exception that launchers may not be disabled entirely, but
their notifications may still be disabled).
Bug: 6493120 (checkbox)
Bug: 6448988 (confirmation dialog & protect system apps)
Change-Id: I6c7a47ba2eb943936d7f59cfc807a4390acc980d
2012-05-17 13:21:57 -04:00
The Android Automerger
123bd19ed0
merge in jb-release history after reset to jb-dev
2012-05-17 07:05:25 -07:00
Gilles Debunne
50e9b7c0f4
am 8cbfe403
: Merge "Show dots when entering PIN password in landscape" into jb-dev
...
* commit '8cbfe4036eeaf463c2a2ea7f5842cdd70b395228':
Show dots when entering PIN password in landscape
2012-05-16 21:50:49 -07:00
Gilles Debunne
8cbfe4036e
Merge "Show dots when entering PIN password in landscape" into jb-dev
2012-05-16 21:48:58 -07:00
Dianne Hackborn
c0c844d239
am a8e3ab89
: Merge "Rework manage applications to be page-able." into jb-dev
...
* commit 'a8e3ab89d625f620047c96d9fb066b42bf47c256':
Rework manage applications to be page-able.
2012-05-16 19:46:46 -07:00
Dianne Hackborn
a8e3ab89d6
Merge "Rework manage applications to be page-able." into jb-dev
2012-05-16 19:41:45 -07:00
Dianne Hackborn
309c5dcee1
Rework manage applications to be page-able.
...
Turn everything around so that we can have multiple list views
with their own adapters. Switch to using a ViewPager for managing
the different lists. Smile!
Change-Id: I9c102abb06cf67f313a8696507aa4597b38c7ab9
2012-05-16 19:31:07 -07:00
Eric Fischer
452367c51d
am 25095a3e
: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '25095a3e3a8a7f15d4a598d9a556467eba5329bc':
Import translations. DO NOT MERGE
2012-05-16 14:39:48 -07:00
Eric Fischer
25095a3e3a
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-05-16 14:36:39 -07:00
Irfan Sheriff
1b67785471
am 9822fdf9
: Merge "Use icons in wifi settings" into jb-dev
...
* commit '9822fdf988d5647b5c8aebb006326e7f48702420':
Use icons in wifi settings
2012-05-16 14:22:54 -07:00
Irfan Sheriff
9822fdf988
Merge "Use icons in wifi settings" into jb-dev
2012-05-16 14:18:43 -07:00
Amith Yamasani
4f1fdb5ef5
am 5d263ea4
: No more silent-mode tristate in Sound Settings.
...
* commit '5d263ea4896f87d736b21fb567d25cb44c212d3e':
No more silent-mode tristate in Sound Settings.
2012-05-16 14:16:55 -07:00
Irfan Sheriff
4837a691ce
Use icons in wifi settings
...
Bug: 6469022
Change-Id: I1bbd7681f3800db9387eb998da78cf0a42109600
2012-05-16 14:12:35 -07:00
Amith Yamasani
5d263ea489
No more silent-mode tristate in Sound Settings.
...
Delete delete delete.
Bug: 6036529
Change-Id: Ia1ec2a1740c3010ec4373bed18ce72bedcb9211b
2012-05-16 13:55:44 -07:00
Eric Fischer
d01b242270
Import translations. DO NOT MERGE
...
Change-Id: Ifb25ae1bd4c3964353afc8d275b304f775704753
2012-05-16 13:52:56 -07:00
Russell Brenner
fc86669031
Wifi select screen redlines
...
Bug: 6458336
Use proportional layout when wifi settings is used
by setup wizard
Change-Id: I91f50df29b23b1bece9cbd65a1426f8bc8d7c7f7
2012-05-16 11:11:15 -07:00
Daisuke Miyakawa
4bb710510a
am 1cbacf10
: Merge "Hide "Call ringtone & vibrate" when with no phone capability" into jb-dev
...
* commit '1cbacf10bd525c8f467b37abc57085b071abd6de':
Hide "Call ringtone & vibrate" when with no phone capability
2012-05-16 10:14:11 -07:00
Daisuke Miyakawa
1cbacf10bd
Merge "Hide "Call ringtone & vibrate" when with no phone capability" into jb-dev
2012-05-16 10:11:38 -07:00
Gilles Debunne
320735917c
Show dots when entering PIN password in landscape
...
Bug 6184359
The EditText was customized with a PasswordTransformationMethod,
which is not propagated to the ExtractedEditText.
Using the equivalent inputType instead.
Change-Id: I174bd73b2aab4786767c1046996ad3541216d87e
2012-05-16 18:42:00 +02:00
Daisuke Miyakawa
dba00b6097
Hide "Call ringtone & vibrate" when with no phone capability
...
Bug: 6502724
Change-Id: I61bb82bd6a974fb5242191c500f3f30c11d93655
2012-05-16 08:43:25 -07:00
The Android Open Source Project
ce84880b45
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: Id053dd82525fdf0244797e5c641aca8d122d8b4b
2012-05-16 08:41:06 -07:00
The Android Automerger
269278f6a4
merge in nakasi-factoryrom-release history after reset to jb-dev
2012-05-16 07:46:35 -07:00
The Android Automerger
c9bc4b5cd4
merge in jb-release history after reset to jb-dev
2012-05-16 07:05:26 -07:00
Russell Brenner
43002b6384
am e99006f7
: Merge "Add wps icon to wifi panel" into jb-dev
...
* commit 'e99006f75b2639dbe910a318516f13b13af47480':
Add wps icon to wifi panel
2012-05-15 20:34:12 -07:00
Eric Fischer
587cec3049
am f6c5c743
: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'f6c5c743a2164223db88e5c29c851d80fea16613':
Import translations. DO NOT MERGE
2012-05-15 20:29:58 -07:00
Russell Brenner
e99006f75b
Merge "Add wps icon to wifi panel" into jb-dev
2012-05-15 20:28:38 -07:00
Eric Fischer
f6c5c743a2
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-05-15 18:29:29 -07:00
Eric Fischer
5a6ecb42c8
Import translations. DO NOT MERGE
...
Change-Id: I97a3edb9a21d768a31e239ff882d802c00b137ec
2012-05-15 18:28:12 -07:00
Dianne Hackborn
3f03741746
am efb717bc
: Merge "Okay F* you, CHAR LIMIT." into jb-dev
...
* commit 'efb717bc2dcbaa00ed2d9bde5b9f9463d54262c6':
Okay F* you, CHAR LIMIT.
2012-05-15 17:42:19 -07:00
Dianne Hackborn
efb717bc2d
Merge "Okay F* you, CHAR LIMIT." into jb-dev
2012-05-15 17:36:55 -07:00