Commit Graph

246497 Commits

Author SHA1 Message Date
Andrew Solovay
2a7de38fca doc: Removed duplicate card from distribute/users page
am: 5ecc2aaee8

* commit '5ecc2aaee809ffc1691dabd51b3961a4d439fdd1':
  doc: Removed duplicate card from distribute/users page

Change-Id: I3ba33fa7136b0b789e66a45767ad3dcc321c6b0e
2016-04-21 18:57:29 +00:00
Fyodor Kupolov
27bd37ff3a Remove pre-N db after successful migration
Bug: 26279712
Change-Id: I53e4bd1b04b4ae6b94e8b5642d7f11a4edd6f1e4
2016-04-21 11:37:08 -07:00
Hui Shu
539b077d42 API Review: Add @IntDef and other annotations to Menu Item flags.
BUG: 28296254
Change-Id: I11f77ae36b24f97948f55887d2ba111220afcf80
2016-04-21 11:35:28 -07:00
Eric Laurent
0bf32f0589 Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev
am: dc7ce84095

* commit 'dc7ce840950398518cc116924b173eb7b7f3288a':
  AudioManager: fix isBluetoothA2dpOn()

Change-Id: I7df2a9258ef34716a9a34a47bc501619c3d9ead3
2016-04-21 18:26:19 +00:00
Eric Laurent
dc7ce84095 Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev 2016-04-21 18:22:59 +00:00
Sid Soundararajan
2cc285e267 Make Dismiss Icon under Cards show up only when focused.
BUG: 28299529
Change-Id: I37cd029734da5de8416705746457151c22f64280
2016-04-21 11:20:52 -07:00
Chong Zhang
31e3b5c065 Merge "Fix dead surface/window left on screen" into nyc-dev
am: 289395b1fe

* commit '289395b1feca65fc758384bb2d5c12f1c78500c1':
  Fix dead surface/window left on screen

Change-Id: Id35fbc3822975ca16d8134f780f81ad09efdf2b5
2016-04-21 18:14:59 +00:00
Adam Powell
a9bab98d70 Move child FragmentManager shutdown for retained fragments
Some apps out there do some creative things in terms of calling their
own onDetach methods from elsewhere. Perform the child FragmentManager
shutdown for retained fragments in a package-level perform method
instead of in onDetach itself.

Also mark all existing fragment methods with @CallSuper.

Bug 28293847

Change-Id: I343b610f8d427fe5cabd523a78fbf0e6f3b34c57
2016-04-21 11:04:41 -07:00
Andrew Solovay
5ecc2aaee8 doc: Removed duplicate card from distribute/users page
See first comment for doc stage location.

bug: 27690490
Change-Id: I10383669b2bc584ed6c244e34a5e7c3d901c2d8e
2016-04-21 11:00:57 -07:00
Chong Zhang
289395b1fe Merge "Fix dead surface/window left on screen" into nyc-dev 2016-04-21 17:58:52 +00:00
Scott Rowe
1eb657aeaf Merge "docs: 3 additional review criteria for Android TV" into mnc-mr-docs
am: 88e0bbce56

* commit '88e0bbce5652d846bc6937b6827d9b282517ae14':
  docs: 3 additional review criteria for Android TV

Change-Id: I44ccbc62d287e6866b7e075060c715992cecc7f5
2016-04-21 17:41:20 +00:00
Daniel Nishi
0cdb8177ea Merge "Add a branded VPN icon for quick settings and status bar." into nyc-mr1-dev 2016-04-21 17:40:01 +00:00
Dan Yu
88e0bbce56 Merge "docs: 3 additional review criteria for Android TV" into mnc-mr-docs 2016-04-21 17:31:17 +00:00
Yohei Yukawa
e3512894af Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev
am: d67a1ca49b

* commit 'd67a1ca49b138056d53490322ffdadef61d95fec':
  Accept null subtype in InputMethodSubtypeHandle.

Change-Id: I59093644b6bb6f9b6573f28fb501d28f736f1972
2016-04-21 17:16:15 +00:00
Chris Craik
ef79274692 Merge "Fix shadow radius too large for RS" into nyc-dev
am: 924d8227c4

* commit '924d8227c4c790f05fb90d6140de15fa8abb704b':
  Fix shadow radius too large for RS

Change-Id: I165e946b30e47ba711efb23996ec9d08b0043310
2016-04-21 17:16:14 +00:00
Yohei Yukawa
d67a1ca49b Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev 2016-04-21 17:11:55 +00:00
Chris Craik
924d8227c4 Merge "Fix shadow radius too large for RS" into nyc-dev 2016-04-21 17:09:03 +00:00
Junda Liu
c7004f5648 Add comments to apptype and authtype constants.
Bug: b/28296053
Change-Id: Ib79d9106ac4415f495fd3ec4d0bea036d0b9c9f4
2016-04-21 10:05:21 -07:00
Adam Lesinski
666b6fbba1 Fix order of operation issue with ResStringPool
Due to ! taking precedence over bitwise &, the condition for
checking non-null terminated string blocks is incorrect.

Adds parentheses for the correct behavior.

Bug:28288210
Change-Id: Ie31fa239e5f869e6bb28deb6ae190f41f1aa4d92
2016-04-21 10:05:06 -07:00
Jaewan Kim
552c5af941 Merge "PIP: Fix system UI crash" into nyc-dev
am: 28d9c9f7b2

* commit '28d9c9f7b2498d5b81bdfbf6cabc955c4a2ecec9':
  PIP: Fix system UI crash

Change-Id: Ief778c79108ac6d2eb5e7b2406f9c6d1da6c8ca7
2016-04-21 16:31:42 +00:00
Youngsang Cho
28d9c9f7b2 Merge "PIP: Fix system UI crash" into nyc-dev 2016-04-21 16:23:01 +00:00
Tony Mak
c3bd9dc93f Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev
am: d3589ee715

* commit 'd3589ee715e397e61025265adc883c9ed3be4f56':
  Fix wrong app is launched after solving challenge from tapping notification

Change-Id: I9de441cca7574620fb3917adddbd911a8a935854
2016-04-21 15:56:06 +00:00
Julia Reynolds
49ac59197a Merge "Accept the calendar name in addition to the owner as a calendar filter." into nyc-dev
am: 54a6394cf9

* commit '54a6394cf96423936e6f3548ed8d78ff82e6b247':
  Accept the calendar name in addition to the owner as a calendar filter.

Change-Id: Id788bb4465b947d6b5515a3c1d560c337ea5c382
2016-04-21 15:56:04 +00:00
Victor Chang
dc068eba6f Deleting lock screen clears all CA approvals
When both screenlocks for profile user and parent user has been removed (both set to none),
remove CA approvls on that user, and show the "Certificate authority installed" notification.

Bug: 28161447
Change-Id: I3c78dc5cfcdf7c02c91b64abe44984ee790d8f3e
2016-04-21 16:55:34 +01:00
Tony Mak
d3589ee715 Merge "Fix wrong app is launched after solving challenge from tapping notification" into nyc-dev 2016-04-21 15:51:14 +00:00
Tony Mak
646fe9913e Fix wrong app is launched after solving challenge from tapping notification
PendingIntent.FLAG_ONE_SHOT is needed to prevent the PendingIntent being
reused.

Also, flag and activity option of credential intent in BaseStatusBar
is not same as the one in ActivityStarter. Added a new
function startConfirmDeviceCredentialIntent in AM to centralize it.

Change-Id: I2d9e5923ad5d4d012f10057c409c666c8ca299a3
Fix: 28309964
2016-04-21 16:43:08 +01:00
Julia Reynolds
54a6394cf9 Merge "Accept the calendar name in addition to the owner as a calendar filter." into nyc-dev 2016-04-21 15:36:31 +00:00
Julia Reynolds
f581bc8399 Merge "Always reevaluate rules when a new service is added." into nyc-dev
am: a8574a1dfa

* commit 'a8574a1dfaa45089d392ebf05a8a82e4d8a1d82e':
  Always reevaluate rules when a new service is added.

Change-Id: Ia9098705c487402bd987a1b55aec69a58fc67780
2016-04-21 15:31:47 +00:00
Keith Cheung
b21712eceb Merge "Include work app in battery optimization settings" into nyc-dev
am: 39066abb59

* commit '39066abb5929622a1918805bf85d19180c6dfe3d':
  Include work app in battery optimization settings

Change-Id: I3603894e9aca5b1dbe2ed0f6615ac8467e470a82
2016-04-21 15:31:46 +00:00
Julia Reynolds
a8574a1dfa Merge "Always reevaluate rules when a new service is added." into nyc-dev 2016-04-21 15:24:05 +00:00
Julia Reynolds
bdfd3c836f Merge "Don\'t call into audiomanager holding a zen lock." into nyc-dev
am: d0f2d1f9ac

* commit 'd0f2d1f9ace01c4e0581baa3f5eb0a694afca675':
  Don't call into audiomanager holding a zen lock.

Change-Id: I8a7eee3478bca5d8bfd1262e68d136b58fda4884
2016-04-21 15:18:12 +00:00
Keith Cheung
39066abb59 Merge "Include work app in battery optimization settings" into nyc-dev 2016-04-21 15:18:08 +00:00
Julia Reynolds
d0f2d1f9ac Merge "Don't call into audiomanager holding a zen lock." into nyc-dev 2016-04-21 15:04:07 +00:00
Clara Bayarri
b91447b4e4 Merge "Reinflate QS view on Locale configuration change" into nyc-dev
am: 98c7c05dde

* commit '98c7c05dde8c288a4eab680af31b030813b8c87f':
  Reinflate QS view on Locale configuration change

Change-Id: Ie27dce5dcd654771580d8295cca202a23954278b
2016-04-21 14:53:11 +00:00
Clara Bayarri
98c7c05dde Merge "Reinflate QS view on Locale configuration change" into nyc-dev 2016-04-21 14:47:16 +00:00
Julia Reynolds
8f7872a3d3 Merge "Volume updates should appear continuous when changed by touch." into nyc-dev
am: db042644d5

* commit 'db042644d5f724d1c21c2ddd424de70aaf0d4195':
  Volume updates should appear continuous when changed by touch.

Change-Id: I56e41e7af655547b32f230951a5e978cb59f96fd
2016-04-21 14:46:16 +00:00
Clara Bayarri
d9603ecbe2 Merge "Fix silent errors when launching Keyboard Shortcuts from Settings" into nyc-dev
am: bcedd6b74f

* commit 'bcedd6b74f717dddb2e3e37385d1b4a4e82d949a':
  Fix silent errors when launching Keyboard Shortcuts from Settings

Change-Id: I43938e09b83271cf48ddfe6bb6f956332f415c18
2016-04-21 14:44:04 +00:00
Julia Reynolds
7c9350a940 Always reevaluate rules when a new service is added.
Otherwise the condition providers may never get an
onSubscribe call and may not turn on at the right time.

Bug: 26981870
Change-Id: Ia622597f10cc26f7c34ece1748013655543f488f
2016-04-21 10:38:32 -04:00
Julia Reynolds
d82e981cf3 Don't call into audiomanager holding a zen lock.
Bug: 27642196
Change-Id: Ib510f2ddf966f36b3670290a4f3f695bf6b7810e
2016-04-21 10:38:32 -04:00
TreeHugger Robot
db042644d5 Merge "Volume updates should appear continuous when changed by touch." into nyc-dev 2016-04-21 14:33:50 +00:00
Clara Bayarri
bcedd6b74f Merge "Fix silent errors when launching Keyboard Shortcuts from Settings" into nyc-dev 2016-04-21 14:28:58 +00:00
Jason Monk
ce2b421439 Add back elevation to quick settings
Change-Id: I6bd94b23438566156160018d7d078eb32a8becf7
Fixes: 27855302
2016-04-21 10:19:46 -04:00
Paul Jensen
861d45b5e1 Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev
am: 3f45105353

* commit '3f4510535397bf103d0299440a0299ff8bbeec28':
  Cap number of NetworkRequests a UID can make to 100

Change-Id: I194acabb1f9e301d88a40af8ea1d088a3d2ec0d9
2016-04-21 13:55:25 +00:00
Paul Jensen
3f45105353 Merge "Cap number of NetworkRequests a UID can make to 100" into nyc-dev 2016-04-21 13:47:13 +00:00
Clara Bayarri
9b1fdff2e7 Reinflate QS view on Locale configuration change
The existing DensityContainer already did this for density changes,
repurposed it to handle other Configuration changes. Also renamed
to AutoReinflateContainer.

Bug: 27952059
Change-Id: Ieb572abcbafe49aec73b16e1bcb8c294011afdd3
2016-04-21 14:32:07 +01:00
Erik Kline
c2827857aa IpManager,DhcpClient: catch some errors and better logging
Bug: 28196843
Change-Id: Ia91e926da569bf9c503ea00e1e0f767d196547da
2016-04-21 21:13:59 +09:00
Clara Bayarri
c043ebee4b Fix silent errors when launching Keyboard Shortcuts from Settings
The following error was thrown, given that Activity is generating a
protected broadcast:
Sending non-protected broadcast
android.intent.action.SHOW_KEYBOARD_SHORTCUTS from system

Bug: 28138503
Change-Id: I50d5212d7776d33ffe6e9df1c5f080205ac4a29d
2016-04-21 11:55:01 +01:00
Clara Bayarri
77b4fda89c Improve KeyboardShortcutInfo documentation for Modifiers
This was a request from API council

Bug: 28295817
Change-Id: I2b80dc9877fdd473cec89abdd0c06df15799796a
2016-04-21 10:33:11 +01:00
David Friedman
f82949264b Docs: Adds missing Indonesian and Vietnamese to left-hand TOC for Preview docs.
am: 0e7bc1b215

* commit '0e7bc1b215c441c8c280c669e6e0ffed650c6ac5':
  Docs: Adds missing Indonesian and Vietnamese to left-hand TOC for Preview docs.

Change-Id: I71b8d24b45f2ad17ff73805c3b48138bc3cc5e32
2016-04-21 08:08:57 +00:00
David Friedman
0e7bc1b215 Docs: Adds missing Indonesian and Vietnamese to left-hand TOC for Preview docs.
Change-Id: Id634b6e5fa05ac7615d2c2172b17c8beca8f69d3
2016-04-21 00:37:48 -07:00