Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
201,957 Commits 3 Branches 0 Tags
06b9ede56500a4bf4dcc3ecbed331ce5fd606088
Commit Graph

11240 Commits

Author SHA1 Message Date
Adam Powell
ed213cfea3 am 0f6dd549: am 7fd90265: am 2a1f9164: Merge "Un-hide ViewGroup#onViewAdded/onViewRemoved" into mnc-dev 
* commit '0f6dd54943f3b343406c655d3efc392ede0cf0ea':
  Un-hide ViewGroup#onViewAdded/onViewRemoved
 2015-06-18 17:57:51 +00:00
Adam Powell
2a1f916418 Merge "Un-hide ViewGroup#onViewAdded/onViewRemoved" into mnc-dev 2015-06-18 17:20:44 +00:00
Adam Powell
6690d018b9 Un-hide ViewGroup#onViewAdded/onViewRemoved 
These methods are generally useful for writing custom views, and by
exposing them we make it easier for custom view authors to still allow
app developers to use an OnHierarchyChangedListener since it will not
be occupied by a custom view's implementation.

Also move the actual dispatch to package-scoped dispatch methods so
that a developer forgetting to call super won't stop a listener from
functioning.

Bug 21866523

Change-Id: Ie2bb5e241d7c5a02a5033f33ecdaeb40aceb20b5
 2015-06-18 10:19:18 -07:00
Craig Lafayette
9faad27a1e am 2cabb0da: am a4e0fca0: am b4c46909: Merge "Remove FRP wipe support for device initializers" into mnc-dev 
* commit '2cabb0da0c5b09f3736c61a7eea74ee947182702':
  Remove FRP wipe support for device initializers
 2015-06-18 16:19:34 +00:00
Craig Lafayette
b4c469095f Merge "Remove FRP wipe support for device initializers" into mnc-dev 2015-06-18 15:44:49 +00:00
Tomasz Mikolajewski
58461ebdef am 87a45380: am 456778ff: am 9ce9ffec: Merge "Allow to customize title of the dialog." into mnc-dev 
* commit '87a4538034d41964ed81b69749939c1868505847':
  Allow to customize title of the dialog.
 2015-06-18 00:31:20 +00:00
Tomasz Mikolajewski
9ce9ffec9e Merge "Allow to customize title of the dialog." into mnc-dev 2015-06-17 23:51:07 +00:00
Raph Levien
d5a0e5c84b am fc40d939: am efe1f4bb: am 8872ca4d: Merge "Remove indents from TextView" into mnc-dev 
* commit 'fc40d939819dca79cd02b7be93531cf2268bb9fa':
  Remove indents from TextView
 2015-06-17 23:41:15 +00:00
Dianne Hackborn
22afc5469e am 2133afc7: am d21b695f: am 22433a33: Merge "Fix issue #21814207 and issue #21814212 (alarm manager)" into mnc-dev 
* commit '2133afc77aa36f186b9e5c0ff9954d0d26848e3e':
  Fix issue #21814207 and issue #21814212 (alarm manager)
 2015-06-17 23:27:55 +00:00
Tomasz Mikolajewski
0e591f95bd Allow to customize title of the dialog. 
TEST=adb shell am start -a android.intent.action.OPEN_DOCUMENT -e
     android.intent.extra.TITLE 'Upload!' -t "text/plain"
BUG=19150996

Change-Id: Ibded6cfaa2de3698c5eada154efbee2b323464d4
 2015-06-17 16:12:14 -07:00
Raph Levien
8872ca4d55 Merge "Remove indents from TextView" into mnc-dev 2015-06-17 23:06:17 +00:00
Raph Levien
8edac58e55 Remove indents from TextView 
On more careful reflection, the "indents" feature was not ready for
inclusion in the public API. It is still available at a lower level
in StaticLayout.

Also fix a minor typo in the doc for breakStrategy.

Bug: 20641996
Change-Id: I5cd976a536c48615980860396b1564b51b19e14a
 2015-06-17 15:53:33 -07:00
Dianne Hackborn
22433a337a Merge "Fix issue #21814207 and issue #21814212 (alarm manager)" into mnc-dev 2015-06-17 22:18:37 +00:00
Chris Manton
5d0098e3f9 am 054088ce: am 4b4495f0: am 69dd4bba: Merge "Add keys to handle GSM and CDMA roaming/non roaming overrides" into mnc-dev 
* commit '054088cec2f19870ab40512c9222d70cc147f6dd':
  Add keys to handle GSM and CDMA roaming/non roaming overrides
 2015-06-17 21:57:24 +00:00
Alan Viverette
2d5b72f991 am 5949a974: am 357ea6a6: am 95b6fdeb: Merge "Refactor Drawable.getDither() to isDither()" into mnc-dev 
* commit '5949a974bcda214fb8ce43d6ec655bd066a4b930':
  Refactor Drawable.getDither() to isDither()
 2015-06-17 21:38:56 +00:00
Chris Wren
ae62d12cc2 am 93b046d6: am 65d94514: am e222a444: Merge "Revert "remove setLatestEventInfo"" into mnc-dev 
* commit '93b046d64f1eb0628edb9804b99dcc95535bceef':
  Revert "remove setLatestEventInfo"
 2015-06-17 21:38:50 +00:00
Chris Manton
69dd4bba65 Merge "Add keys to handle GSM and CDMA roaming/non roaming overrides" into mnc-dev 2015-06-17 21:21:40 +00:00
Alan Viverette
95b6fdebb4 Merge "Refactor Drawable.getDither() to isDither()" into mnc-dev 2015-06-17 21:06:07 +00:00
Adam Powell
5407bdcc34 am c0611fd7: am fb1fdca9: am 074c3404: Merge "Add matching xml attributes for existing Toolbar properties" into mnc-dev 
* commit 'c0611fd77e27addfdef8a2b870328b4985d28b91':
  Add matching xml attributes for existing Toolbar properties
 2015-06-17 21:03:52 +00:00
Chris Wren
e222a44429 Merge "Revert "remove setLatestEventInfo"" into mnc-dev 2015-06-17 21:03:24 +00:00
Chris Wren
dfdb52abe6 Revert "remove setLatestEventInfo" 
This reverts commit 965097321d.

Change-Id: I658bb2611fe8f983309e962d6772d1bd80ed586e
 2015-06-17 21:03:11 +00:00
Alan Viverette
373954a1fd Refactor Drawable.getDither() to isDither() 
Bug: 21342040
Change-Id: I801970c2a25289d670636ad5387ddf244fb48225
 2015-06-17 13:59:31 -07:00
Chris Wren
1ff7230073 am 824bd9e0: am 59489bb3: am c20c1eec: Merge "remove setLatestEventInfo" into mnc-dev 
* commit '824bd9e0f2eda6ded723a512a579965364337987':
  remove setLatestEventInfo
 2015-06-17 20:41:33 +00:00
Dianne Hackborn
6bb88e5c8b am 5416c2ec: am 181f99e3: am d1419ed2: Merge "Bring back screenshot API." into mnc-dev 
* commit '5416c2ecf8650d76be88624f790ae69c666f6d5c':
  Bring back screenshot API.
 2015-06-17 20:25:07 +00:00
Adam Powell
074c340420 Merge "Add matching xml attributes for existing Toolbar properties" into mnc-dev 2015-06-17 20:22:37 +00:00
Chris Wren
c20c1eec9e Merge "remove setLatestEventInfo" into mnc-dev 2015-06-17 20:05:11 +00:00
Dianne Hackborn
d1419ed29a Merge "Bring back screenshot API." into mnc-dev 2015-06-17 19:47:11 +00:00
Junda Liu
d21677e76c am 425ae5d0: am 0cae34a5: am a5aabfeb: Merge "Add carrier config variable to hide sim lock setting ui." into mnc-dev 
* commit '425ae5d03857db19d8c5392d22228928053acb9b':
  Add carrier config variable to hide sim lock setting ui.
 2015-06-17 18:51:37 +00:00
Dianne Hackborn
a750a63d63 Fix issue #21814207 and issue #21814212 (alarm manager) 
Issue #21814207: AlarmManager.setAndAllowWhileIdle should also allow wake locks.

Introduce a whole new infrastructure for providing options when
sending broadcasts, much like ActivityOptions.  There is a single
option right now, asking the activity manager to apply a tempory
whitelist to each receiver of the broadcast.

Issue #21814212: Need to allow configuration of alarm manager parameters

The various alarm manager timing configurations are not modifiable
through settings, much like DeviceIdleController.  Also did a few
tweaks in the existing DeviceIdleController impl.

Change-Id: Ifd01013185acc4de668617b1e46e78e30ebed041
 2015-06-17 11:41:45 -07:00
Junda Liu
a5aabfebca Merge "Add carrier config variable to hide sim lock setting ui." into mnc-dev 2015-06-17 18:11:03 +00:00
Junda Liu
e15cca771c Add carrier config variable to hide sim lock setting ui. 
Bug: b/19623656
Change-Id: Iee9efcdefe5cdda2adae03f0852ff2b53e75698f
 2015-06-17 10:57:23 -07:00
Chris Manton
ca16a79b18 Add keys to handle GSM and CDMA roaming/non roaming overrides 
bug: 20828356

Change-Id: Icb5ad25e213771554915bd9479a4a66b4f4a6906
 2015-06-17 08:25:48 -07:00
Dianne Hackborn
216f5c3347 Bring back screenshot API. 
Change-Id: Ia6bdfa300398d39119239f6a88c9992673edb3e0
 2015-06-16 18:12:31 -07:00
Junda Liu
ca0ff76539 am 603bf00f: am 25acdffa: am a11ffa64: Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev 
* commit '603bf00fcba0e95ed42cd4b9eadd1bfc1b45b28a':
  Remove hide_carrier_network_settings from Settings.
 2015-06-16 23:45:09 +00:00
Junda Liu
a11ffa6436 Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev 2015-06-16 23:11:32 +00:00
Adam Powell
6b3fc9a903 Add matching xml attributes for existing Toolbar properties 
Bug 21010256

Change-Id: I3ac9491d86dd502f7572e37a3c9b70ffb8957ced
 2015-06-16 15:47:52 -07:00
Chirag Shah
e7f39c51cf am 3db44d08: am f40f46e9: am 7f92f067: Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev 
* commit '3db44d08ea8fb083ec952ff647b6037bb9b2253d':
  Allow 3P apps to provide structured data within AssistContent.
 2015-06-16 22:04:11 +00:00
Chirag Shah
7f92f06742 Merge "Allow 3P apps to provide structured data within AssistContent." into mnc-dev 2015-06-16 16:54:03 +00:00
Jeff Sharkey
1142341872 am 10d045cd: am 716978e3: am 2cc03e56: Yet another user restriction. 
* commit '10d045cd08a60403056f90f03b8f79dc0bf18571':
  Yet another user restriction.
 2015-06-16 05:44:15 +00:00
Jeff Sharkey
2cc03e5606 Yet another user restriction. 
Change-Id: Ia2952da19cb974a6a9ba0271a298a10df58b8d18
 2015-06-15 21:50:47 -07:00
Ruben Brunk
86ff6ea3ff am 629923b5: am e9a1f181: am 9a2da54e: Merge "Add metadata for pre-distortion dimensions." into mnc-dev 
* commit '629923b56ece68048b9c3903d7bbfa90ec1493ec':
  Add metadata for pre-distortion dimensions.
 2015-06-16 01:43:32 +00:00
Ruben Brunk
9a2da54e3c Merge "Add metadata for pre-distortion dimensions." into mnc-dev 2015-06-16 01:12:58 +00:00
Ruben Brunk
224eb3a4f1 Add metadata for pre-distortion dimensions. 
Bug: 20491394
Change-Id: I6b95a7fe2fd765571bcd2774aee486d18169a727
 2015-06-15 18:09:33 -07:00
Chirag Shah
61f794a70f Allow 3P apps to provide structured data within AssistContent. 
For providing structured metadata to the assistant, we've decided to
standardize on JSON-LD (met with Paige/Ulas/Fabian), and decided the
data to be specified via:

AssistContent.setStructuredData(String structuredDataJson)

This method can be documented for 3P developers as allowing developers
to provide metadata to the assistant with the JSON-LD standard.

This would be centered more about content displayed on the screen,
rather than actions based, so we added it to the AssistContent class

Updated doc: go/setStructuredData

Change-Id: I816f69fd6896df822e30d6c71d840bd01f47e544
 2015-06-15 17:48:41 -07:00
Junda Liu
25906b095a am 5b26cd31: am b7f9e8a4: am 73d04323: Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." into mnc-dev 
* commit '5b26cd31ee89b17da8c9b25af099d67f961a098c':
  Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager.
 2015-06-16 00:24:45 +00:00
Junda Liu
73d0432324 Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." into mnc-dev 2015-06-15 23:54:38 +00:00
Junda Liu
e478649373 Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager. 
Bug: b/21499566
Change-Id: I9fa33f124e0f617782709597761be75a20797d4b
 2015-06-15 16:12:02 -07:00
Yorke Lee
e981e00b14 am fc86e40d: am 8d308309: am a5f59258: Merge "Send broadcast when default dialer changes" into mnc-dev 
* commit 'fc86e40d9632366d05af4db8b56d6a85f4502710':
  Send broadcast when default dialer changes
 2015-06-15 22:41:51 +00:00
Junda Liu
297da6ffb9 Remove hide_carrier_network_settings from Settings. 
No longer needs this as carrier config manager handles it now.

Bug: b/21347654
Change-Id: I26d34cde0d31ae53a6e5a25cd555ed2ff7600f38
 2015-06-15 15:29:08 -07:00
Yorke Lee
a5f592582b Merge "Send broadcast when default dialer changes" into mnc-dev 2015-06-15 21:23:28 +00:00