The Android Automerger
61e89fd93f
merge in ics-release history after reset to master
2011-08-22 06:32:24 -07:00
Irfan Sheriff
905e2864eb
Merge "Changing wifi connection dialog per UX"
2011-08-19 16:04:44 -07:00
Amith Yamasani
154305019c
Merge "Vertically center adjacent buttons in App Info screen."
2011-08-19 14:39:04 -07:00
Amith Yamasani
da3cabca76
Vertically center adjacent buttons in App Info screen.
...
Also reduce the min width of the buttons because the horizontal space
available has reduced.
Bug: 5156394
Change-Id: Ib7adfa208565503bbf537cb469e7d8feded2c5b8
2011-08-19 14:13:42 -07:00
Wink Saville
4cfc0dd0d7
Merge "Allow SIM PIN on CDMA LTE devices"
2011-08-19 13:55:17 -07:00
Jeff Sharkey
0f3f91854c
Merge "More TabWidget and padding tweaks to match spec."
2011-08-19 12:41:22 -07:00
Wink Saville
cd05e88595
Allow SIM PIN on CDMA LTE devices
...
Bug: 5161360
Change-Id: I6f98da08e6be08403d9b3b08b02b02b9a63b14fe
2011-08-19 09:55:56 -07:00
Justin Ho
d664985ea6
Updated Settings icons for Backup and Security
...
Bug: 5174358
Change-Id: I0306d918fc85701b5278f82989883938457dd83b
2011-08-19 09:00:35 -07:00
Justin Ho
1ade3cf192
Merge "Updates to screen security settings UI text per design. Bug: 5173985"
2011-08-19 07:45:40 -07:00
Isaac Levy
d621e09300
Changing wifi connection dialog per UX
...
- Added an advanced options checkbox and moving WPS, DHCP, Proxy to there
- Minor string changes
Change-Id: I7a135a483435379692a54ea0ef2663136c468945
2011-08-18 21:05:08 -07:00
Ben Komalo
5b5c906b39
Merge "Stop leaking wakelocks in cryptkeeper."
2011-08-18 18:13:47 -07:00
Claudia de Veaux
c9c9be1ffe
Updates to screen security settings UI text per design.
...
Bug: 5173985
Change-Id: Icdb1873fd9867e3aed7752e90a00c2f725c1fa6a
Edit to lock_after_timeout_summary to rephrase so new option values will
read correctly.
Also, this change includes a fix for embarrassing spelling/grammar mistakes
in Accessibility hint text.
Bug: 5184517
2011-08-18 17:24:26 -07:00
Matthew Xie
92f92b5449
Merge "Remember user choice for phone book access permission dialog"
2011-08-18 17:12:33 -07:00
Matthew Xie
b707255a44
Remember user choice for phone book access permission dialog
...
Change the always-allowed checkbox to be don't-ask-again checkbox to remember
user's decision so that user will not be bothered agian if he/she checks
the don't-ask-again checkbox
bug 5099661
Change-Id: If32ab8e93313bbd33ff040553083f0cf9359b69e
2011-08-18 16:31:30 -07:00
Amith Yamasani
33d76c3091
Merge "Power widget - track brightness changes."
2011-08-18 15:58:42 -07:00
Amith Yamasani
49c3ef901b
Power widget - track brightness changes.
...
Also, don't change background data setting when changing auto-sync state.
Bug: 3030482
Change-Id: Iad19cac8375d2d38004dbe401ceaec5402e11989
2011-08-18 15:54:18 -07:00
Jeff Sharkey
b654cbb896
More TabWidget and padding tweaks to match spec.
...
Also fix NPE in UserDictionarySettings.
Bug: 5184822
Change-Id: I082981c3bcf9b1e6575dcf9f42495a17f0ec8672
2011-08-18 15:30:17 -07:00
Jeff Sharkey
eee01c4510
Merge "Allow data usage policy on Wi-Fi networks."
2011-08-18 15:01:21 -07:00
Jeff Sharkey
cb1d680404
Merge "Reinforce limited networks in data usage UI."
2011-08-18 15:01:18 -07:00
Ben Komalo
0460675b7c
Stop leaking wakelocks in cryptkeeper.
...
Also add in logging for certain events, as well as progress update to
help hunt down a stuck-in-progress bug
Bug: 5163155
Change-Id: I2e01a56b012f41f178beba0becfbe8173a1715ee
2011-08-18 14:53:53 -07:00
Martijn Coenen
2f61676f35
Merge "ShareTap: add some more descriptive text."
2011-08-18 14:20:19 -07:00
Martijn Coenen
d56c55c2ed
ShareTap: add some more descriptive text.
...
Change-Id: I34c54c3f171ab02706ac3c4e3e15ea2629f91a7b
2011-08-18 23:18:30 +02:00
Jeff Sharkey
131f9d6e0f
Allow data usage policy on Wi-Fi networks.
...
Create NetworkPolicy when it doesn't already exist.
Bug: 4646471, 5085110
Change-Id: I38b8b03689710df06d1734a4b4d9e12d98794154
2011-08-18 12:01:29 -07:00
Jeff Sharkey
30dde0f5a0
Reinforce limited networks in data usage UI.
...
When restricting background data, list the networks the restriction
applies to.
Bug: 5131685, 5058106
Change-Id: Idde084dfa5ac6313a8d145cb6f2603aedb154590
2011-08-18 12:01:15 -07:00
Nick Pelly
b28bb83f23
Fix first-share notification intent.
...
Change-Id: I9190e977bfd416b3292889abc86d78dc3816ede4
2011-08-18 11:49:56 -07:00
Jeff Sharkey
e1246c5263
Merge "Follow preferences padding changes in framework."
2011-08-18 10:52:06 -07:00
Martijn Coenen
82f92e500f
Sharetap settings screen animation and text.
...
Change-Id: Ia19426be5a38a191a2786c1e75c4c5833a7c155f
2011-08-18 16:36:35 +02:00
The Android Automerger
132fd2f232
merge in ics-release history after reset to master
2011-08-18 06:34:52 -07:00
Freeman Ng
ba36152bad
Merge "remove obsolete background bitmaps"
2011-08-17 17:01:28 -07:00
Freeman Ng
7e84e4682d
remove obsolete background bitmaps
...
Change-Id: I5ca2b3eeda1f9d2e63c495e5f5b88e28592c5655
2011-08-17 16:58:56 -07:00
repo sync
1079007cf7
Merge "Add p2p settings only in debug mode"
2011-08-17 16:39:46 -07:00
Justin Ho
9403d8b239
Merge "Part of effort to remove "failure" messaging to end-users. Bug: 5165745"
2011-08-17 14:18:05 -07:00
Jeff Sharkey
b9b2422dee
Merge "Remove "background data" from accounts settings."
2011-08-17 14:09:42 -07:00
Ben Komalo
f0104df823
Fixes to CryptKeeper layout for phones
...
- prevents crash when trying to show error state
- makes progress screen not look horribly broken
Bug: 5174783
Bug: 4671153
Change-Id: Ia72830e2fdb72f174b3ed01b6fc14be7152d1932
2011-08-17 11:08:26 -07:00
Ben Komalo
25bad16da6
Merge "Allow CryptKeeper to be started for UI debugging"
2011-08-17 11:08:15 -07:00
Amith Yamasani
e36cc2d550
Merge "Match preference title with dialog title for font size."
2011-08-17 10:54:31 -07:00
Ben Komalo
91a2f0566a
Allow CryptKeeper to be started for UI debugging
...
Change-Id: I3ca6e00018da39123b470c3960c00c8cd43f9f72
2011-08-17 10:42:22 -07:00
The Android Automerger
1d68a210d5
merge in ics-release history after reset to master
2011-08-17 06:32:26 -07:00
repo sync
05e01be511
Add p2p settings only in debug mode
...
Bug: 5002384
Change-Id: I12d691ea5b2c820c33ef8735d997a0c04b636aa7
2011-08-16 22:05:24 -07:00
Irfan Sheriff
40515882cd
Merge "Changed wifi status lines per UX consult"
2011-08-16 20:48:45 -07:00
Amith Yamasani
bf4cce7a2c
Match preference title with dialog title for font size.
...
Bug: 5156411
Change-Id: I4894dbf9fd4fbb70d1ec95c01503f3594b366120
2011-08-16 18:25:40 -07:00
Jeff Sharkey
b10e52fcf1
Remove "background data" from accounts settings.
...
This has been replaced by setting in data usage panel.
Bug: 4979025
Change-Id: I4e3011233aa2522c05b1497abc54fd421f4a25fb
2011-08-16 17:31:24 -07:00
Isaac Levy
8b2bf2e538
Changed wifi status lines per UX consult
...
Change-Id: I656fa2c5c52338b320796a919edb5018e7b68851
2011-08-16 17:15:27 -07:00
Jeff Sharkey
dcf8ba9eb2
Follow preferences padding changes in framework.
...
Change-Id: Ia83237290da035e5ee7a2e92ef56fc02838aac56
2011-08-16 16:37:49 -07:00
Claudia de Veaux
8c74e4525c
Part of effort to remove "failure" messaging to end-users.
...
Bug: 5165745
Change-Id: I26ba08c783ede59e503deea2f1018af503fa0f33
2011-08-16 16:29:03 -07:00
repo sync
38853a202f
Merge "Use updated wifip2pmanager API"
2011-08-16 14:51:06 -07:00
Amith Yamasani
2f90d4e403
Adjust the margins for the volume seekbars.
...
Bug: 5165547
Change-Id: Ic82c03a4b39895f872bfd8ef4e46c795502f78a4
2011-08-16 13:49:40 -07:00
The Android Automerger
514ae1b4fb
merge in ics-release history after reset to master
2011-08-16 06:34:52 -07:00
Jeff Sharkey
96bc051377
Merge "Foreground/background network stats pie chart."
2011-08-15 18:44:17 -07:00
Jake Hamby
825df4fd96
Merge "Bluetooth : fix for Settings crashes while rotating the screen."
2011-08-15 16:02:47 -07:00