198308 Commits

Author SHA1 Message Date
Jeff Sharkey
80a3fbf408 am c9eb398a: Merge "Clear identity when killing media provider." into mnc-dev
* commit 'c9eb398a1b0d7954b0d4f13fb46cae3042a99a75':
  Clear identity when killing media provider.
2015-07-17 23:40:37 +00:00
Keisuke Kuroyanagi
fd3eff27bd Fix: Wrong suggestion popup position in extract mode.
Replace text was handled by the original EditText; thus, we
couldn't correctly decide popup window position.
Also, changing selection range replaces entire text of the
extracted EditText. As a result, text cannot be replaced
with the selected item when there is a selection.

This change is a workaround for this issue. This quits
offering "Replace" for selection in extract mode.

Bug: 22038802
Change-Id: I052b027cfd10eeb289f77f4c6b228acf58fea636
2015-07-17 16:36:57 -07:00
Chet Haase
fcba54eb88 am d3f327be: Merge "Localize SimpleMonthView" into mnc-dev
* commit 'd3f327be2d1f8facd709895f2d05757351e8be07':
  Localize SimpleMonthView
2015-07-17 23:31:44 +00:00
Jeff Sharkey
2d9d59053f am 25945302: Merge "Persist version data on a per-volume basis." into mnc-dev
* commit '259453024c015da9d70d1ffadba09604aa1c786e':
  Persist version data on a per-volume basis.
2015-07-17 23:31:39 +00:00
Adrian Roos
57ee4b87fe Merge "Fix image wallpaper size" into mnc-dev 2015-07-17 23:29:58 +00:00
Jeff Sharkey
c9eb398a1b Merge "Clear identity when killing media provider." into mnc-dev 2015-07-17 23:29:54 +00:00
Chet Haase
d3f327be2d Merge "Localize SimpleMonthView" into mnc-dev 2015-07-17 23:28:15 +00:00
xinhe
9b8ddb0904 am 822f6141: Merge "Add API to turn OFF "best network selection" feature" into mnc-dev
* commit '822f6141d4aca099e1dc37cda3bc861b2908df82':
  Add API to turn OFF "best network selection" feature
2015-07-17 23:26:50 +00:00
Jeff Sharkey
b3cf953345 Clear identity when killing media provider.
Otherwise various shell "sm" commands fail because they don't hold
the right permissions.

Bug: 22564405
Change-Id: I88081e8a9b27ee43904d3ea6f745aba3af4e2150
2015-07-17 16:21:43 -07:00
Jeff Sharkey
259453024c Merge "Persist version data on a per-volume basis." into mnc-dev 2015-07-17 23:20:37 +00:00
Jeff Sharkey
f80b52b08a Persist version data on a per-volume basis.
Now that we support multiple adopted external storage devices, we
need to keep track of version data for each volume.  This means we
now correctly handle certificate upgrade edge cases, permission
regranting, and clearing of code caches on a per-volume basis.

Bug: 22298966
Change-Id: Ifb9940c197f6c058a3ecca728257f853ce0fd7f4
2015-07-17 16:19:00 -07:00
xinhe
822f6141d4 Merge "Add API to turn OFF "best network selection" feature" into mnc-dev 2015-07-17 23:13:07 +00:00
Svetoslav Ganov
fa24a78239 am 41ec3923: am fbc6f2cb: Merge "Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"" into mnc-dev
* commit '41ec39230cd9c6b0d911f99854afc33dfc17e03d':
  Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"
2015-07-17 23:05:33 +00:00
Chris Craik
6ad690e16f Fix AssetAtlas usage in BitmapShaders
bug:22521999

Change-Id: I60859748ceee19ebc89ec98845e550ea26e36ecd
2015-07-17 15:53:24 -07:00
Svetoslav Ganov
41ec39230c am fbc6f2cb: Merge "Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"" into mnc-dev
* commit 'fbc6f2cb6c5313ac246b8554764a719dd06582fc':
  Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"
2015-07-17 22:47:17 +00:00
Svetoslav Ganov
fbc6f2cb6c Merge "Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"" into mnc-dev 2015-07-17 22:39:34 +00:00
Christopher Tate
d85a664202 Don't fall back to domain verification state when looking up app linkage state
This is in support of the always/never/ask UI tweaks in Settings: any
"assume always" fallback at the verification layer should not be
conflated with the user-facing semantic toggle.  This was causing the
UI to report apps as being in the 'always open their links' state
inappropriately.

Bug 22532193

Change-Id: Iaa4bc3a2d5db814e1b0d96bc1c4ecfaafb1e3105
2015-07-17 15:39:08 -07:00
Dianne Hackborn
35534fb480 am fb03aa36: am 5c269121: Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev
* commit 'fb03aa36a4790ca0ff5e11a56903507089278390':
  Work on issue #22556778: Starting under voice control not allowed
2015-07-17 22:33:34 +00:00
Dianne Hackborn
fb03aa36a4 am 5c269121: Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev
* commit '5c269121d8ea0bf3f530f2314695e189ffdb3165':
  Work on issue #22556778: Starting under voice control not allowed
2015-07-17 22:17:58 +00:00
Dianne Hackborn
5c269121d8 Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev 2015-07-17 22:03:46 +00:00
Chet Haase
1ea4715cec Localize SimpleMonthView
The days of the month were not being localized, resulting in
English numbers for non-English languages. Now we format the numbers
with the current locale.

Issue #22540629  [MRA14D][Arab][Token] numbers displayed in english

Change-Id: I2b17d55ba2d0aa47b5a28c8846c6cf9723ababb1
2015-07-17 14:26:17 -07:00
Svet Ganov
d28adb4829 am 2d92575a: am 5ff4383b: Merge "Grant default permissions to default apps despite user choices." into mnc-dev
* commit '2d92575ad0dbbf3bfee4f013f4b78fac06c0ab50':
  Grant default permissions to default apps despite user choices.
2015-07-17 21:22:39 +00:00
Svet Ganov
2d92575ad0 am 5ff4383b: Merge "Grant default permissions to default apps despite user choices." into mnc-dev
* commit '5ff4383b466fc26e6696a7bbeb6df5eb7a3c8cc5':
  Grant default permissions to default apps despite user choices.
2015-07-17 21:10:16 +00:00
Svet Ganov
5ff4383b46 Merge "Grant default permissions to default apps despite user choices." into mnc-dev 2015-07-17 20:58:13 +00:00
Svet Ganov
ae61307d00 am fa9a616d: am 4a1421f3: Merge "Do not auto grant GET_ACCOUNTS as it is temporarily normal" into mnc-dev
* commit 'fa9a616de9664c4bd7212683facbd31dcd9c3bdd':
  Do not auto grant GET_ACCOUNTS as it is temporarily normal
2015-07-17 20:46:01 +00:00
ztenghui
fcec06384d am 8b455841: am 094c82ad: Merge "Scaling (Animated)VectorDrawable inside ImageView" into mnc-dev
* commit '8b455841d9da1ac5ddf1b88e03c0c94613fd4046':
  Scaling (Animated)VectorDrawable inside ImageView
2015-07-17 20:45:56 +00:00
Svet Ganov
4bb5187e63 Grant default permissions to default apps despite user choices.
This implements the policy of granting default permissions to default
apps upon a selection despite past user permission choices. The act of
picking the app as the default one means the user expects it to work in
this capacity as SMS app, Phone app, Browser app.

bug:22062549

Change-Id: I5e427f2b939e85bb8bbfd311cc271b96857a7ce6
2015-07-17 13:43:34 -07:00
Svetoslav Ganov
54a0cf1b95 Revert "Do not auto grant GET_ACCOUNTS as it is temporarily normal"
This reverts commit 33852d8cd21434b4106b8f2c504752ef34abb2da.

Change-Id: I29a212876c93ae0288967ffcff223abafad78827
2015-07-17 20:34:18 +00:00
Svet Ganov
fa9a616de9 am 4a1421f3: Merge "Do not auto grant GET_ACCOUNTS as it is temporarily normal" into mnc-dev
* commit '4a1421f3c50d53a7e2230f41854df12215378ef2':
  Do not auto grant GET_ACCOUNTS as it is temporarily normal
2015-07-17 20:32:28 +00:00
ztenghui
8b455841d9 am 094c82ad: Merge "Scaling (Animated)VectorDrawable inside ImageView" into mnc-dev
* commit '094c82ada3799045588790252a64806b9930f8c2':
  Scaling (Animated)VectorDrawable inside ImageView
2015-07-17 20:32:24 +00:00
Svet Ganov
4a1421f3c5 Merge "Do not auto grant GET_ACCOUNTS as it is temporarily normal" into mnc-dev 2015-07-17 20:27:36 +00:00
Svet Ganov
33852d8cd2 Do not auto grant GET_ACCOUNTS as it is temporarily normal
bug:22550851

Change-Id: Iea5dd8fde07074220167a937b32208b1c9488d9d
2015-07-17 13:21:36 -07:00
ztenghui
094c82ada3 Merge "Scaling (Animated)VectorDrawable inside ImageView" into mnc-dev 2015-07-17 20:21:28 +00:00
Adrian Roos
30a7dfa329 Fix image wallpaper size
Fixes a bug where the image wallpaper size
would not correctly update. Suspected cause
is checking the to-be-requested size against
the current surface size instead of the
requested surface size.

Also removes an unused field.

Bug: 21148936
Change-Id: Ief4585bd5aed5922337709d7ae0ca0bf948649d0
2015-07-17 12:30:37 -07:00
Julia Reynolds
46a088e438 am e0746d32: am 3368e69e: Merge "Remove focusablilty of the status bar." into mnc-dev
* commit 'e0746d32306ff20d864b465ff1d6cd249daedb9d':
  Remove focusablilty of the status bar.
2015-07-17 19:11:10 +00:00
Wale Ogunwale
6b098bfee8 am 25257ca5: am af814340: Merge "Fixed bad merge conflict resolution" into mnc-dev
* commit '25257ca52e57b982ba71be040a7f261c66d37236':
  Fixed bad merge conflict resolution
2015-07-17 19:11:06 +00:00
Roozbeh Pournader
8d2e0f7898 Bidi-wrap the results of format[Short]FileSize().
Previously, users of the results of formatFileSize() and
formatShortFileSize() needed to unicodeWrap the results themselves
using BidiFormatter, which resulted in several bugs and
inconsistencies across the platform when they didn't, especially in
Hebrew and Urdu locales:

Hebrew and Urdu use Latin abbreviations like 'MB' for file sizes
which cause undesired reorderings (or incorrect detection of the
string direction when the formatted file size starts the string).

With this patch, the results are now bidi-wrapped before being
returned if the locale of the context passed in to the formatter is a
right-to-left locale.

Bug: 22237132
Bug: 22273176
Change-Id: If076636d15828fc810feef6f0fa8806ef52aed5d
2015-07-17 12:02:22 -07:00
Mady Mellor
b44cc17d6f am 9629f637: am 9c98b859: Merge "Update stylus gesture to access quick settings to use the new buttons" into mnc-dev
* commit '9629f637b79d85f27efa224b208d8b3cfd2591a4':
  Update stylus gesture to access quick settings to use the new buttons
2015-07-17 18:57:54 +00:00
Julia Reynolds
e0746d3230 am 3368e69e: Merge "Remove focusablilty of the status bar." into mnc-dev
* commit '3368e69e9d7302ffb475a4ddd12bbb9ea8365a8d':
  Remove focusablilty of the status bar.
2015-07-17 18:54:20 +00:00
Wale Ogunwale
25257ca52e am af814340: Merge "Fixed bad merge conflict resolution" into mnc-dev
* commit 'af81434023d19cfd486c84c210f2b6540a2bab35':
  Fixed bad merge conflict resolution
2015-07-17 18:54:16 +00:00
Julia Reynolds
3368e69e9d Merge "Remove focusablilty of the status bar." into mnc-dev 2015-07-17 18:49:22 +00:00
Tingting Wang
b1322a2a11 am 6aee4761: am ad359f2e: Merge "Revert "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev
* commit '6aee4761a826c3ef2793dc5c62d2451bd7450c61':
  Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."
2015-07-17 18:45:41 +00:00
Wale Ogunwale
af81434023 Merge "Fixed bad merge conflict resolution" into mnc-dev 2015-07-17 18:44:58 +00:00
Mady Mellor
9629f637b7 am 9c98b859: Merge "Update stylus gesture to access quick settings to use the new buttons" into mnc-dev
* commit '9c98b859fd6aee74f23b66fccbd3bf2436efcdb9':
  Update stylus gesture to access quick settings to use the new buttons
2015-07-17 18:44:51 +00:00
Tingting Wang
6aee4761a8 am ad359f2e: Merge "Revert "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev
* commit 'ad359f2e705280e26198890a95d53e3566126bcc':
  Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."
2015-07-17 18:30:56 +00:00
Mady Mellor
9c98b859fd Merge "Update stylus gesture to access quick settings to use the new buttons" into mnc-dev 2015-07-17 18:30:53 +00:00
Dianne Hackborn
f38c4ee903 Work on issue #22556778: Starting under voice control not allowed
The ResolverActivity is voice capable.  In fact, it is capable
of EVERYTHING.

Change-Id: I37c4476d546f61fee3540b747aff77e88b702d48
2015-07-17 11:21:26 -07:00
Tingting Wang
ad359f2e70 Merge "Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev 2015-07-17 18:19:56 +00:00
ztenghui
35289f12d6 Scaling (Animated)VectorDrawable inside ImageView
Before, the VectorDrawable is behaving like BitmapDrawable inside a ImageView,
and it can be blurry due to scaling.
Now apply the scaling information to the cached bitmap, then the size of bitmap
will match the ImageView's screen size. Therefore, no blurry any more.

b/18185626

Change-Id: I979cef3b5178a9bd37ee6cc776df3361ca47c803
2015-07-17 11:16:41 -07:00
Svetoslav Ganov
55596f859a am 098a88e6: am 2a500e32: Merge "Revert "Temporary lower GET_ACCOUNTS protection level"" into mnc-dev
* commit '098a88e6a330c123c3daeda334e91c8656ecb4b2':
  Revert "Temporary lower GET_ACCOUNTS protection level"
2015-07-17 18:01:58 +00:00