Commit Graph

266851 Commits

Author SHA1 Message Date
Tony Mak
880f65e852 Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review am: 53b5df43b4
am: 2a63190228

* commit '2a6319022861f8c2fce74b5657d78c008b33115a':
  Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review

Change-Id: Ifdd53fc5fc836fc07239e5ad2f7ba00b5c8b976a
2016-05-20 16:05:04 +00:00
TreeHugger Robot
585ff8bd12 Merge "rate limit notification enqueues" into nyc-dev 2016-05-20 16:04:50 +00:00
Tony Mak
2a63190228 Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review
am: 53b5df43b4

* commit '53b5df43b49b191e442c4d2c7b9a9cba3ebdcf92':
  Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review

Change-Id: I24a866a5947a20127f3b79e2e75ba0cf534b450c
2016-05-20 16:01:00 +00:00
Wale Ogunwale
13dbfff19e Put launch adjacent activity in a new task if the activity does exist
For the launch adjacent case we only want to put the activity in
an existing task if the activity already exists in the history.

Bug: 28828326
Change-Id: I1a6fdd6779cb20f8c0d9b7d94635b21718f4ac1b
2016-05-20 08:50:15 -07:00
Tony Mak
f8c0ddcddf Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review
am: 53b5df43b4

* commit '53b5df43b49b191e442c4d2c7b9a9cba3ebdcf92':
  Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review

Change-Id: I92a8e1e1452ecc80d422c0905a4b86089d24e80b
2016-05-20 15:46:19 +00:00
Tony Mak
53b5df43b4 Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review
TODO: After updating all places that use the SDK, remove/hide the old API

Bug: 28842878

Change-Id: I131be644439080dd0507cd10d8bd6618246ee7ad
2016-05-20 15:39:38 +00:00
Paul Stewart
45e6fec2cf Don't remove existing EAP configurations
When merging backed-up configurations with the current supplicant
configuration, we read both configurations into a instance of
WifiNetworkSettings.  No EAP configurations should be restored as
per b/25725016, however existing EAP configurations that already
reside in wpa_supplicant.conf (presumably configured in SUW)
should not be removed in the process.

This CL adds a parameter to the "readNetworks" method to allow it
to select whether or not EAP configurations should be read in.  It
is used to allow the "restoreWifiSupplicant" method to copy in EAP
configurations from the existing wpa_supplicant.conf, but not out
of the backup data.

BUG: 28873992
Change-Id: I8b3e0c1a6629b3f1ca5055b1b2190e6b3ca4c033
2016-05-20 08:22:53 -07:00
Jason Monk
9a6552d71f Nav bar: fix tablet density change issues
- Re-inflate the contents of the NavigationBarInflaterView
 - Call up to parent to notify the contents has been reinflated
 - Fix how default tunable is handled, so that the resource is
   reloaded on density change

Change-Id: If25f68d01eedd3319b0c270e1cf80ac382eea637
Fixes: 27227522
2016-05-20 11:21:59 -04:00
Chris Wren
c8673a88fe rate limit notification enqueues
This is distinct from and in addition to the limit on the number of
distinct notifications. This includes many updates to a single
notification.

Bug: 28693065
Change-Id: I5ec0911716cace91d3ad85435a5c6123b290b3a2
2016-05-20 10:40:26 -04:00
Jason Monk
49bef82c6e Merge "QS Edit: Better handling if drags" into nyc-dev am: b8fe7e8bff am: 14466eff28
am: 4533c22cb5

* commit '4533c22cb52996bb4c354ea5f0ea183142815cb1':

Change-Id: I15290d5bb34621539152ab580b3d37d6e7dca872
2016-05-20 13:56:20 +00:00
Robin Lee
628ae0d841 Move VPN restriction check into setup dialog
The purpose of DISALLOW_CONFIG_VPN is to stop users from configuring
VPN, not from using it at all.

The key difference being that if the admin already enforced a VPN then
that setting should be respected (but it still shouldn't be tamperable).

Bug: 28733079
Change-Id: Ib8cab5657a9d5819a019093da3812cd8c2ca4050
2016-05-20 14:53:48 +01:00
Jason Monk
cc9e34a42a Merge "QS Edit: Better handling if drags" into nyc-dev am: b8fe7e8bff am: 762bb8e3a5
am: f0ca2df831

* commit 'f0ca2df8318861c0ce2b520b068816345f4f7195':
  QS Edit: Better handling if drags

Change-Id: Idb7a6e2c8e2872d59c444a52681101796ddce587
2016-05-20 13:53:38 +00:00
Jason Monk
4533c22cb5 Merge "QS Edit: Better handling if drags" into nyc-dev am: b8fe7e8bff
am: 14466eff28

* commit '14466eff280882b6519f5e90ed08c29448161368':

Change-Id: I889a03bed2c422a227bf3aa9296cac0885234480
2016-05-20 13:53:37 +00:00
Jason Monk
f0ca2df831 Merge "QS Edit: Better handling if drags" into nyc-dev am: b8fe7e8bff
am: 762bb8e3a5

* commit '762bb8e3a543fca46473c88817ea27358ae98375':
  QS Edit: Better handling if drags

Change-Id: Ia746f8f96f4bb3a3ceb36a7c6fe8c2d15bcde346
2016-05-20 13:50:53 +00:00
Jason Monk
14466eff28 Merge "QS Edit: Better handling if drags" into nyc-dev
am: b8fe7e8bff

* commit 'b8fe7e8bffea93ceb30a0d827f2ac573472507dd':
  QS Edit: Better handling if drags

Change-Id: I7fb0e3f2f85b2d6e276fbc059403c1c48fa2d46f
2016-05-20 13:48:01 +00:00
Jason Monk
762bb8e3a5 Merge "QS Edit: Better handling if drags" into nyc-dev
am: b8fe7e8bff

* commit 'b8fe7e8bffea93ceb30a0d827f2ac573472507dd':
  QS Edit: Better handling if drags

Change-Id: Id24e45b73846ef9d52feea537382f01eb2872ad4
2016-05-20 13:47:57 +00:00
Jason Monk
b8fe7e8bff Merge "QS Edit: Better handling if drags" into nyc-dev 2016-05-20 13:42:57 +00:00
Neil Fuller
d8455073df Merge "Merge "Add support for ICU data pinning in the Zygote" into nyc-dev am: 761f70d5a6 am: 7efd7d6ef2" into nyc-mr1-dev-plus-aosp
am: 743568c531

* commit '743568c5319ac7a81fa3e2ddebf4e495e89b5c02':

Change-Id: Ieaf446d4c12d02137e3b5bb102051a567ad8465f
2016-05-20 13:13:03 +00:00
Neil Fuller
0c373e3404 Merge "Add support for ICU data pinning in the Zygote" into nyc-dev am: 761f70d5a6 am: 6615f90465
am: d66c917b5b

* commit 'd66c917b5bd78bbc8d6303687ae9cd594830d844':
  Add support for ICU data pinning in the Zygote

Change-Id: Ibababbb63aeee932ac3cdba0babd8673b4727e43
2016-05-20 13:11:42 +00:00
Android Build Merger (Role)
743568c531 Merge "Merge "Add support for ICU data pinning in the Zygote" into nyc-dev am: 761f70d5a6 am: 7efd7d6ef2" into nyc-mr1-dev-plus-aosp 2016-05-20 13:06:56 +00:00
Neil Fuller
a61aac12bf Merge "Add support for ICU data pinning in the Zygote" into nyc-dev am: 761f70d5a6
am: 7efd7d6ef2

* commit '7efd7d6ef25b779eb04d20ad28608a9851d6baca':
  Add support for ICU data pinning in the Zygote

Change-Id: I605d9910cb6a5484536f83dd0ef6a50468edebdd
2016-05-20 13:06:08 +00:00
Neil Fuller
d66c917b5b Merge "Add support for ICU data pinning in the Zygote" into nyc-dev am: 761f70d5a6
am: 6615f90465

* commit '6615f904653337b32571ada2d40897cacfaad097':
  Add support for ICU data pinning in the Zygote

Change-Id: I527ddd5eb99cbaa90ee5f1ee853a9b2106fc6be0
2016-05-20 13:06:05 +00:00
Neil Fuller
6615f90465 Merge "Add support for ICU data pinning in the Zygote" into nyc-dev
am: 761f70d5a6

* commit '761f70d5a6b926780db3bba95ee1e01b4d8d95be':
  Add support for ICU data pinning in the Zygote

Change-Id: I7468ed57102b4eafdf9beb92119cd72b2aadfee2
2016-05-20 13:00:34 +00:00
Neil Fuller
7efd7d6ef2 Merge "Add support for ICU data pinning in the Zygote" into nyc-dev
am: 761f70d5a6

* commit '761f70d5a6b926780db3bba95ee1e01b4d8d95be':
  Add support for ICU data pinning in the Zygote

Change-Id: If693e8cbb737186fdf0a3169d024bef08c8ceb6a
2016-05-20 13:00:29 +00:00
Neil Fuller
761f70d5a6 Merge "Add support for ICU data pinning in the Zygote" into nyc-dev 2016-05-20 12:53:48 +00:00
Vasco Brito
39c5570a3f Add free short codes for Direct Carrier Billing.
All short codes are used by DCB on Google Play. Fixed default pattern for countries added recently.
Internal bug b/27911552.

Change-Id: I9b4a2bb30f2c6de058cc2adb75b67c4f69182198
Signed-off-by: Vasco Brito <vascob@google.com>
2016-05-20 11:08:55 +01:00
Alan Leung
23f5dd4445 Merge "Merge "Enable boost-locked-region-priority" into nyc-dev am: 430894d1bb am: 8cbec3de0f" into nyc-mr1-dev-plus-aosp
am: 1fdd9adaba

* commit '1fdd9adaba6b29b2ca848daf9e8aaaa23ffdbe97':

Change-Id: Ib38494b9d5b887c08f0434b4bd17622ce4e06a1e
2016-05-20 06:26:04 +00:00
Alan Leung
8ae0898982 Merge "Enable boost-locked-region-priority" into nyc-dev am: 430894d1bb am: 1969c9cf17
am: b223d4b198

* commit 'b223d4b198adaca7d42315c3fbee7816b9e4f1c0':
  Enable boost-locked-region-priority

Change-Id: I2ebae6ae0aca932178cc50ba6601804ad9e4d2de
2016-05-20 06:20:56 +00:00
Android Build Merger (Role)
1fdd9adaba Merge "Merge "Enable boost-locked-region-priority" into nyc-dev am: 430894d1bb am: 8cbec3de0f" into nyc-mr1-dev-plus-aosp 2016-05-20 06:18:32 +00:00
Alan Leung
7224e938c1 Merge "Enable boost-locked-region-priority" into nyc-dev am: 430894d1bb
am: 8cbec3de0f

* commit '8cbec3de0fe81f1b9b5379f87167cd23f3926225':
  Enable boost-locked-region-priority

Change-Id: Icd13b563101a6847cba9ccd216125da1d97013b8
2016-05-20 06:17:59 +00:00
Alan Leung
b223d4b198 Merge "Enable boost-locked-region-priority" into nyc-dev am: 430894d1bb
am: 1969c9cf17

* commit '1969c9cf1730f90e1cc4355486a3e42c0b43d6c3':
  Enable boost-locked-region-priority

Change-Id: I10026d34d777de090afa07e7e0bdd920b6f8b75e
2016-05-20 06:17:53 +00:00
Alan Leung
1969c9cf17 Merge "Enable boost-locked-region-priority" into nyc-dev
am: 430894d1bb

* commit '430894d1bbac3ceb94dc2f57334858178fa53e97':
  Enable boost-locked-region-priority

Change-Id: I2669b7d7a94f782c767eb4f9a6ecfcd971ca9da1
2016-05-20 06:15:05 +00:00
Alan Leung
8cbec3de0f Merge "Enable boost-locked-region-priority" into nyc-dev
am: 430894d1bb

* commit '430894d1bbac3ceb94dc2f57334858178fa53e97':
  Enable boost-locked-region-priority

Change-Id: I26257eae8b8d0dfdf604c2e8e7350ff415d8433f
2016-05-20 06:14:58 +00:00
Alan Leung
430894d1bb Merge "Enable boost-locked-region-priority" into nyc-dev 2016-05-20 06:09:14 +00:00
Selim Cinek
07304f5224 Fixed a flashing when the affordances were launched
Because we can't draw it as source in that case.

Change-Id: I14039959a5fedbc57358e2e343a3d0d185dcec17
Fixes: 28735933
2016-05-19 18:31:36 -07:00
Siyamed Sinir
d55be2b9d5 setTransformationMethod should reset mTextDir
When transformation method is set via API, text direction heuristics has
to be reset since for PasswordTransformationMethod it is set to LTR. Not
resetting it causes inconsistencies with the remaining of the TextView.

Bug: 28562779
Change-Id: I225e35e39bde60d4296852ff17b107d5b7b99f8a
2016-05-19 18:30:38 -07:00
Ta-wei Yen
93e7beb8b3 Merge "Merge "Hide VoicemailContract.setQuota()" into nyc-dev am: 4f2a1d0913 am: ba9b910bbc" into nyc-mr1-dev-plus-aosp
am: 44aac008a8

* commit '44aac008a801cfcfe00088259272a6a4556e9947':

Change-Id: Ie83f12a37e045c12badfa2a58c6c9e1a715d64e6
2016-05-20 01:29:22 +00:00
Ta-wei Yen
427bfc0842 Merge "Merge "Hide VoicemailContract.setQuota()" into nyc-dev am: 4f2a1d0913 am: 93ad8c6b2f" into nyc-mr1-dev-plus-aosp
am: 48fcac0445

* commit '48fcac0445741a9c4ba3bee60a5c41758c9b4068':
  Hide VoicemailContract.setQuota()

Change-Id: I236f788a0ee0e1bca73163108f055d15c7a33050
2016-05-20 01:23:22 +00:00
Ta-wei Yen
c6fc93f70b Merge "Merge "Rename visual voicemail sync intent value" into nyc-dev am: 0f712b164f am: 7220c75f65" into nyc-mr1-dev-plus-aosp
am: 4574c449e9

* commit '4574c449e91e289c7840de23148802c7263a9839':

Change-Id: I5384358263725cb787629a5b0a8f5e0ccfd7428f
2016-05-20 01:21:47 +00:00
Ta-wei Yen
1d7c21fdb3 Merge "Rename visual voicemail sync intent value" into nyc-dev am: 0f712b164f am: 621b68a213
am: f652b1ec42

* commit 'f652b1ec426b0d8141cd5860a8ddd0985cb1c08b':
  Rename visual voicemail sync intent value

Change-Id: I3769f7a4958eae52047dc276b96939a73418d1ac
2016-05-20 01:19:35 +00:00
Android Build Merger (Role)
44aac008a8 Merge "Merge "Hide VoicemailContract.setQuota()" into nyc-dev am: 4f2a1d0913 am: ba9b910bbc" into nyc-mr1-dev-plus-aosp 2016-05-20 01:15:09 +00:00
Android Build Merger (Role)
48fcac0445 Merge "Merge "Hide VoicemailContract.setQuota()" into nyc-dev am: 4f2a1d0913 am: 93ad8c6b2f" into nyc-mr1-dev-plus-aosp 2016-05-20 01:15:00 +00:00
Android Build Merger (Role)
4574c449e9 Merge "Merge "Rename visual voicemail sync intent value" into nyc-dev am: 0f712b164f am: 7220c75f65" into nyc-mr1-dev-plus-aosp 2016-05-20 01:14:56 +00:00
Ta-wei Yen
9358d2c6a9 Merge "Hide VoicemailContract.setQuota()" into nyc-dev am: 4f2a1d0913
am: ba9b910bbc

* commit 'ba9b910bbcb9297a962734fdd5eea11f9d180d71':
  Hide VoicemailContract.setQuota()

Change-Id: I085299287cbb5e9a39adaf2fefcd6b529e565e32
2016-05-20 01:14:08 +00:00
Ta-wei Yen
df858672ba Merge "Hide VoicemailContract.setQuota()" into nyc-dev am: 4f2a1d0913
am: 93ad8c6b2f

* commit '93ad8c6b2f9b6610989ef8d37e62f7b66e6f6c11':
  Hide VoicemailContract.setQuota()

Change-Id: Ibce8e2d08074ea44e22a0b3a9fc596ebdb78740e
2016-05-20 01:14:01 +00:00
Ta-wei Yen
f652b1ec42 Merge "Rename visual voicemail sync intent value" into nyc-dev am: 0f712b164f
am: 621b68a213

* commit '621b68a2136b644734292655228503c42a541576':
  Rename visual voicemail sync intent value

Change-Id: Ia517f7c596e8d1d1dc055ea081950328faf4f34f
2016-05-20 01:11:34 +00:00
Ta-wei Yen
6cff08522c Merge "Rename visual voicemail sync intent value" into nyc-dev am: 0f712b164f
am: 7220c75f65

* commit '7220c75f65b615999d2d555024aab6a324b0f376':
  Rename visual voicemail sync intent value

Change-Id: Ia94612e1fe827b829d2caedc41e177bed9dfb681
2016-05-20 01:11:30 +00:00
Ta-wei Yen
ba9b910bbc Merge "Hide VoicemailContract.setQuota()" into nyc-dev
am: 4f2a1d0913

* commit '4f2a1d09133f133ac23b99485713a5ea5b7ea43c':
  Hide VoicemailContract.setQuota()

Change-Id: I11017309443435f9fe840c72deada0c7984f5ce9
2016-05-20 01:07:56 +00:00
Ta-wei Yen
93ad8c6b2f Merge "Hide VoicemailContract.setQuota()" into nyc-dev
am: 4f2a1d0913

* commit '4f2a1d09133f133ac23b99485713a5ea5b7ea43c':
  Hide VoicemailContract.setQuota()

Change-Id: Ifc1365650a981130a376ef253e96331595475510
2016-05-20 01:07:52 +00:00
Ta-wei Yen
7220c75f65 Merge "Rename visual voicemail sync intent value" into nyc-dev
am: 0f712b164f

* commit '0f712b164fa24efdf5c5c2b20d939c3e7affbfe3':
  Rename visual voicemail sync intent value

Change-Id: I677dcd6e8261dfdbf4ab203ef1232f9f599a0687
2016-05-20 01:06:04 +00:00