72482 Commits

Author SHA1 Message Date
Mikhail Naganov
64a57dc1b3 am 4204ed96: am fa85a888: am abb8dc97: Merge "Enhance documentation of WebSettings.WebSettings method" into mnc-dev
* commit '4204ed96bfda8aff5e1246a10b825846ebfddad9':
  Enhance documentation of WebSettings.WebSettings method
2015-07-09 17:41:19 +00:00
Mikhail Naganov
4204ed96bf am fa85a888: am abb8dc97: Merge "Enhance documentation of WebSettings.WebSettings method" into mnc-dev
* commit 'fa85a888a068da9bdd8dcc0d6ebcc675146c45cb':
  Enhance documentation of WebSettings.WebSettings method
2015-07-09 17:27:02 +00:00
Mikhail Naganov
fa85a888a0 am abb8dc97: Merge "Enhance documentation of WebSettings.WebSettings method" into mnc-dev
* commit 'abb8dc97586cc15fa16bab7dd80ffe02a379550f':
  Enhance documentation of WebSettings.WebSettings method
2015-07-09 17:07:23 +00:00
Mikhail Naganov
abb8dc9758 Merge "Enhance documentation of WebSettings.WebSettings method" into mnc-dev 2015-07-09 16:53:38 +00:00
Narayan Kamath
49df8dff5f am af7cf1c4: am 1601c604: am 14b50394: Reduce overly aggressive use of narrowAm / narrowPm.
* commit 'af7cf1c495a660170c5907d7cc038fa2521f8d58':
  Reduce overly aggressive use of narrowAm / narrowPm.
2015-07-09 10:43:02 +00:00
Narayan Kamath
af7cf1c495 am 1601c604: am 14b50394: Reduce overly aggressive use of narrowAm / narrowPm.
* commit '1601c6045c91b4f6b1cb3be0ba8ec782f4f457ed':
  Reduce overly aggressive use of narrowAm / narrowPm.
2015-07-09 10:30:38 +00:00
Narayan Kamath
1601c6045c am 14b50394: Reduce overly aggressive use of narrowAm / narrowPm.
* commit '14b503947727d7e58c9f2d50ceada378031fbe59':
  Reduce overly aggressive use of narrowAm / narrowPm.
2015-07-09 10:18:28 +00:00
Narayan Kamath
14b5039477 Reduce overly aggressive use of narrowAm / narrowPm.
Increase threshold to 4 from 2. Given that this threshold is
applied independently, we now have a few more languages where we
use a mixture of narrow and regular AM/PM markers. Those languages
are : Bodo (brx), Cherokee (chr), Ewe (ee), German Swiss (gsw, not de-CH)
and Makonde (kde).

I've included a full table of diffs in the commit message.

bug: 22208502

1,5c1,5
<     L= af AM= v , PM= n
<     L= af-NA AM= v , PM= n
<     L= af-ZA AM= v , PM= n
<     L= agq AM= a , PM= p
<     L= agq-CM AM= a , PM= p
---
>     L= af AM= vm. , PM= nm.
>     L= af-NA AM= vm. , PM= nm.
>     L= af-ZA AM= vm. , PM= nm.
>     L= agq AM= a.g , PM= a.k
>     L= agq-CM AM= a.g , PM= a.k
9,10c9,10
<     L= am AM= ጠ , PM= ከ
<     L= am-ET AM= ጠ , PM= ከ
---
>     L= am AM= ጥዋት , PM= ከሰዓት
>     L= am-ET AM= ጥዋት , PM= ከሰዓት
68,71c68,71
<     L= br AM= am , PM= gm
<     L= br-FR AM= am , PM= gm
<     L= brx AM= a , PM= p
<     L= brx-IN AM= a , PM= p
---
>     L= br AM= A.M. , PM= G.M.
>     L= br-FR AM= A.M. , PM= G.M.
>     L= brx AM= फुं , PM= p
>     L= brx-IN AM= फुं , PM= p
84,85c84,85
<     L= chr AM= a , PM= p
<     L= chr-US AM= a , PM= p
---
>     L= chr AM= ᏌᎾᎴ , PM= p
>     L= chr-US AM= ᏌᎾᎴ , PM= p
114,119c114,119
<     L= ee AM= a , PM= p
<     L= ee-GH AM= a , PM= p
<     L= ee-TG AM= a , PM= p
<     L= el AM= π , PM= μ
<     L= el-CY AM= π , PM= μ
<     L= el-GR AM= π , PM= μ
---
>     L= ee AM= ŋdi , PM= p
>     L= ee-GH AM= ŋdi , PM= p
>     L= ee-TG AM= ŋdi , PM= p
>     L= el AM= π.μ. , PM= μ.μ.
>     L= el-CY AM= π.μ. , PM= μ.μ.
>     L= el-GR AM= π.μ. , PM= μ.μ.
144c144
<     L= en-GB AM= a , PM= p
---
>     L= en-GB AM= a.m. , PM= p.m.
153c153
<     L= en-IE AM= a , PM= p
---
>     L= en-IE AM= a.m. , PM= p.m.
215c215
<     L= eo AM= a , PM= p
---
>     L= eo AM= atm , PM= ptm
314,315c314,315
<     L= ga AM= a , PM= p
<     L= ga-IE AM= a , PM= p
---
>     L= ga AM= a.m. , PM= p.m.
>     L= ga-IE AM= a.m. , PM= p.m.
318,323c318,323
<     L= gl AM= a , PM= p
<     L= gl-ES AM= a , PM= p
<     L= gsw AM= a , PM= p
<     L= gsw-CH AM= a , PM= p
<     L= gsw-FR AM= a , PM= p
<     L= gsw-LI AM= a , PM= p
---
>     L= gl AM= a.m. , PM= p.m.
>     L= gl-ES AM= a.m. , PM= p.m.
>     L= gsw AM= a , PM= nam.
>     L= gsw-CH AM= a , PM= nam.
>     L= gsw-FR AM= a , PM= nam.
>     L= gsw-LI AM= a , PM= nam.
328,329c328,329
<     L= gv AM= a , PM= p
<     L= gv-IM AM= a , PM= p
---
>     L= gv AM= a.m. , PM= p.m.
>     L= gv-IM AM= a.m. , PM= p.m.
352,353c352,353
<     L= ig AM= a , PM= p
<     L= ig-NG AM= a , PM= p
---
>     L= ig AM= A.M. , PM= P.M.
>     L= ig-NG AM= A.M. , PM= P.M.
356,357c356,357
<     L= is AM= f. , PM= e.
<     L= is-IS AM= f. , PM= e.
---
>     L= is AM= f.h. , PM= e.h.
>     L= is-IS AM= f.h. , PM= e.h.
374,375c374,375
<     L= kde AM= a , PM= p
<     L= kde-TZ AM= a , PM= p
---
>     L= kde AM= Muhi , PM= p
>     L= kde-TZ AM= Muhi , PM= p
409,410c409,410
<     L= kw AM= a , PM= p
<     L= kw-GB AM= a , PM= p
---
>     L= kw AM= a.m. , PM= p.m.
>     L= kw-GB AM= a.m. , PM= p.m.
414,415c414,415
<     L= lag AM= a , PM= p
<     L= lag-TZ AM= a , PM= p
---
>     L= lag AM= TOO , PM= MUU
>     L= lag-TZ AM= TOO , PM= MUU
435,436c435,436
<     L= luy AM= a , PM= p
<     L= luy-KE AM= a , PM= p
---
>     L= luy AM= a.m. , PM= p.m.
>     L= luy-KE AM= a.m. , PM= p.m.
459,465c459,465
<     L= mr AM= स , PM= सं
<     L= mr-IN AM= स , PM= सं
<     L= ms AM= PG , PM= p
<     L= ms-Latn AM= PG , PM= p
<     L= ms-Latn-BN AM= PG , PM= p
<     L= ms-Latn-MY AM= PG , PM= p
<     L= ms-Latn-SG AM= PG , PM= p
---
>     L= mr AM= स , PM= म.उ.
>     L= mr-IN AM= स , PM= म.उ.
>     L= ms AM= PG , PM= PTG
>     L= ms-Latn AM= PG , PM= PTG
>     L= ms-Latn-BN AM= PG , PM= PTG
>     L= ms-Latn-MY AM= PG , PM= PTG
>     L= ms-Latn-SG AM= PG , PM= PTG
474,476c474,476
<     L= nb AM= a , PM= p
<     L= nb-NO AM= a , PM= p
<     L= nb-SJ AM= a , PM= p
---
>     L= nb AM= a.m. , PM= p.m.
>     L= nb-NO AM= a.m. , PM= p.m.
>     L= nb-SJ AM= a.m. , PM= p.m.
490,491c490,491
<     L= nmg AM= a , PM= p
<     L= nmg-CM AM= a , PM= p
---
>     L= nmg AM= maná , PM= kugú
>     L= nmg-CM AM= maná , PM= kugú
515,516c515,516
<     L= ps AM= a , PM= p
<     L= ps-AF AM= a , PM= p
---
>     L= ps AM= غ.م. , PM= غ.و.
>     L= ps-AF AM= غ.م. , PM= غ.و.
527,530c527,530
<     L= qu AM= a , PM= p
<     L= qu-BO AM= a , PM= p
<     L= qu-EC AM= a , PM= p
<     L= qu-PE AM= a , PM= p
---
>     L= qu AM= a.m. , PM= p.m.
>     L= qu-BO AM= a.m. , PM= p.m.
>     L= qu-EC AM= a.m. , PM= p.m.
>     L= qu-PE AM= a.m. , PM= p.m.
572,573c572,573
<     L= si AM= පෙ , PM= ප
<     L= si-LK AM= පෙ , PM= ප
---
>     L= si AM= පෙ , PM= ප.ව.
>     L= si-LK AM= පෙ , PM= ප.ව.
576,577c576,577
<     L= sl AM= d , PM= p
<     L= sl-SI AM= d , PM= p
---
>     L= sl AM= dop. , PM= pop.
>     L= sl-SI AM= dop. , PM= pop.
582,586c582,586
<     L= so AM= a , PM= p
<     L= so-DJ AM= a , PM= p
<     L= so-ET AM= a , PM= p
<     L= so-KE AM= a , PM= p
<     L= so-SO AM= a , PM= p
---
>     L= so AM= sn. , PM= gn.
>     L= so-DJ AM= sn. , PM= gn.
>     L= so-ET AM= sn. , PM= gn.
>     L= so-KE AM= sn. , PM= gn.
>     L= so-SO AM= sn. , PM= gn.
616,617c616,617
<     L= te AM= ఉ , PM= సా
<     L= te-IN AM= ఉ , PM= సా
---
>     L= te AM= [AM] , PM= [PM]
>     L= te-IN AM= [AM] , PM= [PM]

Change-Id: Id87dd3a41b54f4d1e76535c80439e2436346a607
2015-07-09 10:01:31 +00:00
Jim Miller
45ff18ee83 am b76bbf1b: am 253129f9: am 748bc36f: Remove "final" qualifier from AuthenticationResult
* commit 'b76bbf1b94853917e23668376927587b93a70b56':
  Remove "final" qualifier from AuthenticationResult
2015-07-09 04:02:14 +00:00
Jim Miller
b76bbf1b94 am 253129f9: am 748bc36f: Remove "final" qualifier from AuthenticationResult
* commit '253129f90f1fcbf856ad4ec91855713e774e9cb4':
  Remove "final" qualifier from AuthenticationResult
2015-07-09 03:49:41 +00:00
Jim Miller
253129f90f am 748bc36f: Remove "final" qualifier from AuthenticationResult
* commit '748bc36f2eebfdc67520c5025b48fefdfd8d7c01':
  Remove "final" qualifier from AuthenticationResult
2015-07-09 03:34:54 +00:00
Jim Miller
748bc36f2e Remove "final" qualifier from AuthenticationResult
This allows mock implementations to be created for testing
purposes.

Fixes bug 22362080

Change-Id: I5ff002c077d22b1338f2f4e394ad19827bb2ae9c
2015-07-09 03:19:31 +00:00
Adam Lesinski
3e2b53ff69 am 1ad61b33: am 1549adb4: am 7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev
* commit '1ad61b3314b1ea3a99d804ec9a89caae25636897':
  BatteryStats: Fail gracefully on corrupt battery stats
2015-07-09 01:55:56 +00:00
Adam Lesinski
1ad61b3314 am 1549adb4: am 7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev
* commit '1549adb4eaef28ef41ebd063df1e339de035e19d':
  BatteryStats: Fail gracefully on corrupt battery stats
2015-07-09 01:42:15 +00:00
Filip Gruszczynski
b52df91620 am d705f355: am 45eb3ea6: Revert "Fix NPE when requesting outsets for detached view."
* commit 'd705f35568c85f2ae6e6ff1f4aae53c3556d6589':
  Revert "Fix NPE when requesting outsets for detached view."
2015-07-09 01:38:34 +00:00
Adam Lesinski
1549adb4ea am 7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev
* commit '7fb1655a891de275ab8a752294c42b9c13352af6':
  BatteryStats: Fail gracefully on corrupt battery stats
2015-07-09 01:31:20 +00:00
Filip Gruszczynski
d705f35568 am 45eb3ea6: Revert "Fix NPE when requesting outsets for detached view."
* commit '45eb3ea667dac8d97a91781f01875148bacfe74c':
  Revert "Fix NPE when requesting outsets for detached view."
2015-07-09 01:22:04 +00:00
Adam Lesinski
7fb1655a89 Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev 2015-07-09 01:15:15 +00:00
Filip Gruszczynski
45eb3ea667 Revert "Fix NPE when requesting outsets for detached view."
This reverts commit b010291ace13947fcc76b1a64eaa67880e15f0a6.

Change-Id: If86ce92daac9e80d5fc2e9f707d937e7c6e91a74
2015-07-09 01:06:40 +00:00
Mady Mellor
b2ff3bd42b am 88e76d88: am e46094c4: am 84005b40: Merge "Use hint text to position handle / floating tool bar popups" into mnc-dev
* commit '88e76d88d7a1ce18c5a377b223525da7f1fa5f4a':
  Use hint text to position handle / floating tool bar popups
2015-07-09 01:04:05 +00:00
Svetoslav
843d721647 am 353835e1: am c88dec32: am 6638c182: Merge "Fix reset permissions on clear data and package uninstall." into mnc-dev
* commit '353835e12d1419a08bd1030db29fe4740cf09598':
  Fix reset permissions on clear data and package uninstall.
2015-07-09 01:04:00 +00:00
Svet Ganov
96e2b85a04 am 862c6364: am c69e1410: am 9b84b5c5: Merge "Update storage group icon" into mnc-dev
* commit '862c63644afef8a4c3ee360b6b6d8162d260510b':
  Update storage group icon
2015-07-09 01:03:54 +00:00
Mady Mellor
88e76d88d7 am e46094c4: am 84005b40: Merge "Use hint text to position handle / floating tool bar popups" into mnc-dev
* commit 'e46094c4388412f996292af73acb0b9fda99ffcd':
  Use hint text to position handle / floating tool bar popups
2015-07-09 00:47:25 +00:00
Svetoslav
353835e12d am c88dec32: am 6638c182: Merge "Fix reset permissions on clear data and package uninstall." into mnc-dev
* commit 'c88dec321b666092735263dbb247c56e45186abf':
  Fix reset permissions on clear data and package uninstall.
2015-07-09 00:47:20 +00:00
Svet Ganov
862c63644a am c69e1410: am 9b84b5c5: Merge "Update storage group icon" into mnc-dev
* commit 'c69e14103b23b689a5271e7ca8cdef823d4039ff':
  Update storage group icon
2015-07-09 00:47:15 +00:00
Mady Mellor
e46094c438 am 84005b40: Merge "Use hint text to position handle / floating tool bar popups" into mnc-dev
* commit '84005b40499c0e9cc914afd69570c1f78c92b8d1':
  Use hint text to position handle / floating tool bar popups
2015-07-09 00:37:54 +00:00
Svetoslav
c88dec321b am 6638c182: Merge "Fix reset permissions on clear data and package uninstall." into mnc-dev
* commit '6638c182635c6af036980ebdacc9c88411dcf583':
  Fix reset permissions on clear data and package uninstall.
2015-07-09 00:37:49 +00:00
Svet Ganov
c69e14103b am 9b84b5c5: Merge "Update storage group icon" into mnc-dev
* commit '9b84b5c5131634ad81b161cb1806d4f5197e1712':
  Update storage group icon
2015-07-09 00:37:45 +00:00
Adam Lesinski
9ae9cba020 BatteryStats: Fail gracefully on corrupt battery stats
Bug:22328963
Change-Id: Id0b4c6334706e58483d5fdfd2c1137bfb821c409
2015-07-08 17:35:42 -07:00
Filip Gruszczynski
c72a582138 am 886fd2f5: am b010291a: Fix NPE when requesting outsets for detached view.
* commit '886fd2f5a05a5e36ac20f95c1c06e1716a52c8e9':
  Fix NPE when requesting outsets for detached view.
2015-07-09 00:33:04 +00:00
Filip Gruszczynski
886fd2f5a0 am b010291a: Fix NPE when requesting outsets for detached view.
* commit 'b010291ace13947fcc76b1a64eaa67880e15f0a6':
  Fix NPE when requesting outsets for detached view.
2015-07-09 00:15:25 +00:00
Mady Mellor
84005b4049 Merge "Use hint text to position handle / floating tool bar popups" into mnc-dev 2015-07-09 00:06:13 +00:00
Svetoslav
6638c18263 Merge "Fix reset permissions on clear data and package uninstall." into mnc-dev 2015-07-08 23:58:01 +00:00
Svetoslav
4a5f4a2bc7 Fix reset permissions on clear data and package uninstall.
If the user clears data for an app we reset the permission but
only the changes made by the user. We do not modify syste or
policy flags and also ensure the permission that were granted
by default are granted after the data wipe. This is the same
as starting with a clean slate.

If the package whose data is cleared is a part of a shared user
we resent to initial state only the permissions that the cleared
package contributed. Hence, if another package also declared the
permission as used we do not clear the permission state as it is
still in use.

When a package is deleted for a user but still present for another
user we reset its permissions to their inital state follwoing
above described strategy.

Lastly when a preinstalled package wtih an upgrade is diabled
(triggers upgrade uninstall) and this package is a part of a
shared user, we do not drop permission state (grants and flags)
for permissions used by the shadowed system package. This ensures
that we do not drop runtime permission state (such state is
default grants and user changes).i

bug:22248525

Change-Id: I3a3007476d2cb9f4ff824e1e137a6e1a4d04408b
2015-07-08 16:52:42 -07:00
Svet Ganov
9b84b5c513 Merge "Update storage group icon" into mnc-dev 2015-07-08 23:51:21 +00:00
Ian Pedowitz
899b271a47 am 6d32062d: am baad8d36: am 224f0369: Merge "com.android.mms is no more, so removing from default_sms_application" into mnc-dev
* commit '6d32062d9de7fc306a0d8733de7c8dd63597b018':
  com.android.mms is no more, so removing from default_sms_application
2015-07-08 23:38:17 +00:00
Sasha Levitskiy
70407ff418 am 1022fa9a: am ce3da983: am 12328ef4: Merge "Fingerprint: Add post enroll interface." into mnc-dev
* commit '1022fa9a51b08278250cc44b065fae115137b087':
  Fingerprint: Add post enroll interface.
2015-07-08 23:38:08 +00:00
Filip Gruszczynski
b010291ace Fix NPE when requesting outsets for detached view.
Outsets are used during measure/layout pass, but this can be called on a
view that is not currently attached.

Bug: 21602590
Change-Id: I23e3acc45ca4bf7684d8913f839e29e8e9e94d78
(cherry picked from commit e660d4e96a2e5ac35f2dd6e2b43c588dd7e28358)
2015-07-08 23:22:36 +00:00
Ian Pedowitz
baad8d36a1 am 224f0369: Merge "com.android.mms is no more, so removing from default_sms_application" into mnc-dev
* commit '224f0369ca2ab6265379ce170c8779a7385a33f3':
  com.android.mms is no more, so removing from default_sms_application
2015-07-08 23:10:53 +00:00
Sasha Levitskiy
ce3da9839c am 12328ef4: Merge "Fingerprint: Add post enroll interface." into mnc-dev
* commit '12328ef422027f2f5f033ed65c8a09535f9ca81d':
  Fingerprint: Add post enroll interface.
2015-07-08 23:10:49 +00:00
Ian Pedowitz
224f0369ca Merge "com.android.mms is no more, so removing from default_sms_application" into mnc-dev 2015-07-08 23:01:19 +00:00
Ian Pedowitz
de8d3a53a8 com.android.mms is no more, so removing from default_sms_application
Fixing a minor comment typo

Bug: 22333078
Change-Id: Id2df5805567967fcf5544dca0264e130b46b4858
2015-07-08 23:00:22 +00:00
Sasha Levitskiy
12328ef422 Merge "Fingerprint: Add post enroll interface." into mnc-dev 2015-07-08 22:59:51 +00:00
Sasha Levitskiy
e0943cf566 Fingerprint: Add post enroll interface.
Bug: 22007124
Change-Id: I9b74edd8e34eaf9ab559b6dc20030a95fa3ce321
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2015-07-08 15:38:07 -07:00
Jeff Sharkey
093be69c41 am f3d73162: am 46552cff: am 9d587a97: Merge changes I9971c466,Ib42474fd into mnc-dev
* commit 'f3d731620bf5a77ed438a3a7d4329b7a205376f0':
  Kill MediaProvider during drastic changes.
  Use best volume description for MTP.
2015-07-08 22:30:26 +00:00
Jeff Sharkey
e232afca82 am 95661575: am 612aac4e: am c66b90fe: Merge "Generate stable MTP storage IDs." into mnc-dev
* commit '95661575a058f72ec6db5f455b6319816334a5ee':
  Generate stable MTP storage IDs.
2015-07-08 22:30:20 +00:00
Jeff Sharkey
46552cfff1 am 9d587a97: Merge changes I9971c466,Ib42474fd into mnc-dev
* commit '9d587a97b9cf89f85d1782a6af66bff487568945':
  Kill MediaProvider during drastic changes.
  Use best volume description for MTP.
2015-07-08 22:01:32 +00:00
Jeff Sharkey
612aac4e50 am c66b90fe: Merge "Generate stable MTP storage IDs." into mnc-dev
* commit 'c66b90fecd06691535157e6b00088de61b51dc41':
  Generate stable MTP storage IDs.
2015-07-08 22:01:28 +00:00
Jeff Sharkey
9d587a97b9 Merge changes I9971c466,Ib42474fd into mnc-dev
* changes:
  Kill MediaProvider during drastic changes.
  Use best volume description for MTP.
2015-07-08 21:55:54 +00:00
Jeff Sharkey
c66b90fecd Merge "Generate stable MTP storage IDs." into mnc-dev 2015-07-08 21:55:15 +00:00