Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
198,913 Commits 3 Branches 0 Tags
b694c8dfd3452d2b5cba263d309f7bf37cb19403
Commit Graph

11028 Commits

Author SHA1 Message Date
Amit Mahajan
9d651cc391 am 486b9f62: am a252bece: am 48cf298c: Merge "Change to hide BEARER_BITMASK." into mnc-dev 
* commit '486b9f620c15502539c7bc7f62d991db1eea972f':
  Change to hide BEARER_BITMASK.
 2015-06-05 18:57:55 +00:00
Amit Mahajan
48cf298cb8 Merge "Change to hide BEARER_BITMASK." into mnc-dev 2015-06-05 18:24:05 +00:00
ztenghui
31850fa2c7 am 1cb56398: am 743c5c76: am e1352de6: Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev 
* commit '1cb56398adf33e1bc8919f044bf8869323fa816b':
  Setup the animation callback for AnimatedVectorDrawable
 2015-06-05 17:14:36 +00:00
ztenghui
e1352de673 Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev 2015-06-05 16:37:10 +00:00
Chet Haase
0490163d45 am e5b5dda1: am aa365cc5: am e790c977: Hide View.getBackgroundColor() prior to removal 
* commit 'e5b5dda19e90b81a31f0b1800e58aafb3c6665e4':
  Hide View.getBackgroundColor() prior to removal
 2015-06-05 15:18:58 +00:00
Chet Haase
e790c97787 Hide View.getBackgroundColor() prior to removal 
Issue #21572678  API Review: android.view.View.getBackgroundColor()

Change-Id: Ia4fa9e207db3af6e076581bf23747eba6e56bb69
 2015-06-05 14:41:51 +00:00
Clara Bayarri
b1d4d77d6a am 612e1da8: am f407aa30: am c1f28bc9: Merge "Separate the SelectionActionMode into Insertion and Selection." into mnc-dev 
* commit '612e1da808b327aba06be883a54dc08f9afd6dd2':
  Separate the SelectionActionMode into Insertion and Selection.
 2015-06-05 01:18:32 +00:00
Johnson Hsieh
1ddd35c454 am 01f77af0: am 37750c28: am 6c72febd: Merge "Updates AlarmClock intent API." into mnc-dev 
* commit '01f77af0480a07e1a6420d9d9d7efaa52b5a933d':
  Updates AlarmClock intent API.
 2015-06-05 00:49:01 +00:00
Clara Bayarri
c1f28bc97d Merge "Separate the SelectionActionMode into Insertion and Selection." into mnc-dev 2015-06-05 00:40:43 +00:00
Johnson Hsieh
6c72febd35 Merge "Updates AlarmClock intent API." into mnc-dev 2015-06-04 23:34:50 +00:00
Adam Powell
dd3cda73ff am 1cf4c2c3: am 8e44ec0e: am 2b710c29: Merge "Add DENSITY_360" into mnc-dev 
* commit '1cf4c2c3b62e4b3a193b809191348896f6f413fe':
  Add DENSITY_360
 2015-06-04 20:39:14 +00:00
ztenghui
83a52031fd Setup the animation callback for AnimatedVectorDrawable 
b/21341096

Change-Id: I84e20366db21ceaa4f044be3e322f9215bb06ad2
 2015-06-04 12:55:21 -07:00
Clara Bayarri
7938cdbf98 Separate the SelectionActionMode into Insertion and Selection. 
When we got rid of the paste popup, we merged it into the Selection
ActionMode and moved all its invocations to the ActionMode. Some apps
actually want the paste popup without the Selection ActionMode, hence
separating them again allows them to cancel the one they want.

Bug: 21571422
Change-Id: I91bcd0d9c3e68d9c736698fe0bec010b4c9f5cf3
 2015-06-04 20:46:19 +01:00
Dianne Hackborn
a3601ad430 am 4752d671: am 7771406d: am b0a5e78f: Merge "More API changes." into mnc-dev 
* commit '4752d671f2789cb0a369a6bd4d9a1188fb46f042':
  More API changes.
 2015-06-04 19:33:01 +00:00
Johnson Hsieh
1ef714a284 Updates AlarmClock intent API. 
Changes to the AlarmClock intent API based on feedback from Alarm team:

1. s/VOICE_CANCEL_ALARM/DISMISS_ALARM/g - "Cancel" is a bit unclear, so we're
changing it to "dismiss". Also, remove "VOICE_" since we should also add
support for this in multi-modal.

2. Removed DELETE_ALARM - we will likely not complete this for Android M.

3. Removed ALARM_SEARCH_MODE_NONE = "none". Instead, if
EXTRA_ALARM_SEARCH_MODE is missing (and alarm data URI is not given), then:
* If exactly one active alarm exists, it is dismissed.
* If more than one active alarm exists, the user is prompted to choose
  the alarm to dismiss.

4. Add ALARM_SEARCH_MODE_LABEL, which allows searching for alarms by a
(partially) matching label.

5. Add SNOOZE_ALARM for snoozing an alarm, with optional
extra EXTRA_ALARM_SNOOZE_DURATION.

Change-Id: I39502532e54d5f0fe51a8545a4c586615f5e5e89
 2015-06-04 10:43:19 -07:00
Adam Powell
f6d9cd19e2 Add DENSITY_360 
Add 360dpi as a supported screen density to closer match some
hardware's physical specifications. This gives a dp multiplier of
2.25.

Bug 19529059

Change-Id: Ibf9c768fba53765ea684ff228d24caf091f27a3e
 2015-06-04 10:41:44 -07:00
Dianne Hackborn
b0a5e78fc0 Merge "More API changes." into mnc-dev 2015-06-04 16:56:52 +00:00
Zhijun He
fee4ce570d am a64b64c8: am f9c6becf: am b7c3e931: Merge "Camera2: add high speed video APIs" into mnc-dev 
* commit 'a64b64c803fda3b2e44cbefd5f703ce47d153046':
  Camera2: add high speed video APIs
 2015-06-04 02:29:31 +00:00
Zhijun He
2dd3b31620 am f1d6b42a: am 9b2cf052: am b3c27b18: Merge "camera_metadata: update high speed video recording API" into mnc-dev 
* commit 'f1d6b42a7fd8b12a5422a2304f2ef2bd495b48d3':
  camera_metadata: update high speed video recording API
 2015-06-04 02:29:24 +00:00
Zhijun He
b1300e39c7 Camera2: add high speed video APIs 
Interface only.

Bug: 21442271
Change-Id: If81caa0f2dc9f7802af564abcd9541aff3e30901
 2015-06-03 17:50:22 -07:00
Zhijun He
fab663ebfd camera_metadata: update high speed video recording API 
Update high speed video recording API to support batch mode recording.

Bug: 21442271
Change-Id: I62de6067c75fcfbe6320dd987cce65843d810021
 2015-06-03 17:45:48 -07:00
Raph Levien
8746623e3c am 7f374287: am 85e9092d: am 88ac4e04: Merge "Rename setTextDir to setTextDirection" into mnc-dev 
* commit '7f374287c418fd66299be4db36db21e5ab04740a':
  Rename setTextDir to setTextDirection
 2015-06-03 23:46:42 +00:00
Svetoslav
a44af6271b am 3f8a2f73: am 21ec5f62: am 597059d5: Merge "Adding missing permission API to fragment" into mnc-dev 
* commit '3f8a2f73ec6ac236e31de8c660c4d373538c7e63':
  Adding missing permission API to fragment
 2015-06-03 23:31:51 +00:00
Raph Levien
88ac4e04a5 Merge "Rename setTextDir to setTextDirection" into mnc-dev 2015-06-03 23:09:49 +00:00
Svetoslav
a2011d232b Adding missing permission API to fragment 
Change-Id: I90309a23a08a82f0ab93eb4f6185db09e035aac1
 2015-06-03 15:43:59 -07:00
Tyler Gunn
ad05223e19 am 5383a6c5: am 926c9527: am bb6d0605: Merge "API Cleanup: Remove VideoState class." into mnc-dev 
* commit '5383a6c526d6a9d6bedf4a8b381cdcfde7dfd36f':
  API Cleanup: Remove VideoState class.
 2015-06-03 22:21:50 +00:00
Raph Levien
a6a082862b Rename setTextDir to setTextDirection 
StaticLayout.Builder used "setTextDir" as a shorthand, but it's not
as clear as spelling it out. So, setTextDirection.

Bug: 21572282
Change-Id: Ia94476562d70678f963196b87bb63511d30836b6
 2015-06-03 13:20:45 -07:00
Soonil Nagarkar
f4143f53b0 am e61193b7: am a07d0a88: am 597492c9: Add NO_BATCH flag to WifiScanner 
* commit 'e61193b7b3dc7ab1a08e41c56e9814c244c93a75':
  Add NO_BATCH flag to WifiScanner
 2015-06-03 17:36:47 +00:00
Tyler Gunn
bb6d060585 Merge "API Cleanup: Remove VideoState class." into mnc-dev 2015-06-03 17:13:41 +00:00
Tyler Gunn
87b73f370e API Cleanup: Remove VideoState class. 
- Remove VideoState class.
- Replace references to VideoState constants with VideoProfile equivalent.
- Push VideoState static methods into VideoProfile.

Bug: 21573551
Change-Id: I1bca02772b5b7d86643f612824b07faef7618725
 2015-06-03 10:09:59 -07:00
Soonil Nagarkar
597492c963 Add NO_BATCH flag to WifiScanner 
Change-Id: Idd521f724684986ff84306327d42b810f7b30245
(cherry picked from commit b9e6d98c6c)
 2015-06-03 05:17:57 +00:00
Alan Viverette
d03a54140d am 14d8afc6: am 4156c870: am e25f6587: Merge "API review feedback for ThemedSpinnerAdapter, Spinner" into mnc-dev 
* commit '14d8afc62f8665def5daec10b6abdf8dc7d52d76':
  API review feedback for ThemedSpinnerAdapter, Spinner
 2015-06-03 02:36:04 +00:00
Jonathan Basseri
28dc39fd59 am b3aebbbe: am ec756014: am 97769b0c: Merge "Migrating MmsConfig to CarrierConfigManager." into mnc-dev 
* commit 'b3aebbbee6e1fd1607a798239813321dc68c8e17':
  Migrating MmsConfig to CarrierConfigManager.
 2015-06-03 02:35:48 +00:00
Dianne Hackborn
69c6adc96e More API changes. 
Start moving Assist* stuff to android.app.assist.

Clean up some more of the VoiceInteractionSession APIs.

Clearly document that finish() is not the same as hide(),
always call hide() instead, and fix the finish() path to
also always do a hide to make sure everything is cleaned
up correctly.

Change-Id: I962d4069fcb34fe89547a95d395ae1b9fa3b4148
 2015-06-02 16:56:41 -07:00
Alan Viverette
e25f6587d8 Merge "API review feedback for ThemedSpinnerAdapter, Spinner" into mnc-dev 2015-06-02 23:51:07 +00:00
Jonathan Basseri
97769b0c43 Merge "Migrating MmsConfig to CarrierConfigManager." into mnc-dev 2015-06-02 23:14:45 +00:00
Jorim Jaggi
4bb01f1b11 am ecfeefb4: am f7f90276: am 7d01d2c6: Merge "Fix API review: Camera prewarm" into mnc-dev 
* commit 'ecfeefb483a7a7ab33aae22ae85ccbdaa3a68522':
  Fix API review: Camera prewarm
  lock device orientation during app compatibility test
  Fix reconfigure & setPremult alpha handling
  Unflip TextureView getBitmap readback
  Handle error states when refreshing accessibility node
 2015-06-02 23:05:36 +00:00
Nicolas Prevot
ca595cf8f3 am 8a4dbac5: am 83366d50: am db6ac0e9: Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-dev 
* commit '8a4dbac59894a7dab930b52f3f0d8c6826eef2c4':
  Make ACTION_PROVISION_MANAGED_DEVICE public.
 2015-06-02 22:46:59 +00:00
Brian Attwell
da7f4e4a40 am f079779a: am cd5e25c1: am c7a4eabe: Merge "Rename PhoneNumberUtils APIs" into mnc-dev 
* commit 'f079779aeddf5dd1b71223b4b296ae325422e83f':
  Rename PhoneNumberUtils APIs
 2015-06-02 22:42:15 +00:00
Svetoslav
f81b973687 am 12e7abc6: am 703c7f9e: am c5ff0020: Merge "Add API to hint whether to show on-board UI before a permission request." into mnc-dev 
* commit '12e7abc65971832285c873aa78d9b08d862f7d70':
  Add API to hint whether to show on-board UI before a permission request.
 2015-06-02 22:28:59 +00:00
Jorim Jaggi
7d01d2c6cf Merge "Fix API review: Camera prewarm" into mnc-dev 2015-06-02 22:25:29 +00:00
Nicolas Prevot
db6ac0e912 Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-dev 2015-06-02 22:11:11 +00:00
Brian Attwell
c7a4eabe98 Merge "Rename PhoneNumberUtils APIs" into mnc-dev 2015-06-02 22:02:24 +00:00
Jonathan Basseri
8b3c9e4066 am 48cdd81f: am 8d1dcc17: am abdf79ab: Merge "Revert "Migrating MmsConfig to CarrierConfigManager."" into mnc-dev 
* commit '48cdd81fb326622a4458f4b1b8c9581084efc8d0':
  Revert "Migrating MmsConfig to CarrierConfigManager."
 2015-06-02 21:58:33 +00:00
Alan Viverette
2add9bcf8c API review feedback for ThemedSpinnerAdapter, Spinner 
Moves themed interface out of Spinner and extends SpinnerAdapter, updates
Spinner constructor to take a Theme rather than a Context.

Does NOT change BaseAdapter to implement ThemedSpinnerAdapter, because
the BaseAdapter class does not have any notion of layout inflation and
that would break the contract implied by ThemedSpinnerAdapter.

Bug: 21571899
Change-Id: Id7e8d630458857ce6c93a6a8b8f920e169ee1152
 2015-06-02 14:54:40 -07:00
Svetoslav
c5ff0020a2 Merge "Add API to hint whether to show on-board UI before a permission request." into mnc-dev 2015-06-02 21:53:20 +00:00
Svetoslav
20770ddbd4 Add API to hint whether to show on-board UI before a permission request. 
bug:21511988

Change-Id: I9d1d7adf34b68074e65510f53b6e642cf784cf6b
 2015-06-02 14:48:38 -07:00
Brian Attwell
115c04410e Rename PhoneNumberUtils APIs 
In response to more API review.

Bug: 21571895
Change-Id: Ia1fa69da07a3427997919ba61c77fcbad7e79f2a
 2015-06-02 21:34:33 +00:00
Jonathan Basseri
f31ac338af Migrating MmsConfig to CarrierConfigManager. 
Define variables in CarrierConfigManager that mirror those in
SmsManager. These will replace MmsConfig. The literal values had to be
moved into this class because classes in frameworks/base/telephony
cannot reference classes in frameworks/opt/telephony.

There is no change to the SmsManager API, but the data available from
SmsManager#getCarrierConfigValues is moving from mms_config.xml files
into the new carrier config API.

This was originally Change-Id: I8a88f46c770ddcb3ac6988c29d86f0ca1f211f4a

Bug: 21085630
Change-Id: I5a55873465c36ea8a7e3915b8b98a65b47c60dfa
 2015-06-02 14:29:04 -07:00
Brian Attwell
df336c9064 am 6b37b0df: am 03c818b5: am b36ad5dc: Decouple ProviderStatus & internal provider state 
* commit '6b37b0df1102f0f7f3336638a68defba197d1910':
  Decouple ProviderStatus & internal provider state
 2015-06-02 21:27:59 +00:00