101665 Commits

Author SHA1 Message Date
Irfan Sheriff
accec86ce4 Fix reconnect/reassociate handling
We are dropping incorrectly when in disconnected state

Bug: 8357624
Change-Id: I8919dcd679da6b5fc6c7f671e243f08e42b91ff3
2013-03-11 08:47:39 -07:00
Michael Jurka
4bfa6de8ed am bb2b6b3b: Merge "Updating search asset for action bar" into jb-mr2-dev
* commit 'bb2b6b3bb70aaf9abf70fecaa2ba34b3c3f71142':
  Updating search asset for action bar
2013-03-11 11:07:33 +00:00
Michael Jurka
bb2b6b3bb7 Merge "Updating search asset for action bar" into jb-mr2-dev 2013-03-11 11:04:44 +00:00
Jason Sams
e06b7696cc am b5afb837: Merge "Handle onPause in ImageProcessing." into jb-mr2-dev
* commit 'b5afb837147a2d8b330581967c8fac28b0e248e8':
  Handle onPause in ImageProcessing.
2013-03-09 01:12:09 +00:00
Jason Sams
b5afb83714 Merge "Handle onPause in ImageProcessing." into jb-mr2-dev 2013-03-09 01:09:12 +00:00
Lorenzo Colitti
e167135976 Always specify an interface for host routes.
Change-Id: I05b4d87e7d7e8237c6f4a70f1fedae00f416f581
2013-03-08 16:41:25 -08:00
Lorenzo Colitti
45b9a5bb93 RouteInfo changes.
- Add the interface name.
- Fix a bug where a default route would match an address of
  another protocol (e.g., 0.0.0.0/0 would match 2001::).
- Tweak the hashCode method.
- Write a unit test.

Change-Id: Ida8266de440a9b1d9eaa132f182b9f1ce8978c44
2013-03-08 16:41:25 -08:00
Jason Sams
990a08fcb4 Handle onPause in ImageProcessing.
Change-Id: I538ce0ac7b9da2f4ec6cd7bd35aa84fd710e063f
2013-03-08 16:35:29 -08:00
Elliott Hughes
b9230f3c31 am d6875e33: am 2cb314eb: am e0cd3c19: Merge "Improve DateFormat.format."
* commit 'd6875e3334899be84b98d0fd32efff1f1b5775da':
  Improve DateFormat.format.
2013-03-09 00:22:18 +00:00
Elliott Hughes
d6875e3334 am 2cb314eb: am e0cd3c19: Merge "Improve DateFormat.format."
* commit '2cb314ebc7bb6495a94f577dfb57f9e6c56033ef':
  Improve DateFormat.format.
2013-03-08 16:21:21 -08:00
Elliott Hughes
2cb314ebc7 am e0cd3c19: Merge "Improve DateFormat.format."
* commit 'e0cd3c19546a00db3db706c6a993fb0e3bd00b3a':
  Improve DateFormat.format.
2013-03-08 16:18:42 -08:00
Jim Miller
8fdc7be406 am 6e5d6492: Merge "Fix long-standing bug with LockPatternView drawing artifacts" into jb-mr2-dev
* commit '6e5d6492db4f0bed604e67ee53b0c99e0685c55f':
  Fix long-standing bug with LockPatternView drawing artifacts
2013-03-09 00:12:59 +00:00
Jim Miller
6e5d6492db Merge "Fix long-standing bug with LockPatternView drawing artifacts" into jb-mr2-dev 2013-03-09 00:09:18 +00:00
Elliott Hughes
e0cd3c1954 Merge "Improve DateFormat.format." 2013-03-08 23:50:02 +00:00
Amith Yamasani
36047905ed am 515b51f8: Merge "Make account cloning API public" into jb-mr2-dev
* commit '515b51f83f1363329c66372be51813db15fb21c6':
  Make account cloning API public
2013-03-08 23:38:09 +00:00
Amith Yamasani
515b51f83f Merge "Make account cloning API public" into jb-mr2-dev 2013-03-08 23:35:31 +00:00
Michael Jurka
ff82f06c98 Updating search asset for action bar
Bug: 7599978
2013-03-09 00:33:19 +01:00
Amith Yamasani
c8a1ff4036 Make account cloning API public
Change-Id: If48d93dab49afcaaa301a5a3aa514f3d4dd3bab8
2013-03-08 15:29:55 -08:00
Christopher Tate
0fcab21f27 am 28d4f210: Merge "DO NOT MERGE - Full backup/restore now handles OBBs sensibly" into jb-mr2-dev
* commit '28d4f210f17fa2ea46f155bc246953e23cf9addc':
  DO NOT MERGE - Full backup/restore now handles OBBs sensibly
2013-03-08 23:28:50 +00:00
Christopher Tate
28d4f210f1 Merge "DO NOT MERGE - Full backup/restore now handles OBBs sensibly" into jb-mr2-dev 2013-03-08 23:26:36 +00:00
Michael Jurka
9483f77ba3 am b3498834: Merge "Do some minor cleanup of SearchView icons" into jb-mr2-dev
* commit 'b349883487e06ec8cd07d3e1adc97819c8c66d93':
  Do some minor cleanup of SearchView icons
2013-03-08 23:21:55 +00:00
Jason Sams
2486685f72 am 8c7d5d80: Merge "Fix typo" into jb-mr2-dev
* commit '8c7d5d80461ddb7d99063eab7a1489c6a2aa0058':
  Fix typo
2013-03-08 23:18:15 +00:00
Jason Sams
694f9ff404 am e3982a86: Merge "Update IP_JB to Mr1" into jb-mr2-dev
* commit 'e3982a86cc52447f93fab3deddf52a0d7c7adcb1':
  Update IP_JB to Mr1
2013-03-08 23:18:11 +00:00
Michael Jurka
b349883487 Merge "Do some minor cleanup of SearchView icons" into jb-mr2-dev 2013-03-08 23:16:19 +00:00
Jason Sams
8c7d5d8046 Merge "Fix typo" into jb-mr2-dev 2013-03-08 23:15:34 +00:00
Jason Sams
e3982a86cc Merge "Update IP_JB to Mr1" into jb-mr2-dev 2013-03-08 23:13:45 +00:00
Christopher Tate
294b512eca DO NOT MERGE - Full backup/restore now handles OBBs sensibly
OBB backup/ restore is no longer handled within the target app
process.  This is done to avoid having to require that OBB-using
apps have full read/write permission for external storage.

The new OBB backup service is a new component running in the
same app as the already-existing shared storage backup agent.
The backup infrastructure delegates backup/restore of apps'
OBB contents to this component (because the system process
may not itself read/write external storage).

From the command line, OBB backup is enabled by using new
-obb / -noobb flags with adb backup.  The default is noobb.

Finally, a couple of nit fixes:

- buffer-size mismatch between the writer and reader of chunked
  file data has been corrected; now the reading side won't be
  issuing an extra pipe read per chunk.

- bu now explicitly closes the transport socket fd after
  adopting it. This was benign but triggered a logged
  warning about leaked fds.

(Cherrypicked)

Change-Id: I471f6348abcccb7bf1e1710b7beda9f23de53e14
2013-03-08 15:08:10 -08:00
Elliott Hughes
8326b9a429 Improve DateFormat.format.
Add support for the 'c' format character, required in many non-English locales.
Reimplement 'c' and 'E', and 'L' and 'M', so they correctly interpret 5-count
pattern characters.

Replace the old incorrect class documentation with a pointer to the
well-maintained libcore equivalent and the Unicode UTS to which these two
implementations are supposed to conform.

Deprecate the useless constants for pattern characters. No one sane is going
to write MONTH + MONTH + MONTH + MONTH instead of "MMMM".

Correct the documentation for getLongDateFormat and getMediumDateFormat.

Also fix DateUtils.getStandaloneMonthString for LENGTH_SHORTEST.

Tests are in https://android-review.googlesource.com/53291.

Change-Id: I4dda8b18070f05ccdc11c1f0a9381a9d233db4e8
2013-03-08 15:06:14 -08:00
Elliott Hughes
387f446eb9 am 5043dc20: am bf8a663c: am 3f7a4990: Merge "Improve the Resource.getQuantityString/getQuantityText documentation."
* commit '5043dc20633a05c429de3ae469dc7d74bfb92451':
  Improve the Resource.getQuantityString/getQuantityText documentation.
2013-03-08 22:51:09 +00:00
Jason Sams
8240587f7d am 2042cc40: Merge "Update IP and IP2" into jb-mr2-dev
* commit '2042cc403a6eba2de1c5220e8402b045bdf24192':
  Update IP and IP2
2013-03-08 22:47:02 +00:00
Fabrice Di Meglio
483b9198f4 am 7a7369a8: Merge "Fix bug #8058390 Space is required after the battery sign in the RTL locales" into jb-mr2-dev
* commit '7a7369a8acedb301efd8309440ebf2ad1409896d':
  Fix bug #8058390 Space is required after the battery sign in the RTL locales
2013-03-08 22:46:59 +00:00
Svetoslav
fe92f437b1 am e10837f4: [DO NOT MERGE] DatePickerDialog title initially incorrect if calendar view shown.
* commit 'e10837f444c3da40a50a269e696afac63729bce3':
  [DO NOT MERGE] DatePickerDialog title initially incorrect if calendar view shown.
2013-03-08 22:46:52 +00:00
Elliott Hughes
5043dc2063 am bf8a663c: am 3f7a4990: Merge "Improve the Resource.getQuantityString/getQuantityText documentation."
* commit 'bf8a663c53454f8b8cd7e07344316981022efa10':
  Improve the Resource.getQuantityString/getQuantityText documentation.
2013-03-08 14:44:40 -08:00
Jason Sams
2042cc403a Merge "Update IP and IP2" into jb-mr2-dev 2013-03-08 22:34:04 +00:00
Jason Sams
1e645d2925 Fix typo
Change-Id: I4e4d3aec62d1400f90a10802148ef875b5a268ef
2013-03-08 14:32:43 -08:00
Jason Sams
f73e7fdd6d Update IP_JB to Mr1
Change-Id: I007b5048a187c90bc19c38e7155d0d5adcc34144
2013-03-08 14:31:15 -08:00
Selim Gurun
2905e18b03 Add a delimiter between scheme and host
Bug: 6923539
Change-Id: I49aac145e8e80a5af7475cfe93ef4a353d2d3fe6
2013-03-08 14:29:56 -08:00
Fabrice Di Meglio
7a7369a8ac Merge "Fix bug #8058390 Space is required after the battery sign in the RTL locales" into jb-mr2-dev 2013-03-08 22:25:25 +00:00
Fabrice Di Meglio
02c40c2404 Fix bug #8058390 Space is required after the battery sign in the RTL locales
- fix remaining left/right properties that needed to be start/end properties

Change-Id: Iaa5090c2ad256e378313f164e2388f42428e5700
2013-03-08 14:05:28 -08:00
Jason Sams
e699147122 Update IP and IP2
Change-Id: I5e81ae906a36fc1f6dc8de872398c6aa580238f1
2013-03-08 14:00:27 -08:00
Elliott Hughes
bf8a663c53 am 3f7a4990: Merge "Improve the Resource.getQuantityString/getQuantityText documentation."
* commit '3f7a49904cef7ea14808590b63b115a4381537a1':
  Improve the Resource.getQuantityString/getQuantityText documentation.
2013-03-08 13:59:59 -08:00
Svetoslav
e10837f444 [DO NOT MERGE] DatePickerDialog title initially incorrect if calendar view shown.
If the calendar view of the date picker dialog is shown we
do not use a formatted date as the dialog title since the
calendar view shows it, instead we show a static "Set date"
title. However, the initial state of the date picker dialog
on a tablet has a formatted date since the date picker widget
does not do a correct check whether the calendar view is shown
which returns a false negative resulting in a title with a
formatted date being added since the dialog thinks it has no
calendar view.

Change-Id: Ibf4c433b34ab1ee1bc1dc386689664a32283fb6a
2013-03-08 13:31:53 -08:00
Elliott Hughes
3f7a49904c Merge "Improve the Resource.getQuantityString/getQuantityText documentation." 2013-03-08 21:18:34 +00:00
Selim Gurun
16acbab77d am eab5a349: Merge "Revert "Add a delimiter between scheme and host"" into jb-mr2-dev
* commit 'eab5a3491b16ec9dd8c010de3fce1cc9f11afb55':
  Revert "Add a delimiter between scheme and host"
2013-03-08 19:54:53 +00:00
Elliott Hughes
2ca4021131 am b3a5c23b: am ac071e36: am 0c25ecfd: Merge "Use getRelativeDayString in getRelativeTimeSpanString."
* commit 'b3a5c23b3a7a55bea7ef0d2cfb15b566809c6dca':
  Use getRelativeDayString in getRelativeTimeSpanString.
2013-03-08 19:54:50 +00:00
Selim Gurun
eab5a3491b Merge "Revert "Add a delimiter between scheme and host"" into jb-mr2-dev 2013-03-08 19:50:44 +00:00
Elliott Hughes
b3a5c23b3a am ac071e36: am 0c25ecfd: Merge "Use getRelativeDayString in getRelativeTimeSpanString."
* commit 'ac071e36aecd47a453641074e81c5ebcf888dd82':
  Use getRelativeDayString in getRelativeTimeSpanString.
2013-03-08 11:49:24 -08:00
Selim Gurun
e96d6e9ca0 Revert "Add a delimiter between scheme and host"
This reverts commit e990e359f99a9e791106d4eefa046bdff8e22e6d

Change-Id: I2007f04295a5d3b24e281c5823b144ab2782adb7
2013-03-08 19:49:18 +00:00
Elliott Hughes
ac071e36ae am 0c25ecfd: Merge "Use getRelativeDayString in getRelativeTimeSpanString."
* commit '0c25ecfd43235340c9b6bf5b640232138a217836':
  Use getRelativeDayString in getRelativeTimeSpanString.
2013-03-08 11:47:39 -08:00
Romain Guy
9b4095744b am 84275799: Merge "Move blur code from FontRenderer to utils/Blur.cpp" into jb-mr2-dev
* commit '842757995052c27abc3211083395f1b97ef1a063':
  Move blur code from FontRenderer to utils/Blur.cpp
2013-03-08 19:32:33 +00:00