Vikram Aggarwal
1125b775ff
am bccd90e6
: am ff78bf72
: Merge "Show keyboard selectively, do not listen on MCC/MNC changes, show text to user." into jb-dev
...
* commit 'bccd90e6baf0af157af2c5149517681475341b5d':
Show keyboard selectively, do not listen on MCC/MNC changes, show text to user.
2012-05-22 14:55:27 -07:00
Vikram Aggarwal
bccd90e6ba
am ff78bf72
: Merge "Show keyboard selectively, do not listen on MCC/MNC changes, show text to user." into jb-dev
...
* commit 'ff78bf7280b2f435bf09e0df0f252506b1c6af61':
Show keyboard selectively, do not listen on MCC/MNC changes, show text to user.
2012-05-22 14:52:40 -07:00
Vikram Aggarwal
ff78bf7280
Merge "Show keyboard selectively, do not listen on MCC/MNC changes, show text to user." into jb-dev
2012-05-22 14:50:48 -07:00
Vikram Aggarwal
f576dd6c9f
Show keyboard selectively, do not listen on MCC/MNC changes, show text to user.
...
Fix b/6531158 (Stop showing the keyboard)
Fix b/6532201 (Stop removing the text view, and prompt the user with a message)
Fix b/6155075 (Stop listening to MCC/MNC changes)
Change-Id: Ibf8414fe57bdd0acf6c20f3194c52b168b9292c6
2012-05-22 14:37:19 -07:00
The Android Open Source Project
abd711b15e
am 0d23458e
: Reconcile with jb-release
...
* commit '0d23458e0ef45fe44f4ffe8e98044dc7d9189374':
2012-05-22 14:21:33 -07:00
Andrew Flynn
f85b241208
am f89dc7c9
: am be4a0325
: Merge "Update WPS Dialog" into jb-dev
...
* commit 'f89dc7c93a413cd52e1a2f2fe6c56d64de55522c':
Update WPS Dialog
2012-05-22 14:21:33 -07:00
Andrew Flynn
222a093649
resolved conflicts for merge of f89dc7c9
to master
...
Change-Id: Icd37261dd3ce920b3bed359ed5232bdc018916fc
2012-05-22 14:15:20 -07:00
The Android Automerger
17ac889164
merge in nakasi-factoryrom-release history after reset to jb-dev
2012-05-22 13:25:42 -07:00
The Android Open Source Project
0d23458e0e
Reconcile with jb-release
...
Change-Id: Iceaefeeee355a1ceb5c38751649e375f5c52bd7c
2012-05-22 13:06:55 -07:00
Andrew Flynn
f89dc7c93a
am be4a0325
: Merge "Update WPS Dialog" into jb-dev
...
* commit 'be4a032581ae6dfb41662486085e64052d085314':
Update WPS Dialog
2012-05-22 11:41:21 -07:00
Andrew Flynn
be4a032581
Merge "Update WPS Dialog" into jb-dev
2012-05-22 11:39:30 -07:00
Andrew Flynn
2e39ebfeaf
Update WPS Dialog
...
- Remove title
- Change description text
- Add WPS icon
Bug: 6457246
Change-Id: Icd37261dd3ce920b3bed359ed5232bdc018916fc
2012-05-22 11:22:02 -07:00
Andrew Flynn
2be0928f66
am 33089ad7
: am 115ae0cf
: Change wifi-on-but-no-networks string
...
* commit '33089ad70509d63fa51b3aff4ae88813d027d882':
Change wifi-on-but-no-networks string
2012-05-22 11:08:35 -07:00
Andrew Flynn
33089ad705
am 115ae0cf
: Change wifi-on-but-no-networks string
...
* commit '115ae0cf0119c07fa8e255df6acf8077282854c6':
Change wifi-on-but-no-networks string
2012-05-22 11:05:54 -07:00
Andrew Flynn
115ae0cf01
Change wifi-on-but-no-networks string
...
Bug: 6533206
Change-Id: I4f5c1d77ffe1bf93c33c9b65f9fdc7278864f88f
2012-05-22 10:08:56 -07:00
Jean-Baptiste Queru
f2a98d1620
am 75a60fc0
: am 1a47dff3
: Merge "Remove title bar background drawable from running app detail view"
...
* commit '75a60fc042273920350092840b4e4851186246ac':
Remove title bar background drawable from running app detail view
2012-05-22 08:54:52 -07:00
Jean-Baptiste Queru
75a60fc042
am 1a47dff3
: Merge "Remove title bar background drawable from running app detail view"
...
* commit '1a47dff3ceeb45a97d08f58f19bfcf7becf145d4':
Remove title bar background drawable from running app detail view
2012-05-22 08:52:27 -07:00
Jean-Baptiste Queru
1a47dff3ce
Merge "Remove title bar background drawable from running app detail view"
2012-05-22 07:48:41 -07:00
The Android Automerger
e8624ef92c
merge in jb-release history after reset to jb-dev
2012-05-22 07:07:04 -07:00
John Spurlock
523d5a6e04
Settings: "Rotation lock" retains existing orientation.
...
Enabling "Rotation lock" when in landscape will stay in landscape
instead of forcing to portrait.
Bug: 6481542
Change-Id: Ide6171437a207f97a8fc3123ad8b2fe27323336f
2012-05-22 09:51:02 -04:00
alanv
a6a3f8c892
am 8fdb0008
: am 0aa7c4f1
: Fixed all Accessibility lint warnings in Settings app.
...
* commit '8fdb00085ce79672ed154389b7a4e05bf955f3ee':
Fixed all Accessibility lint warnings in Settings app.
2012-05-21 18:31:47 -07:00
alanv
8fdb00085c
am 0aa7c4f1
: Fixed all Accessibility lint warnings in Settings app.
...
* commit '0aa7c4f14169c95d203ed996ff6eed3981818c6c':
Fixed all Accessibility lint warnings in Settings app.
2012-05-21 18:29:40 -07:00
alanv
0aa7c4f141
Fixed all Accessibility lint warnings in Settings app.
...
Change-Id: Ida98444f8942d3618d84c0a6f78cc3653ea4ad24
2012-05-21 17:55:19 -07:00
Adam Powell
6fcf504073
am f2cf6d65
: am 0901a3c2
: Merge "Update the All Apps PagerTabStrip text appearance." into jb-dev
...
* commit 'f2cf6d6508b123b53006d97f8add167b30007662':
Update the All Apps PagerTabStrip text appearance.
2012-05-21 16:07:15 -07:00
Adam Powell
f2cf6d6508
am 0901a3c2
: Merge "Update the All Apps PagerTabStrip text appearance." into jb-dev
...
* commit '0901a3c2132cb439fbab64d13cbe9ede0e5e5379':
Update the All Apps PagerTabStrip text appearance.
2012-05-21 16:04:06 -07:00
Adam Powell
0901a3c213
Merge "Update the All Apps PagerTabStrip text appearance." into jb-dev
2012-05-21 16:02:04 -07:00
Svetoslav Ganov
1b47f982c3
am fb59d66a
: am 8d43aeae
: Merge "Updating the checkbox state to match the title." into jb-dev
...
* commit 'fb59d66a4ea44a656f77ee61a9275f50e87069c0':
Updating the checkbox state to match the title.
2012-05-21 14:32:57 -07:00
Jean-Baptiste Queru
fad55d5da7
am ad7f7cc5
: am c0653a12
: Merge "Expandable NumberPicker width in bytesPicker dialog"
...
* commit 'ad7f7cc547630b323a1cec70439590e51243d2c7':
Expandable NumberPicker width in bytesPicker dialog
2012-05-21 14:32:13 -07:00
Jeff Brown
b737037aca
am 0ee87ab2
: am 766b2861
: Add UI to select multiple keyboard layouts.
...
* commit '0ee87ab22a04a6a3b40b9d9e09b5de30bbd9f92c':
Add UI to select multiple keyboard layouts.
2012-05-21 14:29:24 -07:00
The Android Open Source Project
a5f26c7b2e
am deb87467
: Reconcile with jb-release nakasi-factoryrom-release
...
* commit 'deb874679b2042174325d89cc78434f6a9286add':
Avoid NPE until we understand better.
Add seperate activity for setup wizard wifi picker to adjust theme
Fix issues 6512411 and 6512951 in ManageApplications.
Wifi select screen redlines
2012-05-21 14:29:07 -07:00
Adam Powell
fc82c8257b
Update the All Apps PagerTabStrip text appearance.
...
Change-Id: I5f6b924d0a291b0723b76ee024bc87cb69d61893
2012-05-21 14:18:49 -07:00
Svetoslav Ganov
fb59d66a4e
am 8d43aeae
: Merge "Updating the checkbox state to match the title." into jb-dev
...
* commit '8d43aeae0347435a03e4007eef5fce578ec50184':
Updating the checkbox state to match the title.
2012-05-21 14:12:43 -07:00
Svetoslav Ganov
84f56ca6ba
am c19be29c
: am fc16237d
: Merge "Removed Accessibility tutorial and orphaned resources." into jb-dev
...
* commit 'c19be29cd7550411c83764b67e22e18065794342':
Removed Accessibility tutorial and orphaned resources.
2012-05-21 14:11:33 -07:00
Irfan Sheriff
172b6fe253
am 41f88da8
: am ee7589c0
: Merge "Fix p2p settings crash" into jb-dev
...
* commit '41f88da823f59c7d37076b7dd6d883498b8f6997':
Fix p2p settings crash
2012-05-21 14:11:30 -07:00
Svetoslav Ganov
8d43aeae03
Merge "Updating the checkbox state to match the title." into jb-dev
2012-05-21 14:09:27 -07:00
Jeff Sharkey
4ca0945cf8
am 71f79983
: am 409433e9
: Merge "Avoid NPE until we understand better." into jb-dev
...
* commit '71f7998304a560c8ba413e5bea1a16b7ba550027':
Avoid NPE until we understand better.
2012-05-21 12:45:08 -07:00
Svetoslav Ganov
8bd499d3f4
am 7c0a86ef
: am 6a09c07b
: Merge "Removing explore by touch from settings." into jb-dev
...
* commit '7c0a86efe0e73671ab93d069afbda52cd0d957e8':
Removing explore by touch from settings.
2012-05-21 12:45:08 -07:00
Michael Kolb
c98f9b1bf2
am a63bda69
: am 5dfc5053
: Merge "Add seperate activity for setup wizard wifi picker to adjust theme" into jb-dev
...
* commit 'a63bda69d72a3a07f058e89870e6892fb880fa5d':
Add seperate activity for setup wizard wifi picker to adjust theme
2012-05-21 12:45:07 -07:00
Dianne Hackborn
8900ab0fde
am d3bacbfa
: am 7d2658ff
: Merge "Fix issues 6512411 and 6512951 in ManageApplications." into jb-dev
...
* commit 'd3bacbfa3e925f33d1830c49a62c989d26035e94':
Fix issues 6512411 and 6512951 in ManageApplications.
2012-05-21 12:43:32 -07:00
Jeff Brown
03ab90a405
am cb945846
: am 796e0a09
: Merge "Add support for grouping keyboard layouts by collection." into jb-dev
...
* commit 'cb94584629f6ffa05b9bc8307f90596e7113c36b':
Add support for grouping keyboard layouts by collection.
2012-05-21 12:43:14 -07:00
Russell Brenner
5e709955d2
am 737d5aa9
: am 1c0a8f95
: Merge "Wifi select screen redlines" into jb-dev
...
* commit '737d5aa9cfdc4a06c48530175799a13175d165d1':
Wifi select screen redlines
2012-05-21 12:41:11 -07:00
Daniel Sandler
d559a483d2
am 527a6693
: am 70b59998
: Refinements to notification controls in Settings.
...
* commit '527a669330598f66deda5fd1fa516ddcb230991f':
Refinements to notification controls in Settings.
2012-05-21 12:40:20 -07:00
Jean-Baptiste Queru
ad7f7cc547
am c0653a12
: Merge "Expandable NumberPicker width in bytesPicker dialog"
...
* commit 'c0653a12304d64aa6107b2f06bb6d0e2e73a2c33':
Expandable NumberPicker width in bytesPicker dialog
2012-05-21 12:36:49 -07:00
Gilles Debunne
2f8067353c
am 50e9b7c0
: am 8cbfe403
: Merge "Show dots when entering PIN password in landscape" into jb-dev
...
* commit '50e9b7c0f446d3c26fdda08e9600fe4740968754':
Show dots when entering PIN password in landscape
2012-05-21 11:51:46 -07:00
Jean-Baptiste Queru
c0653a1230
Merge "Expandable NumberPicker width in bytesPicker dialog"
2012-05-21 11:37:30 -07:00
The Android Automerger
198a9652c9
merge in jb-release history after reset to jb-dev
2012-05-21 07:06:07 -07:00
Jeff Brown
0ee87ab22a
am 766b2861
: Add UI to select multiple keyboard layouts.
...
* commit '766b286187d02b3da6e0142376a4478072f30a16':
Add UI to select multiple keyboard layouts.
2012-05-20 21:53:26 -07:00
Jeff Brown
766b286187
Add UI to select multiple keyboard layouts.
...
Bug: 6405203
Change-Id: I27ca4630aebcb39b83298d37d8fb3f4ef0080317
2012-05-20 14:56:42 -07:00
The Android Automerger
378526c7a1
merge in jb-release history after reset to jb-dev
2012-05-20 07:39:53 -07:00
The Android Open Source Project
deb874679b
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: Ibc7ab1d501b3fd26d83a26a8daec7a01eb6f9030
2012-05-18 18:44:06 -07:00