Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
204,442 Commits 3 Branches 0 Tags
486fdeca120cbb4209159af46d92842e9779f9d4
Commit Graph

50180 Commits

Author SHA1 Message Date
Chet Haase
486fdeca12 am 00adea5f: am 3e75ef10: am fcba54eb: am d3f327be: Merge "Localize SimpleMonthView" into mnc-dev 
* commit '00adea5f6456a207a806fc20a5123821520c1e45':
  Localize SimpleMonthView
 2015-07-18 00:11:29 +00:00
Chet Haase
3e75ef102e am fcba54eb: am d3f327be: Merge "Localize SimpleMonthView" into mnc-dev 
* commit 'fcba54eb88e8f4ef867d2205485e391d9855ef4a':
  Localize SimpleMonthView
 2015-07-17 23:41:11 +00:00
Chet Haase
fcba54eb88 am d3f327be: Merge "Localize SimpleMonthView" into mnc-dev 
* commit 'd3f327be2d1f8facd709895f2d05757351e8be07':
  Localize SimpleMonthView
 2015-07-17 23:31:44 +00:00
Chet Haase
d3f327be2d Merge "Localize SimpleMonthView" into mnc-dev 2015-07-17 23:28:15 +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
Tingting Wang
435d6efc45 am cee00433: am b1322a2a: am 6aee4761: am ad359f2e: Merge "Revert "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev 
* commit 'cee004330e0e7f928437a7b17e6263a1b12bfa8f':
  Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."
 2015-07-17 19:23:23 +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
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
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
Chien-Yu Chen
a66ff7736f am 39b3013d: am fe13f57f: am 98977fa0: am aa9a27bb: Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev 
* commit '39b3013dfed727ed9273b377d5998a442d931fac':
  Camera2: Update FAST mode for EE and NR
 2015-07-17 17:47:48 +00:00
Eino-Ville Talvala
5c24b98ca2 am 02d3199d: am 5e20e0c9: am 69508f49: am 6e8a551f: Merge "Camera2: Add hidden experimental tearDown method" into mnc-dev 
* commit '02d3199dbe9d1d59e2ef288e5e170248e1d52bd4':
  Camera2: Add hidden experimental tearDown method
 2015-07-17 17:47:42 +00:00
Nancy Chen
7688014d4f am a48413e2: am f9b4961d: am ce9fea39: am 660322d8: Merge "Add transcription field to voicemail object and related changes." into mnc-dev 
* commit 'a48413e28b92e10a96af98e600c56124cd491365':
  Add transcription field to voicemail object and related changes.
 2015-07-17 17:33:20 +00:00
Chien-Yu Chen
fe13f57f95 am 98977fa0: am aa9a27bb: Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev 
* commit '98977fa042deb2109d7869f6217447d0c4387e08':
  Camera2: Update FAST mode for EE and NR
 2015-07-17 17:20:09 +00:00
Eino-Ville Talvala
5e20e0c902 am 69508f49: am 6e8a551f: Merge "Camera2: Add hidden experimental tearDown method" into mnc-dev 
* commit '69508f494e46d9055cb424d480bb48d433ad3462':
  Camera2: Add hidden experimental tearDown method
 2015-07-17 17:20:05 +00:00
Chien-Yu Chen
98977fa042 am aa9a27bb: Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev 
* commit 'aa9a27bb9bbfb4bccf999a0d453f4f4d853aac36':
  Camera2: Update FAST mode for EE and NR
 2015-07-17 17:06:02 +00:00
Eino-Ville Talvala
69508f494e am 6e8a551f: Merge "Camera2: Add hidden experimental tearDown method" into mnc-dev 
* commit '6e8a551f9f7691e3d7ada46eeae5d2cc612d7938':
  Camera2: Add hidden experimental tearDown method
 2015-07-17 17:05:54 +00:00
Nancy Chen
f9b4961da0 am ce9fea39: am 660322d8: Merge "Add transcription field to voicemail object and related changes." into mnc-dev 
* commit 'ce9fea390c86f4e7725d2f7486cf97d56fdda5df':
  Add transcription field to voicemail object and related changes.
 2015-07-17 17:05:36 +00:00
Chien-Yu Chen
aa9a27bb9b Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev 2015-07-17 17:01:30 +00:00
Eino-Ville Talvala
6e8a551f9f Merge "Camera2: Add hidden experimental tearDown method" into mnc-dev 2015-07-17 16:54:09 +00:00
Nancy Chen
ce9fea390c am 660322d8: Merge "Add transcription field to voicemail object and related changes." into mnc-dev 
* commit '660322d8259cb256745f15219af0b9004063ea8d':
  Add transcription field to voicemail object and related changes.
 2015-07-17 16:50:52 +00:00
Nancy Chen
660322d825 Merge "Add transcription field to voicemail object and related changes." into mnc-dev 2015-07-17 16:37:43 +00:00
Neil Fuller
1913dc11b1 resolved conflicts for merge of 71165ea6 to mnc-dr-dev-plus-aosp 
Change-Id: I21f2f14186965bdfc66ed3a2e6957d613837e138
 2015-07-17 11:42:55 +01:00
Neil Fuller
7ce3847d75 Merge "Migrate Resources.java to use ICU4j drectly." 2015-07-17 10:09:25 +00:00
Selim Cinek
56c4cef8dc am 3967be02: am b59d3820: am 928b2bf7: am b43b06d1: Merge "Fixed a bug where notifications were not posted on secondary users" into mnc-dev 
* commit '3967be028d4009167b323491de12f8fff890054c':
  Fixed a bug where notifications were not posted on secondary users
 2015-07-17 02:24:41 +00:00
Dan Sandler
1663c5e91c am 19d6dae4: am cfaf2d54: am 8f895de9: am 86647987: Icon-related Notifications API changes: 
* commit '19d6dae447860c332501f7284e97c2734f7a040e':
  Icon-related Notifications API changes:
 2015-07-17 01:54:42 +00:00
Selim Cinek
b59d38201b am 928b2bf7: am b43b06d1: Merge "Fixed a bug where notifications were not posted on secondary users" into mnc-dev 
* commit '928b2bf7ae382ad34a741b6681d8c864ac457c4c':
  Fixed a bug where notifications were not posted on secondary users
 2015-07-17 01:54:26 +00:00
Selim Cinek
928b2bf7ae am b43b06d1: Merge "Fixed a bug where notifications were not posted on secondary users" into mnc-dev 
* commit 'b43b06d1056031444596edcc27a1a10084e5cad3':
  Fixed a bug where notifications were not posted on secondary users
 2015-07-17 01:40:06 +00:00
Nancy Chen
5bd3e73a21 Add transcription field to voicemail object and related changes. 
Bug: 22542002
Change-Id: I05c18e8f82a4f318fb59228e4d6eb844d64bee30
 2015-07-16 18:36:58 -07:00
Selim Cinek
b43b06d105 Merge "Fixed a bug where notifications were not posted on secondary users" into mnc-dev 2015-07-17 01:31:31 +00:00
Dan Sandler
cfaf2d54cb am 8f895de9: am 86647987: Icon-related Notifications API changes: 
* commit '8f895de9f43f661218fcc519d3722c0af5e5488b':
  Icon-related Notifications API changes:
 2015-07-17 01:25:49 +00:00
Adam Powell
7e89a40c2e am e0968e14: am cb29a8a1: am 2fca4812: am 9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev 
* commit 'e0968e14e46c941434f28ec633473d49b9583bf9':
  Update ChooserTarget constructor to take ComponentName, Bundle
 2015-07-17 01:17:25 +00:00
Dan Sandler
8f895de9f4 am 86647987: Icon-related Notifications API changes: 
* commit '86647987c3c6bf4e6a8bacd763ff16f1806c70a3':
  Icon-related Notifications API changes:
 2015-07-17 01:09:48 +00:00
Dan Sandler
86647987c3 Icon-related Notifications API changes: 
- Deprecate Notification.icon and largeIcon.
    setSmallIcon(Icon) and setLargeIcon(Icon) should be used
    instead.
  - Add Icon support to Notification actions; deprecate
    Action.icon and methods/ctors that use int.

Bug: 21310773
Bug: 21271587
Change-Id: Iddac8121e7690e9d7a0360edb488ab77e3e8fb3a
 2015-07-17 00:59:20 +00:00
Adam Powell
cb29a8a17a am 2fca4812: am 9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev 
* commit '2fca4812336476e7c000214109b6c06b401986c2':
  Update ChooserTarget constructor to take ComponentName, Bundle
 2015-07-17 00:50:06 +00:00
Svet Ganov
b958795675 am 1d75ba1b: am 69fd08a0: am b0f8fee8: am 6f561a24: Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev 
* commit '1d75ba1bce3a69cc6b5fa018f64e0ef7e67f3e2f':
  Improve documentation of onRequestPermissionsResult
 2015-07-17 00:49:55 +00:00
Adam Powell
2fca481233 am 9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev 
* commit '9ba039bbe9478c56ae3875a9933d3ba754367dc2':
  Update ChooserTarget constructor to take ComponentName, Bundle
 2015-07-17 00:32:58 +00:00
Adam Powell
9ba039bbe9 Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev 2015-07-17 00:25:11 +00:00
Selim Cinek
f33b11182a Fixed a bug where notifications were not posted on secondary users 
Unfortunately they made sound though, driving people crazy.

Bug: 22351758
Change-Id: I9ec5bac97c2d587c4e356ab759876def3369b11a
 2015-07-16 17:24:51 -07:00
Svet Ganov
69fd08a090 am b0f8fee8: am 6f561a24: Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev 
* commit 'b0f8fee845fa2e41ea1e003e413c3df59d641137':
  Improve documentation of onRequestPermissionsResult
 2015-07-17 00:19:30 +00:00
Svet Ganov
b0f8fee845 am 6f561a24: Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev 
* commit '6f561a24c97d25a858cf98eef5c502ef8d80cfc1':
  Improve documentation of onRequestPermissionsResult
 2015-07-17 00:03:30 +00:00
Svet Ganov
6f561a24c9 Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev 2015-07-16 23:51:53 +00:00
Adam Powell
666d82a6d5 Update ChooserTarget constructor to take ComponentName, Bundle 
Simplify ChooserTarget handling by requiring a target component and an
extras bundle instead of a full PendingIntent/IntentSender. This
simplifies the handling of URI grants from sending apps.

Prune ChooserTargets that point at ComponentNames that don't share a
package with the original matching Activity target or that aren't
exported so that we don't show the user something they can't launch.

Bug 22516282

Change-Id: I3439c0910b4fa4f95c7a881b529942c96ffc953e
 2015-07-16 16:29:59 -07:00
Svet Ganov
0f45c7c7c4 Improve documentation of onRequestPermissionsResult 
bug:22524902

Change-Id: Ic435171fa016d8841bea432c5c39d7b0a6a7b9e9
 2015-07-16 16:29:04 -07:00
Svet Ganov
71d12704f6 am 475858c3: am b295963b: am c00e49b6: am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev 
* commit '475858c34d21b38d9be4356a7fc654eb879e34b5':
  Add APIs for verifier to grant at install and revoke permissions
 2015-07-16 23:05:41 +00:00
Svet Ganov
b295963bae am c00e49b6: am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev 
* commit 'c00e49b6e4e4cc8356529567040d6ee3be8c1dc3':
  Add APIs for verifier to grant at install and revoke permissions
 2015-07-16 22:38:13 +00:00
Dianne Hackborn
ee924dedcc am 587f0c58: am 61f0aec4: am 9236af43: am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 
* commit '587f0c58f506b167667c789c16292c4e405eac1f':
  Work on issue #22516282: ChooserTarget URI grants not forwarded
 2015-07-16 22:36:06 +00:00
Svet Ganov
c00e49b6e4 am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev 
* commit 'd4b566bf56333de708908ce4accb5fb067be64f0':
  Add APIs for verifier to grant at install and revoke permissions
 2015-07-16 22:23:38 +00:00
Svet Ganov
d4b566bf56 Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev 2015-07-16 22:22:01 +00:00
Dianne Hackborn
61f0aec4f3 am 9236af43: am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 
* commit '9236af43d8418459b939049d4e7a092d2b58bff8':
  Work on issue #22516282: ChooserTarget URI grants not forwarded
 2015-07-16 22:11:51 +00:00
Eino-Ville Talvala
14c09fa3c5 Camera2: Add hidden experimental tearDown method 
Bug: 18949148
Change-Id: I6264d95a26ebf51cce6114c9a86b9561f7c60ab5
 2015-07-16 14:55:26 -07:00