101907 Commits

Author SHA1 Message Date
Christopher Tate
17ff10ff6e am 0fcab21f: (-s ours) am 28d4f210: Merge "DO NOT MERGE - Full backup/restore now handles OBBs sensibly" into jb-mr2-dev
* commit '0fcab21f27fda3b4a146ba238e89c528f0de6b2a':
  DO NOT MERGE - Full backup/restore now handles OBBs sensibly
2013-03-08 23:31:51 +00: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
15dacb3b3e am 9483f77b: am b3498834: Merge "Do some minor cleanup of SearchView icons" into jb-mr2-dev
* commit '9483f77ba3d4845b22be65b34666e5fe0f711051':
  Do some minor cleanup of SearchView icons
2013-03-08 23:24:37 +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
2b7f831553 am 2486685f: am 8c7d5d80: Merge "Fix typo" into jb-mr2-dev
* commit '2486685f726d41b0c3f2e25c8eb872d38c1d476c':
  Fix typo
2013-03-08 23:20:54 +00:00
Jason Sams
7cdda146ac am 694f9ff4: am e3982a86: Merge "Update IP_JB to Mr1" into jb-mr2-dev
* commit '694f9ff404f1ae4a48e0edd02a5953550630b086':
  Update IP_JB to Mr1
2013-03-08 23:20:51 +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
Chet Haase
f287913e4a Merge "Revert "add getAlpha() to Drawable"" 2013-03-08 23:01:17 +00:00
Chet Haase
9f48f3eeae Revert "add getAlpha() to Drawable"
This reverts commit a227f59691246d23e47531de4dcdaa01f94b8875

Change-Id: Ic6337b773a2a2302d9d3f84fa9ff9c2324edd2ae
2013-03-08 23:00:02 +00:00
Elliott Hughes
fb61c5368f am 387f446e: am 5043dc20: am bf8a663c: am 3f7a4990: Merge "Improve the Resource.getQuantityString/getQuantityText documentation."
* commit '387f446eb98f0d7b932257b1cd68d89996197478':
  Improve the Resource.getQuantityString/getQuantityText documentation.
2013-03-08 22:54:37 +00: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
d9f7cc34e4 am 8240587f: am 2042cc40: Merge "Update IP and IP2" into jb-mr2-dev
* commit '8240587f7d7e561efbf905ceff8ec929cd6de500':
  Update IP and IP2
2013-03-08 22:50:33 +00:00
Fabrice Di Meglio
eabab3184a am 483b9198: am 7a7369a8: Merge "Fix bug #8058390 Space is required after the battery sign in the RTL locales" into jb-mr2-dev
* commit '483b9198f4b87f3f35df6666fe3f66c7c3e08fa9':
  Fix bug #8058390 Space is required after the battery sign in the RTL locales
2013-03-08 22:50:31 +00:00
Svetoslav
2b61a4882f am fe92f437: (-s ours) am e10837f4: [DO NOT MERGE] DatePickerDialog title initially incorrect if calendar view shown.
* commit 'fe92f437b187a0791f522bc1f1b9b9c9d9b447b1':
  [DO NOT MERGE] DatePickerDialog title initially incorrect if calendar view shown.
2013-03-08 22:50:29 +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
Chet Haase
799f3623db Merge "add getAlpha() to Drawable" 2013-03-08 22:30:04 +00: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
Chet Haase
a227f59691 add getAlpha() to Drawable
Drawable has setAlpha(int), but no getAlpha() (although some subclasses have added the
method). This makes it more tedious to use the property. For example, animations that wish to
animate this property must explicitly give it a start value since this value cannot be queried
from the object.

The trick is that setAlpha(int) is abstract, only implemented by subclasses. We cannot take this
approach for getAlpha(), as we would break all subclasses of Drawable until they implemented the
method. Instead, we'll add a default method which returns an invalid value, making it easier for
clients of the method to detect whether the value is valid.

All subclasses of Drawble in frameworks have been changed to add an override of getAlpha() when
appropriate.

Issue #7485875 Drawables is missing getAlpha()

Change-Id: I3211bb03789282e010356bad92da0a4a9fe9afb3
2013-03-08 14:16:13 -08: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
Svetoslav
e99a8eff1a Merge "DatePickerDialog title initially incorrect if calendar view shown." 2013-03-08 20:49:24 +00:00
Svetoslav
a2510b5aeb 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 12:43:50 -08:00
Selim Gurun
3ca84c3914 am 16acbab7: am eab5a349: Merge "Revert "Add a delimiter between scheme and host"" into jb-mr2-dev
* commit '16acbab77de85685ebb1da303b79dd73202d9546':
  Revert "Add a delimiter between scheme and host"
2013-03-08 19:57:30 +00:00
Elliott Hughes
12759594c8 am 2ca40211: am b3a5c23b: am ac071e36: am 0c25ecfd: Merge "Use getRelativeDayString in getRelativeTimeSpanString."
* commit '2ca40211315b47eeb6b2f1e13ac5ae3b90dee767':
  Use getRelativeDayString in getRelativeTimeSpanString.
2013-03-08 19:57:27 +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
ce8e33be4e am 9b409574: am 84275799: Merge "Move blur code from FontRenderer to utils/Blur.cpp" into jb-mr2-dev
* commit '9b4095744b326d1943c59c788d6c72cacef0ed94':
  Move blur code from FontRenderer to utils/Blur.cpp
2013-03-08 19:35:02 +00: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
Romain Guy
8427579950 Merge "Move blur code from FontRenderer to utils/Blur.cpp" into jb-mr2-dev 2013-03-08 19:30:00 +00:00
Romain Guy
6e20040893 Move blur code from FontRenderer to utils/Blur.cpp
Change-Id: I2cebbfbcb722ed4b37e54ffbf8b53bb92ad0c964
2013-03-08 11:28:22 -08:00
Elliott Hughes
95d5ab30f2 Improve the Resource.getQuantityString/getQuantityText documentation.
Natural languages differ so much and in such odd ways that you can't
use getQuantityString as an "if" statement. It's really just for grammaticality.
This is explained well in
http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
but we need to make more of an effort to motivate people to read that, and to
at least get the most important point across if they don't read it.

Change-Id: I549b9f3563462c45f2dea34c558185e0714127cd
2013-03-08 11:26:57 -08:00